Merge pull request #12 from OpenIPC/hisi

Hisilicon: graceful shutdown
OpenIPC · May 31, 2024 · 8d0aa5c · 8d0aa5c
2 parents 4586892 + 6658232
commit 8d0aa5c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/src/hal/hisi/v4_common.h b/src/hal/hisi/v4_common.h
@@ -4,7 +4,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/select.h>
 
 #include "../types.h"

diff --git a/src/hal/hisi/v4_hal.c b/src/hal/hisi/v4_hal.c
@@ -303,8 +303,8 @@ int v4_pipeline_create(void)
 void v4_pipeline_destroy(void)
 {
     v4_isp.fnExit(_v4_vi_pipe);
-    v4_isp.fnUnregisterAWB(_v4_vi_pipe, &v4_ae_lib);
-    v4_isp.fnUnregisterAE(_v4_vi_pipe, &v4_awb_lib);
+    v4_isp.fnUnregisterAE(_v4_vi_pipe, &v4_ae_lib);
+    v4_isp.fnUnregisterAWB(_v4_vi_pipe, &v4_awb_lib);
 
     v4_snr_drv.obj->pfnUnRegisterCallback(_v4_vi_pipe, &v4_ae_lib, &v4_awb_lib);
 

diff --git a/src/hal/hisi/v4_vpss.h b/src/hal/hisi/v4_vpss.h
@@ -2,10 +2,8 @@
 
 #include "v4_common.h"
 
-#define V4_VPSS_PHY_CHN_NUM	3
-#define V4_VPSS_EXT_CHN_NUM 8
-#define V4_VPSS_CHN_NUM     (V4_VPSS_PHY_CHN_NUM + V4_VPSS_EXT_CHN_NUM)
-#define V4_VPSS_GRP_NUM     32
+#define V4_VPSS_CHN_NUM 6
+#define V4_VPSS_GRP_NUM 8
 
 typedef enum {
     V4_VPSS_NMODE_VIDEO,
@@ -137,4 +135,4 @@ static void v4_vpss_unload(v4_vpss_impl *vpss_lib) {
     if (vpss_lib->handleGoke) dlclose(vpss_lib->handleGoke);
     vpss_lib->handleGoke = NULL;
     memset(vpss_lib, 0, sizeof(*vpss_lib));
-}
+}