From 191cfd2c531a1143c90ac65d9c1a0ee28129105f Mon Sep 17 00:00:00 2001 From: Sebastian Sumpf Date: Fri, 5 Feb 2016 15:44:44 +0100 Subject: [PATCH] usb_drv: Add Natural Ergonomic 4000 keyboard support fixes #1878 --- repos/dde_linux/lib/mk/usb.inc | 2 +- repos/dde_linux/ports/dde_linux.hash | 2 +- repos/dde_linux/src/lib/usb/main.cc | 2 ++ repos/dde_linux/usb.list | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/repos/dde_linux/lib/mk/usb.inc b/repos/dde_linux/lib/mk/usb.inc index 4720427d5..c32dc33a1 100644 --- a/repos/dde_linux/lib/mk/usb.inc +++ b/repos/dde_linux/lib/mk/usb.inc @@ -48,7 +48,7 @@ SRC_C += $(addprefix usb/host/, ehci-hcd.c) # USB hid SRC_C += $(addprefix hid/usbhid/, hid-core.c hid-quirks.c) SRC_C += $(addprefix hid/, hid-core.c hid-generic.c hid-input.c \ - hid-cherry.c hid-multitouch.c) + hid-cherry.c hid-microsoft.c hid-multitouch.c) SRC_C += $(addprefix input/, evdev.c input.c input-mt.c) SRC_C += $(addprefix input/, tablet/wacom_sys.c tablet/wacom_wac.c) diff --git a/repos/dde_linux/ports/dde_linux.hash b/repos/dde_linux/ports/dde_linux.hash index 19deee2a1..0c81e45d8 100644 --- a/repos/dde_linux/ports/dde_linux.hash +++ b/repos/dde_linux/ports/dde_linux.hash @@ -1 +1 @@ -2b0757d0d4a6d91906a9e52fd785b08d13f24aad +05e511f67c46656002d976289a648ec58684bce2 diff --git a/repos/dde_linux/src/lib/usb/main.cc b/repos/dde_linux/src/lib/usb/main.cc index 0e459aae9..fc181ef06 100644 --- a/repos/dde_linux/src/lib/usb/main.cc +++ b/repos/dde_linux/src/lib/usb/main.cc @@ -37,6 +37,7 @@ extern "C" void module_hid_generic_init(); extern "C" void module_usb_storage_driver_init(); extern "C" void module_wacom_driver_init(); extern "C" void module_ch_driver_init(); +extern "C" void module_ms_driver_init(); extern "C" void module_mt_driver_init(); extern "C" void module_raw_driver_init(); @@ -73,6 +74,7 @@ static void init(Services *services) module_hid_init(); module_hid_generic_init(); module_ch_driver_init(); + module_ms_driver_init(); module_mt_driver_init(); module_wacom_driver_init(); } diff --git a/repos/dde_linux/usb.list b/repos/dde_linux/usb.list index 577373c34..9a1148295 100644 --- a/repos/dde_linux/usb.list +++ b/repos/dde_linux/usb.list @@ -3,6 +3,7 @@ linux-3.14.5/drivers/hid/hid-core.c linux-3.14.5/drivers/hid/hid-generic.c linux-3.14.5/drivers/hid/hid-ids.h linux-3.14.5/drivers/hid/hid-input.c +linux-3.14.5/drivers/hid/hid-microsoft.c linux-3.14.5/drivers/hid/hid-multitouch.c linux-3.14.5/drivers/hid/usbhid/hid-core.c linux-3.14.5/drivers/hid/usbhid/hid-quirks.c