Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion driver/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion driver/board/gc573/board_alsa.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion driver/board/gc573/board_config.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
{
Expand Down
2 changes: 1 addition & 1 deletion driver/board/gc573/board_v4l2.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
Binary file modified driver/lib/AVerScaleVideo.o_shipped
Binary file not shown.
Binary file modified driver/lib/aver_xilinx.o_shipped
Binary file not shown.
Binary file modified driver/lib/it6664_EDID.o_shipped
Binary file not shown.
Binary file modified driver/lib/it6664_hdmi2_rx.o_shipped
Binary file not shown.
Binary file modified driver/lib/it6664_hdmi2_tx.o_shipped
Binary file not shown.
Binary file modified driver/lib/it6664_hdmi2sp.o_shipped
Binary file not shown.
Binary file modified driver/lib/ite6664.o_shipped
Binary file not shown.
Binary file modified driver/lib/ite6805.o_shipped
Binary file not shown.
Binary file modified driver/lib/ite6805_EDID.o_shipped
Binary file not shown.
Binary file modified driver/lib/ite6805_EQ.o_shipped
Binary file not shown.
Binary file modified driver/lib/ite6805_drv.o_shipped
Binary file not shown.
Binary file modified driver/lib/ite6805_sys.o_shipped
Binary file not shown.
Binary file modified driver/lib/pic_bmp.o_shipped
Binary file not shown.
6 changes: 3 additions & 3 deletions driver/utils/pci/pci_model.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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");

Expand Down