Browse Source

codaj12: strictly treat building warning as error and fix warning

And remove unused file

Signed-off-by: Andy Hu <andy.hu@starfivetech.com>
Andy Hu 2 years ago
parent
commit
207bcbe3b9

+ 1 - 1
soft_3rdpart/codaj12/codaj12Driver_buildroot.mak

@@ -13,7 +13,7 @@ export SUBARCH=riscv
 export CROSS_COMPILE=riscv64-buildroot-linux-gnu-
 
 DRV_PATH  := $(shell pwd)/jdi/linux/driver
-EXTRA_CFLAGS +=	$(DEBFLAGS) -I$(LDDINCDIR) -Wno-unused-function
+EXTRA_CFLAGS +=	$(DEBFLAGS) -I$(LDDINCDIR) -Wall
 
 ifneq ($(KERNELRELEASE),)
 # call from kernel build system

+ 1 - 1
soft_3rdpart/codaj12/codaj12_buildroot.mak

@@ -70,7 +70,7 @@ DEFINES += -D$(PRODUCT) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
 endif	# USE_SIM_PLATFORM
 DEFINES += -DUSE_FEEDING_METHOD_BUFFER
 
-CFLAGS  += -g -I. -Wno-implicit-function-declaration -Wno-format -Wl,--fatal-warning $(INCLUDES) $(DEFINES) $(PLATFORM_FLAGS)
+CFLAGS  += -g -I. -Wno-format-truncation -Wl,--fatal-warning $(INCLUDES) $(DEFINES) $(PLATFORM_FLAGS)
 ifeq ($(USE_RTL_SIM), yes)
 ifeq ($(IUS), 1)
 CFLAGS  += -fPIC # ncverilog is 64bit version

+ 1 - 0
soft_3rdpart/codaj12/jdi/jdi.h

