From 496dc5508f798324ca24a7e8ea4ffdb4bd31fa22 Mon Sep 17 00:00:00 2001
From: Christian Helmuth <christian.helmuth@genode-labs.com>
Date: Fri, 14 Sep 2018 16:58:35 +0200
Subject: [PATCH] usb_hid: support for Apple HID devices

Issue #3953
---
 repos/dde_linux/ports/dde_linux.hash          | 2 +-
 repos/dde_linux/src/drivers/usb_hid/lx_emul.h | 4 ++++
 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, 8 insertions(+), 1 deletion(-)

diff --git a/repos/dde_linux/ports/dde_linux.hash b/repos/dde_linux/ports/dde_linux.hash
index 983e82a121..14e347bed8 100644
--- a/repos/dde_linux/ports/dde_linux.hash
+++ b/repos/dde_linux/ports/dde_linux.hash
@@ -1 +1 @@
-5b4e9aba1338a6b59d3edbe1b226639ef20c81ab
+1753147f7ebf2d67447c6175687cf031605031b3
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 8d8438c91c..2395d51cc2 100644
--- a/repos/dde_linux/src/drivers/usb_hid/lx_emul.h
+++ b/repos/dde_linux/src/drivers/usb_hid/lx_emul.h
@@ -51,6 +51,9 @@ typedef __u32 __le32;
 typedef __u64 __le64;
 typedef __u64 __be64;
 
+#define DECLARE_BITMAP(name,bits) \
+	unsigned long name[BITS_TO_LONGS(bits)]
+
 #include <lx_emul/byteorder.h>
 #include <lx_emul/atomic.h>
 #include <lx_emul/work.h>
@@ -617,6 +620,7 @@ int module_hid_init();
 int module_hid_generic_init();
 int module_ch_driver_init();
 int module_holtek_mouse_driver_init();
+int module_apple_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 0bcd452ed0..0c20e8e6a7 100644
--- a/repos/dde_linux/src/drivers/usb_hid/main.cc
+++ b/repos/dde_linux/src/drivers/usb_hid/main.cc
@@ -170,6 +170,7 @@ void Driver::main_task_entry(void * arg)
 	module_hid_generic_init();
 	module_ch_driver_init();
 	module_holtek_mouse_driver_init();
+	module_apple_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 b1f6306840..82dea7c2ea 100644
--- a/repos/dde_linux/src/drivers/usb_hid/target.mk
+++ b/repos/dde_linux/src/drivers/usb_hid/target.mk
@@ -11,6 +11,7 @@ INC_DIR += $(USB_CONTRIB_DIR)/drivers/usb/core
 INC_DIR += $(PRG_DIR)
 INC_DIR += $(REP_DIR)/src/include
 
+SRC_C += drivers/hid/hid-apple.c
 SRC_C += drivers/hid/hid-cherry.c
 SRC_C += drivers/hid/hid-core.c
 SRC_C += drivers/hid/hid-generic.c
diff --git a/repos/dde_linux/usb_hid.list b/repos/dde_linux/usb_hid.list
index 6eeb64f7c8..38a483b9c8 100644
--- a/repos/dde_linux/usb_hid.list
+++ b/repos/dde_linux/usb_hid.list
@@ -1,3 +1,4 @@
+linux-x.x.x/drivers/hid/hid-apple.c
 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