From 2a659cb75029f3a3d7cc6a1b2d49281d84c3dc47 Mon Sep 17 00:00:00 2001 From: Christian Helmuth Date: Fri, 14 Sep 2018 16:55:20 +0200 Subject: [PATCH] usb_hid: support for Holtek-based mice fixups This enables USB mice based on the Holtek chipsets, which need USB descriptor fixups. An example mouse is the Sharkoon Drakonia. Issue #3953 --- repos/dde_linux/ports/dde_linux.hash | 2 +- repos/dde_linux/src/drivers/usb_hid/lx_emul.h | 1 + repos/dde_linux/src/drivers/usb_hid/main.cc | 1 + repos/dde_linux/src/drivers/usb_hid/target.mk | 1 + repos/dde_linux/usb_hid.list | 1 + 5 files changed, 5 insertions(+), 1 deletion(-) diff --git a/repos/dde_linux/ports/dde_linux.hash b/repos/dde_linux/ports/dde_linux.hash index b8ac8ff75f..983e82a121 100644 --- a/repos/dde_linux/ports/dde_linux.hash +++ b/repos/dde_linux/ports/dde_linux.hash @@ -1 +1 @@ -12e42f3a812a4d84a068782f0a65936e7e7de884 +5b4e9aba1338a6b59d3edbe1b226639ef20c81ab diff --git a/repos/dde_linux/src/drivers/usb_hid/lx_emul.h b/repos/dde_linux/src/drivers/usb_hid/lx_emul.h index 6549ca6af2..8d8438c91c 100644 --- a/repos/dde_linux/src/drivers/usb_hid/lx_emul.h +++ b/repos/dde_linux/src/drivers/usb_hid/lx_emul.h @@ -616,6 +616,7 @@ int module_usbhid_init(); int module_hid_init(); int module_hid_generic_init(); int module_ch_driver_init(); +int module_holtek_mouse_driver_init(); int module_ms_driver_init(); int module_mt_driver_init(); int module_wacom_driver_init(); diff --git a/repos/dde_linux/src/drivers/usb_hid/main.cc b/repos/dde_linux/src/drivers/usb_hid/main.cc index 064675af71..0bcd452ed0 100644 --- a/repos/dde_linux/src/drivers/usb_hid/main.cc +++ b/repos/dde_linux/src/drivers/usb_hid/main.cc @@ -169,6 +169,7 @@ void Driver::main_task_entry(void * arg) module_hid_init(); module_hid_generic_init(); module_ch_driver_init(); + module_holtek_mouse_driver_init(); module_ms_driver_init(); module_mt_driver_init(); module_wacom_driver_init(); diff --git a/repos/dde_linux/src/drivers/usb_hid/target.mk b/repos/dde_linux/src/drivers/usb_hid/target.mk index bd762e7c1c..b1f6306840 100644 --- a/repos/dde_linux/src/drivers/usb_hid/target.mk +++ b/repos/dde_linux/src/drivers/usb_hid/target.mk @@ -14,6 +14,7 @@ INC_DIR += $(REP_DIR)/src/include SRC_C += drivers/hid/hid-cherry.c SRC_C += drivers/hid/hid-core.c SRC_C += drivers/hid/hid-generic.c +SRC_C += drivers/hid/hid-holtek-mouse.c SRC_C += drivers/hid/hid-input.c SRC_C += drivers/hid/hid-microsoft.c SRC_C += drivers/hid/hid-multitouch.c diff --git a/repos/dde_linux/usb_hid.list b/repos/dde_linux/usb_hid.list index 9c8d42aeb4..6eeb64f7c8 100644 --- a/repos/dde_linux/usb_hid.list +++ b/repos/dde_linux/usb_hid.list @@ -1,6 +1,7 @@ linux-x.x.x/drivers/hid/hid-cherry.c linux-x.x.x/drivers/hid/hid-core.c linux-x.x.x/drivers/hid/hid-generic.c +linux-x.x.x/drivers/hid/hid-holtek-mouse.c linux-x.x.x/drivers/hid/hid-ids.h linux-x.x.x/drivers/hid/hid-input.c linux-x.x.x/drivers/hid/hid-microsoft.c