Continuing the testing on hisi-gen1

Author: wberube

src/hal/hisi/v1_config.h

@@ -417,13 +417,11 @@ static enum ConfigError v1_parse_config_isp(
     err = parse_int(ini, "isp_image", "isp_w", 0, INT_MAX, &value);
     if (err != CONFIG_OK)
         return err;
-    tim->width = value;
-    img->width = tim->width;
+    img->width = tim->width = value;
     err = parse_int(ini, "isp_image", "isp_h", 0, INT_MAX, &value);
     if (err != CONFIG_OK)
         return err;
-    tim->height = value;
-    img->height = tim->height;
+    img->height = tim->height = value;
     err = parse_int(
         ini, "isp_image", "isp_framerate", 0, INT_MAX, &value);
     if (err != CONFIG_OK)

src/hal/hisi/v1_hal.c

@@ -258,6 +258,8 @@ int v1_pipeline_create(void)
     if (ret = v1_vi.fnEnableChannel(_v1_vi_chn))
         return ret;
 
+    if (ret = v1_snr_drv.fnInit())
+        return ret;
     if (ret = v1_snr_drv.fnRegisterCallback())
         return ret;
 
@@ -266,14 +268,14 @@ int v1_pipeline_create(void)
     if (ret = v1_isp.fnRegisterAWB(&v1_awb_lib))
         return ret;
 
+    if (ret = v1_isp.fnInit())
+        return ret;
     if (ret = v1_isp.fnSetWDRMode(&v1_config.mode))
         return ret;
     if (ret = v1_isp.fnSetImageConfig(&v1_config.img))
         return ret;
     if (ret = v1_isp.fnSetInputTiming(&v1_config.tim))
         return ret;
-    if (ret = v1_isp.fnInit())
-        return ret;
 
     {
         v1_vpss_grp group;
@@ -420,11 +422,13 @@ int v1_sensor_init(char *name, char *obj)
             break;
     } if (!v1_snr_drv.handle)
         HAL_ERROR("v1_snr", "Failed to load the sensor driver");
-    
+
+    if (!(v1_snr_drv.fnInit = (int(*)(void))dlsym(v1_snr_drv.handle, "sensor_init")))
+        HAL_ERROR("v1_snr", "Failed to connect the init function");
     if (!(v1_snr_drv.fnRegisterCallback = (int(*)(void))dlsym(v1_snr_drv.handle, "sensor_register_callback")))
         HAL_ERROR("v1_snr", "Failed to connect the callback register function");
     if (!(v1_snr_drv.fnUnRegisterCallback = (int(*)(void))dlsym(v1_snr_drv.handle, "sensor_unregister_callback")))
-        HAL_ERROR("v1_snr", "Failed to connect the callback register function");
+        HAL_ERROR("v1_snr", "Failed to connect the callback unregister function");
 
     return EXIT_SUCCESS;
 }

src/hal/hisi/v1_snr.h

@@ -70,8 +70,7 @@ typedef struct {
 typedef struct {
     void *handle;
 
+    int (*fnInit)(void);
     int (*fnRegisterCallback)(void);
     int (*fnUnRegisterCallback)(void);
-} v1_snr_drv_impl;
-
-static const char v1_snr_endp[] = {"/dev/hi_mipi"};
+} v1_snr_drv_impl;

src/hal/hisi/v1_sys.h

@@ -8,12 +8,12 @@ typedef enum {
     V1_SYS_MOD_CMPI,
     V1_SYS_MOD_VB,
     V1_SYS_MOD_SYS,
-    V1_SYS_MOD_RGN,
+    V1_SYS_MOD_VALG,
     V1_SYS_MOD_CHNL,
     V1_SYS_MOD_VDEC,
     V1_SYS_MOD_GROUP,
-    V1_SYS_MOD_VPSS,
     V1_SYS_MOD_VENC,
+    V1_SYS_MOD_VPSS,
     V1_SYS_MOD_VDA,
     V1_SYS_MOD_H264E,
     V1_SYS_MOD_JPEGE,
@@ -23,9 +23,9 @@ typedef enum {
     V1_SYS_MOD_VOU,
     V1_SYS_MOD_VIU,
     V1_SYS_MOD_DSU,
-    V1_SYS_MOD_VALG,
+    V1_SYS_MOD_RGN,
     V1_SYS_MOD_RC,
-    V1_SYS_MOD_AIO,
+    V1_SYS_MOD_SIO,
     V1_SYS_MOD_AI,
     V1_SYS_MOD_AO,
     V1_SYS_MOD_AENC,
@@ -48,15 +48,6 @@ typedef enum {
     V1_SYS_MOD_TDE,
     V1_SYS_MOD_USR,
     V1_SYS_MOD_VEDU,
-    V1_SYS_MOD_VGS,
-    V1_SYS_MOD_H265E,
-    V1_SYS_MOD_FD,
-    V1_SYS_MOD_ODT,
-    V1_SYS_MOD_VQA,
-    V1_SYS_MOD_LPR,
-	V1_SYS_MOD_FISHEYE,
-    V1_SYS_MOD_PHOTO,
-    V1_SYS_MOD_EXTAO,
     V1_SYS_MOD_END
 } v1_sys_mod;
 

src/hal/hisi/v2_hal.c

@@ -453,7 +453,7 @@ int v2_sensor_init(char *name, char *obj)
     if (!(v2_snr_drv.fnRegisterCallback = (int(*)(void))dlsym(v2_snr_drv.handle, "sensor_register_callback")))
         HAL_ERROR("v2_snr", "Failed to connect the callback register function");
     if (!(v2_snr_drv.fnUnRegisterCallback = (int(*)(void))dlsym(v2_snr_drv.handle, "sensor_unregister_callback")))
-        HAL_ERROR("v2_snr", "Failed to connect the callback register function");
+        HAL_ERROR("v2_snr", "Failed to connect the callback unregister function");
 
     return EXIT_SUCCESS;
 }

src/hal/hisi/v3_hal.c

@@ -480,7 +480,7 @@ int v3_sensor_init(char *name, char *obj)
     if (!(v3_snr_drv.fnRegisterCallback = (int(*)(void))dlsym(v3_snr_drv.handle, "sensor_register_callback")))
         HAL_ERROR("v3_snr", "Failed to connect the callback register function");
     if (!(v3_snr_drv.fnUnRegisterCallback = (int(*)(void))dlsym(v3_snr_drv.handle, "sensor_unregister_callback")))
-        HAL_ERROR("v3_snr", "Failed to connect the callback register function");
+        HAL_ERROR("v3_snr", "Failed to connect the callback unregister function");
 
     return EXIT_SUCCESS;
 }