diff --git a/driver/Makefile b/driver/Makefile index 9a09f80..d581608 100644 --- a/driver/Makefile +++ b/driver/Makefile @@ -55,7 +55,7 @@ $(MODULE_NAME)-objs += $(lib_objs) #$(call add_cflags, $(MODULE_NAME)-objs, common-include) -fno-common -EXTRA_CFLAGS += -Wno-vla -Wno-declaration-after-statement $(common-include) -Wno-maybe-uninitialized +EXTRA_CFLAGS += -Wno-vla -Wno-declaration-after-statement $(common-include) -Wno-maybe-uninitialized -Wimplicit-fallthrough=0 EXTRA_LDFLAGS += --whole-archive obj-m += $(MODULE_NAME).o diff --git a/driver/board/gc573/board_alsa.c b/driver/board/gc573/board_alsa.c index 753391a..bd51d0f 100644 --- a/driver/board/gc573/board_alsa.c +++ b/driver/board/gc573/board_alsa.c @@ -125,7 +125,7 @@ void board_alsa_init(cxt_mgr_handle_t cxt_mgr) err=BOARD_ALSA_ERROR_ALLOC_CXT; break; } - if (subsystem_id == 0x5550) + if (subsystem_id == 0x5730) alsa_info.name="AVerMedia GC573"; alsa_info.pcm_count=sizeof(gc573_pcm_info)/sizeof(alsa_model_pcm_info_t); alsa_info.support_fmt_mask=BIT_ALSA_MODEL_FMT_S16_LE | BIT_ALSA_MODEL_FMT_S24_LE; diff --git a/driver/board/gc573/board_config.c b/driver/board/gc573/board_config.c index 92573f8..bc718f2 100644 --- a/driver/board/gc573/board_config.c +++ b/driver/board/gc573/board_config.c @@ -53,7 +53,7 @@ pci_model_id_t id_table[]={ .vendor=0x1461, .device=0x0054, //according to hw DEVICE ID config .sub_vendor = 0x1461, - .sub_device = 0x5550, + .sub_device = 0x5730, .driver_data=GC573, }, { diff --git a/driver/board/gc573/board_v4l2.c b/driver/board/gc573/board_v4l2.c index 4d1e4b5..7a145e8 100644 --- a/driver/board/gc573/board_v4l2.c +++ b/driver/board/gc573/board_v4l2.c @@ -619,7 +619,7 @@ static void gc573_v4l2_buffer_prepare(v4l2_model_callback_parameter_t *cb_info) plane_sizes[1] = framegrabber_g_out_planesize(board_v4l2_cxt->fg_handle, 2); plane_sizes[0] = framegrabber_g_out_planesize(board_v4l2_cxt->fg_handle, 1); - aver_xilinx_translate_desclist(board_v4l2_cxt->aver_xilinx_handle, plane_sizes[0], plane_sizes[1], plane_sizes[2]); + //aver_xilinx_translate_desclist(board_v4l2_cxt->aver_xilinx_handle, plane_sizes[0], plane_sizes[1], plane_sizes[2]); aver_xilinx_active_current_desclist(board_v4l2_cxt->aver_xilinx_handle,gc573_video_buffer_done,board_v4l2_cxt); } diff --git a/driver/lib/AVerScaleVideo.o_shipped b/driver/lib/AVerScaleVideo.o_shipped index e850e72..4b47f47 100644 Binary files a/driver/lib/AVerScaleVideo.o_shipped and b/driver/lib/AVerScaleVideo.o_shipped differ diff --git a/driver/lib/aver_xilinx.o_shipped b/driver/lib/aver_xilinx.o_shipped index 1ced323..d64496f 100644 Binary files a/driver/lib/aver_xilinx.o_shipped and b/driver/lib/aver_xilinx.o_shipped differ diff --git a/driver/lib/it6664_EDID.o_shipped b/driver/lib/it6664_EDID.o_shipped index f47e14d..1281cdc 100644 Binary files a/driver/lib/it6664_EDID.o_shipped and b/driver/lib/it6664_EDID.o_shipped differ diff --git a/driver/lib/it6664_hdmi2_rx.o_shipped b/driver/lib/it6664_hdmi2_rx.o_shipped index a1cf6c0..c5d2bf4 100644 Binary files a/driver/lib/it6664_hdmi2_rx.o_shipped and b/driver/lib/it6664_hdmi2_rx.o_shipped differ diff --git a/driver/lib/it6664_hdmi2_tx.o_shipped b/driver/lib/it6664_hdmi2_tx.o_shipped index 6211dce..00f930c 100644 Binary files a/driver/lib/it6664_hdmi2_tx.o_shipped and b/driver/lib/it6664_hdmi2_tx.o_shipped differ diff --git a/driver/lib/it6664_hdmi2sp.o_shipped b/driver/lib/it6664_hdmi2sp.o_shipped index 5f6184c..978c441 100644 Binary files a/driver/lib/it6664_hdmi2sp.o_shipped and b/driver/lib/it6664_hdmi2sp.o_shipped differ diff --git a/driver/lib/ite6664.o_shipped b/driver/lib/ite6664.o_shipped index 77dc89a..ed2eb94 100644 Binary files a/driver/lib/ite6664.o_shipped and b/driver/lib/ite6664.o_shipped differ diff --git a/driver/lib/ite6805.o_shipped b/driver/lib/ite6805.o_shipped index 28e4c27..b8d4970 100644 Binary files a/driver/lib/ite6805.o_shipped and b/driver/lib/ite6805.o_shipped differ diff --git a/driver/lib/ite6805_EDID.o_shipped b/driver/lib/ite6805_EDID.o_shipped index 986ffe0..dcaf48d 100644 Binary files a/driver/lib/ite6805_EDID.o_shipped and b/driver/lib/ite6805_EDID.o_shipped differ diff --git a/driver/lib/ite6805_EQ.o_shipped b/driver/lib/ite6805_EQ.o_shipped index f3d70f1..c29a511 100644 Binary files a/driver/lib/ite6805_EQ.o_shipped and b/driver/lib/ite6805_EQ.o_shipped differ diff --git a/driver/lib/ite6805_drv.o_shipped b/driver/lib/ite6805_drv.o_shipped index a7e20d9..bd16efd 100644 Binary files a/driver/lib/ite6805_drv.o_shipped and b/driver/lib/ite6805_drv.o_shipped differ diff --git a/driver/lib/ite6805_sys.o_shipped b/driver/lib/ite6805_sys.o_shipped index 15d02cc..e71b3c8 100644 Binary files a/driver/lib/ite6805_sys.o_shipped and b/driver/lib/ite6805_sys.o_shipped differ diff --git a/driver/lib/pic_bmp.o_shipped b/driver/lib/pic_bmp.o_shipped index d04fe2d..5899439 100644 Binary files a/driver/lib/pic_bmp.o_shipped and b/driver/lib/pic_bmp.o_shipped differ diff --git a/driver/utils/pci/pci_model.c b/driver/utils/pci/pci_model.c index d1c44ad..d9b615d 100644 --- a/driver/utils/pci/pci_model.c +++ b/driver/utils/pci/pci_model.c @@ -168,11 +168,11 @@ static int pci_model_probe(struct pci_dev *pci_dev,const struct pci_device_id *p { mesg_debug("PCI Express\n"); - if(!pci_set_dma_mask(pci_dev, DMA_BIT_MASK(64))) + if(!dma_set_mask(dev, DMA_BIT_MASK(64))) { pr_info("set 64bit DMA mask\n"); }else - if(!pci_set_dma_mask(pci_dev, DMA_BIT_MASK(32))) + if(!dma_set_mask(dev, DMA_BIT_MASK(32))) { pr_info("set 32bit DMA mask\n"); }else @@ -184,7 +184,7 @@ static int pci_model_probe(struct pci_dev *pci_dev,const struct pci_device_id *p } }else { - if(!pci_set_dma_mask(pci_dev, DMA_BIT_MASK(32))) + if(!dma_set_mask(dev, DMA_BIT_MASK(32))) { pr_info("set 32bit DMA mask\n");