@@ -111,6 +111,7 @@ extern "C" {
 
     int jdi_write_memory(unsigned long addr, unsigned char *data, int len, int endian);
     int jdi_read_memory(unsigned long addr, unsigned char *data, int len, int endian);
+    int jdi_attach_dma_memory(jpu_buffer_t *vb);
 
     int jdi_lock();
     void jdi_unlock();

+ 0 - 0
soft_3rdpart/codaj12/jdi/linux/driver/Module.symvers


+ 16 - 11
soft_3rdpart/codaj12/jdi/linux/driver/jpu.c

@@ -116,10 +116,12 @@ static jpu_mm_t         s_jmem;
 static jpudrv_buffer_t  s_video_memory = {0};
 #endif /* JPU_SUPPORT_RESERVED_VIDEO_MEMORY */
 
-
+#ifndef JPU_SUPPORT_CLOCK_CONTROL
 static int jpu_hw_reset(void);
 static void jpu_clk_disable(void);
 static int jpu_clk_enable(void);
+#endif
+
 // end customer definition
 
 static jpudrv_buffer_t s_instance_pool = {0};
@@ -384,7 +386,12 @@ static long jpu_ioctl(struct file *filp, u_int cmd, u_long arg)
         break;
      case JDI_IOCTL_GET_PHYSICAL_MEMORY:
         {
-            jpudrv_buffer_pool_t *jbp;
+            jpudrv_buffer_pool_t *jbp = NULL;
+            void *user_address = NULL;
+            struct task_struct *my_struct = NULL;
+            struct mm_struct *mm = NULL;
+            unsigned long address = 0;
+            pgd_t *pgd = NULL;
 
             DPRINTK("[JPUDRV][+]JDI_IOCTL_GET_PHYSICAL_MEMORY\n");
             if ((ret = down_interruptible(&s_jpu_sem)) == 0) {
@@ -402,11 +409,11 @@ static long jpu_ioctl(struct file *filp, u_int cmd, u_long arg)
                     return -EFAULT;
                 }
 
-                void *user_address = (void *)jbp->jb.virt_addr;
-                struct task_struct *my_struct = get_current();
-                struct mm_struct *mm = my_struct->mm;
-                unsigned long address = (unsigned long)user_address;
-                pgd_t *pgd = pgd_offset(mm, address);
+                user_address = (void *)jbp->jb.virt_addr;
+                my_struct = get_current();
+                mm = my_struct->mm;
+                address = (unsigned long)user_address;
+                pgd = pgd_offset(mm, address);
 
                 if (!pgd_none(*pgd) && !pgd_bad(*pgd)) {
                     p4d_t *p4d = p4d_offset(pgd, address);
@@ -1090,7 +1097,7 @@ MODULE_LICENSE("GPL");
 module_init(jpu_init);
 module_exit(jpu_exit);
 
-
+#ifndef JPU_SUPPORT_CLOCK_CONTROL
 static void _set_reset(volatile unsigned long p_assert_reg,volatile unsigned long p_status_reg,int ibit)
 {
     unsigned int read_value;
@@ -1212,6 +1219,4 @@ void jpu_clk_disable(void)
 {
 	_clk_control(0);
 }
-
-
-
+#endif

+ 0 - 2
soft_3rdpart/codaj12/jdi/linux/driver/jpu.mod

@@ -1,2 +0,0 @@
-/home/samin/data/startlight/freedom-u-sdk/soft_3rdparty/codaj12/jdi/linux/driver/jpu.o
-

+ 3 - 3
soft_3rdpart/codaj12/sample/helper/jpuhelper.c

@@ -559,7 +559,7 @@ BOOL GetJpgEncOpenParam(JpgEncOpenParam *pEncOP, EncConfigParam *pEncConfig)
     memset(&mjpgParam, 0x00, sizeof(EncMjpgParam));
 
     encCfg.prec = pEncConfig->extendedSequential;
-    sprintf(cfgPath, "%s/%s", pEncConfig->strCfgDir, pEncConfig->cfgFileName);
+    snprintf(cfgPath, sizeof(cfgPath), "%s/%s", pEncConfig->strCfgDir, pEncConfig->cfgFileName);
 
     if (parseJpgCfgFile(&encCfg, cfgPath) == 0) {
         return FALSE;
@@ -609,13 +609,13 @@ BOOL GetJpgEncOpenParam(JpgEncOpenParam *pEncOP, EncConfigParam *pEncConfig)
             mjpgParam.chromaQ12bit = (BOOL)encCfg.QMatPrec1;
             mjpgParam.extendedSequence = TRUE;
         }
-        sprintf(huffmanTablePath, "%s/%s", pEncConfig->strCfgDir, encCfg.HuffTabName);
+        snprintf(huffmanTablePath, sizeof(huffmanTablePath), "%s/%s", pEncConfig->strCfgDir, encCfg.HuffTabName);
         ret = jpgGetHuffTable(huffmanTablePath, &mjpgParam, pEncOP->jpg12bit);
         if (ret == 0) {
             return ret;
         }
 
-        sprintf(QMatTabPath, "%s/%s", pEncConfig->strCfgDir, encCfg.QMatTabName);
+        snprintf(QMatTabPath, sizeof(QMatTabPath), "%s/%s", pEncConfig->strCfgDir, encCfg.QMatTabName);
         if ((ret=jpgGetQMatrix(QMatTabPath, &mjpgParam)) == FALSE) {
             return ret;
         }

+ 1 - 1
soft_3rdpart/codaj12/sample/main_jpg_enc_test.c

@@ -335,7 +335,7 @@ BOOL TestEncoder(
     JLOG(INFO, "framebuffer stride = %d, width = %d, height = %d\n", frameBuf[0].stride, framebufWidth, framebufHeight);
     JLOG(INFO, "framebuffer format = %d, packed format = %d, Interleave = %d\n", srcFrameFormat, encOP.packedFormat, encOP.chromaInterleave);
 
-    sprintf(yuvPath, "%s/%s", encConfig.strYuvDir, encConfig.yuvFileName);
+    snprintf(yuvPath, sizeof(yuvPath), "%s/%s", encConfig.strYuvDir, encConfig.yuvFileName);
     GetSourceYuvAttributes(encOP, &sourceAttr);
     if ((yuvFeeder=YuvFeeder_Create(YUV_FEEDER_MODE_NORMAL, yuvPath, sourceAttr, encOP.frameEndian, NULL)) == NULL) {
         goto ERR_ENC_OPEN;