122851890Sopenharmony_cidiff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.lds.S 222851890Sopenharmony_ciindex 31fdb55cd..af8007128 100644 322851890Sopenharmony_ci--- a/arch/arm64/kernel/vmlinux.lds.S 422851890Sopenharmony_ci+++ b/arch/arm64/kernel/vmlinux.lds.S 522851890Sopenharmony_ci@@ -201,6 +201,15 @@ SECTIONS 622851890Sopenharmony_ci INIT_RAM_FS 722851890Sopenharmony_ci *(.init.altinstructions .init.rodata.* .init.bss) /* from the EFI stub */ 822851890Sopenharmony_ci } 922851890Sopenharmony_ci+ 1022851890Sopenharmony_ci+#ifdef CONFIG_DRIVERS_HDF 1122851890Sopenharmony_ci+ .init.hdf_table : { 1222851890Sopenharmony_ci+ _hdf_drivers_start = .; 1322851890Sopenharmony_ci+ *(.hdf.driver) 1422851890Sopenharmony_ci+ _hdf_drivers_end = .; 1522851890Sopenharmony_ci+ } 1622851890Sopenharmony_ci+#endif 1722851890Sopenharmony_ci+ 1822851890Sopenharmony_ci .exit.data : { 1922851890Sopenharmony_ci EXIT_DATA 2022851890Sopenharmony_ci } 2122851890Sopenharmony_cidiff --git a/drivers/Kconfig b/drivers/Kconfig 2222851890Sopenharmony_ciindex 3584901f1..12e0cceac 100644 2322851890Sopenharmony_ci--- a/drivers/Kconfig 2422851890Sopenharmony_ci+++ b/drivers/Kconfig 2522851890Sopenharmony_ci@@ -236,6 +236,8 @@ source "drivers/interconnect/Kconfig" 2622851890Sopenharmony_ci 2722851890Sopenharmony_ci source "drivers/counter/Kconfig" 2822851890Sopenharmony_ci 2922851890Sopenharmony_ci+source "drivers/hdf/khdf/Kconfig" 3022851890Sopenharmony_ci+ 3122851890Sopenharmony_ci source "drivers/most/Kconfig" 3222851890Sopenharmony_ci 3322851890Sopenharmony_ci source "drivers/accesstokenid/Kconfig" 3422851890Sopenharmony_cidiff --git a/drivers/Makefile b/drivers/Makefile 3522851890Sopenharmony_ciindex f13d70df6..8ec75883a 100644 3622851890Sopenharmony_ci--- a/drivers/Makefile 3722851890Sopenharmony_ci+++ b/drivers/Makefile 3822851890Sopenharmony_ci@@ -191,6 +191,7 @@ obj-$(CONFIG_SIOX) += siox/ 3922851890Sopenharmony_ci obj-$(CONFIG_GNSS) += gnss/ 4022851890Sopenharmony_ci obj-$(CONFIG_INTERCONNECT) += interconnect/ 4122851890Sopenharmony_ci obj-$(CONFIG_COUNTER) += counter/ 4222851890Sopenharmony_ci+obj-$(CONFIG_DRIVERS_HDF) += hdf/ 4322851890Sopenharmony_ci obj-$(CONFIG_MOST) += most/ 4422851890Sopenharmony_ci obj-$(CONFIG_ACCESS_TOKENID) += accesstokenid/ 4522851890Sopenharmony_ci obj-$(CONFIG_VENDOR_HOOKS) += hooks/ 4622851890Sopenharmony_cidiff --git a/drivers/hdf/Makefile b/drivers/hdf/Makefile 4722851890Sopenharmony_cinew file mode 100644 4822851890Sopenharmony_ciindex 000000000..5c5e1911c 4922851890Sopenharmony_ci--- /dev/null 5022851890Sopenharmony_ci+++ b/drivers/hdf/Makefile 5122851890Sopenharmony_ci@@ -0,0 +1,2 @@ 5222851890Sopenharmony_ci+export PROJECT_ROOT := ../../../../../ 5322851890Sopenharmony_ci+obj-$(CONFIG_DRIVERS_HDF) += khdf/ 5422851890Sopenharmony_cidiff --git a/drivers/hid/Makefile b/drivers/hid/Makefile 5522851890Sopenharmony_ciindex 4acb583c9..ddcaf4cdc 100644 5622851890Sopenharmony_ci--- a/drivers/hid/Makefile 5722851890Sopenharmony_ci+++ b/drivers/hid/Makefile 5822851890Sopenharmony_ci@@ -2,6 +2,19 @@ 5922851890Sopenharmony_ci # 6022851890Sopenharmony_ci # Makefile for the HID driver 6122851890Sopenharmony_ci # 6222851890Sopenharmony_ci+HDF_ROOT_DIR = -I$(srctree)/drivers/hdf 6322851890Sopenharmony_ci+ccflags-$(CONFIG_DRIVERS_HDF_INPUT) += $(HDF_ROOT_DIR)/framework/model/input/driver \ 6422851890Sopenharmony_ci+ $(HDF_ROOT_DIR)/framework/include/core \ 6522851890Sopenharmony_ci+ $(HDF_ROOT_DIR)/framework/core/common/include/host \ 6622851890Sopenharmony_ci+ $(HDF_ROOT_DIR)/framework/include/utils \ 6722851890Sopenharmony_ci+ $(HDF_ROOT_DIR)/framework/include/osal \ 6822851890Sopenharmony_ci+ $(HDF_ROOT_DIR)/framework/ability/sbuf/include \ 6922851890Sopenharmony_ci+ $(HDF_ROOT_DIR)/inner_api/utils \ 7022851890Sopenharmony_ci+ $(HDF_ROOT_DIR)/inner_api/osal/shared \ 7122851890Sopenharmony_ci+ $(HDF_ROOT_DIR)/inner_api/host/shared \ 7222851890Sopenharmony_ci+ $(HDF_ROOT_DIR)/inner_api/core \ 7322851890Sopenharmony_ci+ $(HDF_ROOT_DIR)/khdf/osal/include \ 7422851890Sopenharmony_ci+ $(HDF_ROOT_DIR)/evdev 7522851890Sopenharmony_ci hid-y := hid-core.o hid-input.o hid-quirks.o 7622851890Sopenharmony_ci hid-$(CONFIG_DEBUG_FS) += hid-debug.o 7722851890Sopenharmony_ci 7822851890Sopenharmony_cidiff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c 7922851890Sopenharmony_ciindex 5550c943f..f0503e232 100644 8022851890Sopenharmony_ci--- a/drivers/hid/hid-core.c 8122851890Sopenharmony_ci+++ b/drivers/hid/hid-core.c 8222851890Sopenharmony_ci@@ -33,6 +33,9 @@ 8322851890Sopenharmony_ci #include <linux/hid-debug.h> 8422851890Sopenharmony_ci #include <linux/hidraw.h> 8522851890Sopenharmony_ci 8622851890Sopenharmony_ci+#if defined(CONFIG_DRIVERS_HDF_INPUT) 8722851890Sopenharmony_ci+#include "hdf_hid_adapter.h" 8822851890Sopenharmony_ci+#endif 8922851890Sopenharmony_ci #include "hid-ids.h" 9022851890Sopenharmony_ci 9122851890Sopenharmony_ci /* 9222851890Sopenharmony_ci@@ -1522,6 +1525,11 @@ static void hid_process_event(struct hid_device *hid, struct hid_field *field, 9322851890Sopenharmony_ci hidinput_hid_event(hid, field, usage, value); 9422851890Sopenharmony_ci if (hid->claimed & HID_CLAIMED_HIDDEV && interrupt && hid->hiddev_hid_event) 9522851890Sopenharmony_ci hid->hiddev_hid_event(hid, field, usage, value); 9622851890Sopenharmony_ci+#if defined(CONFIG_DRIVERS_HDF_INPUT) 9722851890Sopenharmony_ci+ if (hid->input_dev) { 9822851890Sopenharmony_ci+ HidReportEvent(hid->input_dev, usage->type, usage->code, value); 9922851890Sopenharmony_ci+ } 10022851890Sopenharmony_ci+#endif 10122851890Sopenharmony_ci } 10222851890Sopenharmony_ci 10322851890Sopenharmony_ci /* 10422851890Sopenharmony_ci@@ -1928,6 +1936,85 @@ static const struct device_attribute dev_attr_country = { 10522851890Sopenharmony_ci .show = show_country, 10622851890Sopenharmony_ci }; 10722851890Sopenharmony_ci 10822851890Sopenharmony_ci+#if defined(CONFIG_DRIVERS_HDF_INPUT) 10922851890Sopenharmony_ci+static bool check_mouse(char *name) 11022851890Sopenharmony_ci+{ 11122851890Sopenharmony_ci+ int i; 11222851890Sopenharmony_ci+ static char *option[]={"Mouse", "mouse", "MOUSE", "Razer"}; 11322851890Sopenharmony_ci+ for (i = 0; i < 4; i++) { 11422851890Sopenharmony_ci+ if (strstr(name, option[i])) 11522851890Sopenharmony_ci+ return true; 11622851890Sopenharmony_ci+ } 11722851890Sopenharmony_ci+ return false; 11822851890Sopenharmony_ci+} 11922851890Sopenharmony_ci+static bool check_kbd(char *name) 12022851890Sopenharmony_ci+{ 12122851890Sopenharmony_ci+ int i; 12222851890Sopenharmony_ci+ static char *option[]={"Keyboard", "keyboard"}; 12322851890Sopenharmony_ci+ for (i = 0; i < 2; i++) { 12422851890Sopenharmony_ci+ if (strstr(name, option[i])) 12522851890Sopenharmony_ci+ return true; 12622851890Sopenharmony_ci+ } 12722851890Sopenharmony_ci+ return false; 12822851890Sopenharmony_ci+} 12922851890Sopenharmony_ci+static bool check_rocker(char *name) 13022851890Sopenharmony_ci+{ 13122851890Sopenharmony_ci+ int i; 13222851890Sopenharmony_ci+ static char *option[]={"Thrustmaster"}; 13322851890Sopenharmony_ci+ for (i = 0; i < 1; i++) { 13422851890Sopenharmony_ci+ if (strstr(name, option[i])) 13522851890Sopenharmony_ci+ return true; 13622851890Sopenharmony_ci+ } 13722851890Sopenharmony_ci+ return false; 13822851890Sopenharmony_ci+} 13922851890Sopenharmony_ci+static bool check_encoder(char *name) 14022851890Sopenharmony_ci+{ 14122851890Sopenharmony_ci+ if (strcmp(name, "Wired KeyBoard") == 0) { 14222851890Sopenharmony_ci+ return true; 14322851890Sopenharmony_ci+ } 14422851890Sopenharmony_ci+ return false; 14522851890Sopenharmony_ci+} 14622851890Sopenharmony_ci+static bool check_trackball(char *name) 14722851890Sopenharmony_ci+{ 14822851890Sopenharmony_ci+ int i; 14922851890Sopenharmony_ci+ static char *option[]={"Trackball"}; 15022851890Sopenharmony_ci+ for (i = 0; i < 1; i++) { 15122851890Sopenharmony_ci+ if (strstr(name, option[i])) 15222851890Sopenharmony_ci+ return true; 15322851890Sopenharmony_ci+ } 15422851890Sopenharmony_ci+ return false; 15522851890Sopenharmony_ci+} 15622851890Sopenharmony_ci+static void notify_connect_event(struct hid_device *hdev) 15722851890Sopenharmony_ci+{ 15822851890Sopenharmony_ci+ bool check; 15922851890Sopenharmony_ci+ int type = -1; 16022851890Sopenharmony_ci+ HidInfo *dev = (HidInfo *)kmalloc(sizeof(HidInfo), GFP_KERNEL); 16122851890Sopenharmony_ci+ if (dev == NULL) { 16222851890Sopenharmony_ci+ printk("%s: malloc failed", __func__); 16322851890Sopenharmony_ci+ return; 16422851890Sopenharmony_ci+ } 16522851890Sopenharmony_ci+ type = check_mouse(hdev->name)?HID_TYPE_MOUSE:type; 16622851890Sopenharmony_ci+ type = check_kbd(hdev->name)?HID_TYPE_KEYBOARD:type; 16722851890Sopenharmony_ci+ type = check_rocker(hdev->name)?HID_TYPE_ROCKER:type; 16822851890Sopenharmony_ci+ type = check_encoder(hdev->name)?HID_TYPE_ENCODER:type; 16922851890Sopenharmony_ci+ type = check_trackball(hdev->name)?HID_TYPE_TRACKBALL:type; 17022851890Sopenharmony_ci+ if ( type < 0) { 17122851890Sopenharmony_ci+ kfree(dev); 17222851890Sopenharmony_ci+ dev = NULL; 17322851890Sopenharmony_ci+ return; 17422851890Sopenharmony_ci+ } 17522851890Sopenharmony_ci+ 17622851890Sopenharmony_ci+ dev->devType = type; 17722851890Sopenharmony_ci+ dev->devName = hdev->name; 17822851890Sopenharmony_ci+ hdev->input_dev = HidRegisterHdfInputDev(dev); 17922851890Sopenharmony_ci+ if (hdev->input_dev == NULL) { 18022851890Sopenharmony_ci+ printk("%s: RegisterInputDevice failed\n", __func__); 18122851890Sopenharmony_ci+ } 18222851890Sopenharmony_ci+ kfree(dev); 18322851890Sopenharmony_ci+ dev = NULL; 18422851890Sopenharmony_ci+} 18522851890Sopenharmony_ci+#endif 18622851890Sopenharmony_ci+ 18722851890Sopenharmony_ci int hid_connect(struct hid_device *hdev, unsigned int connect_mask) 18822851890Sopenharmony_ci { 18922851890Sopenharmony_ci static const char *types[] = { "Device", "Pointer", "Mouse", "Device", 19022851890Sopenharmony_ci@@ -2020,6 +2107,9 @@ int hid_connect(struct hid_device *hdev, unsigned int connect_mask) 19122851890Sopenharmony_ci hid_info(hdev, "%s: %s HID v%x.%02x %s [%s] on %s\n", 19222851890Sopenharmony_ci buf, bus, hdev->version >> 8, hdev->version & 0xff, 19322851890Sopenharmony_ci type, hdev->name, hdev->phys); 19422851890Sopenharmony_ci+#if defined(CONFIG_DRIVERS_HDF_INPUT) 19522851890Sopenharmony_ci+ notify_connect_event(hdev); 19622851890Sopenharmony_ci+#endif 19722851890Sopenharmony_ci 19822851890Sopenharmony_ci return 0; 19922851890Sopenharmony_ci } 20022851890Sopenharmony_ci@@ -2035,6 +2125,10 @@ void hid_disconnect(struct hid_device *hdev) 20122851890Sopenharmony_ci if (hdev->claimed & HID_CLAIMED_HIDRAW) 20222851890Sopenharmony_ci hidraw_disconnect(hdev); 20322851890Sopenharmony_ci hdev->claimed = 0; 20422851890Sopenharmony_ci+#if defined(CONFIG_DRIVERS_HDF_INPUT) 20522851890Sopenharmony_ci+ if (hdev->input_dev) 20622851890Sopenharmony_ci+ HidUnregisterHdfInputDev(hdev->input_dev); 20722851890Sopenharmony_ci+#endif 20822851890Sopenharmony_ci } 20922851890Sopenharmony_ci EXPORT_SYMBOL_GPL(hid_disconnect); 21022851890Sopenharmony_ci 21122851890Sopenharmony_ci@@ -2119,6 +2213,11 @@ EXPORT_SYMBOL_GPL(hid_hw_open); 21222851890Sopenharmony_ci */ 21322851890Sopenharmony_ci void hid_hw_close(struct hid_device *hdev) 21422851890Sopenharmony_ci { 21522851890Sopenharmony_ci+#if defined(CONFIG_DRIVERS_HDF_INPUT) 21622851890Sopenharmony_ci+ if (hdev->input_dev) { 21722851890Sopenharmony_ci+ return; 21822851890Sopenharmony_ci+ } 21922851890Sopenharmony_ci+#endif 22022851890Sopenharmony_ci mutex_lock(&hdev->ll_open_lock); 22122851890Sopenharmony_ci if (!--hdev->ll_open_count) 22222851890Sopenharmony_ci hdev->ll_driver->close(hdev); 22322851890Sopenharmony_cidiff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c 22422851890Sopenharmony_ciindex 580d37834..fb945f4ce 100644 22522851890Sopenharmony_ci--- a/drivers/hid/hid-input.c 22622851890Sopenharmony_ci+++ b/drivers/hid/hid-input.c 22722851890Sopenharmony_ci@@ -20,6 +20,10 @@ 22822851890Sopenharmony_ci #include <linux/hid.h> 22922851890Sopenharmony_ci #include <linux/hid-debug.h> 23022851890Sopenharmony_ci 23122851890Sopenharmony_ci+#if defined(CONFIG_DRIVERS_HDF_INPUT) 23222851890Sopenharmony_ci+#include "hdf_hid_adapter.h" 23322851890Sopenharmony_ci+#endif 23422851890Sopenharmony_ci+ 23522851890Sopenharmony_ci #include "hid-ids.h" 23622851890Sopenharmony_ci 23722851890Sopenharmony_ci #define unk KEY_UNKNOWN 23822851890Sopenharmony_ci@@ -1416,7 +1420,15 @@ void hidinput_report_event(struct hid_device *hid, struct hid_report *report) 23922851890Sopenharmony_ci return; 24022851890Sopenharmony_ci 24122851890Sopenharmony_ci list_for_each_entry(hidinput, &hid->inputs, list) 24222851890Sopenharmony_ci+#if defined(CONFIG_DRIVERS_HDF_INPUT) 24322851890Sopenharmony_ci+ { 24422851890Sopenharmony_ci+#endif 24522851890Sopenharmony_ci input_sync(hidinput->input); 24622851890Sopenharmony_ci+#if defined(CONFIG_DRIVERS_HDF_INPUT) 24722851890Sopenharmony_ci+ if(hid->input_dev) 24822851890Sopenharmony_ci+ HidReportEvent(hid->input_dev, EV_SYN, SYN_REPORT, 0); 24922851890Sopenharmony_ci+ } 25022851890Sopenharmony_ci+#endif 25122851890Sopenharmony_ci } 25222851890Sopenharmony_ci EXPORT_SYMBOL_GPL(hidinput_report_event); 25322851890Sopenharmony_ci 25422851890Sopenharmony_ci@@ -1867,6 +1879,42 @@ static inline void hidinput_configure_usages(struct hid_input *hidinput, 25522851890Sopenharmony_ci report->field[i]->usage + j); 25622851890Sopenharmony_ci } 25722851890Sopenharmony_ci 25822851890Sopenharmony_ci+#if defined(CONFIG_DRIVERS_HDF_INPUT) 25922851890Sopenharmony_ci+static void transfer_info(struct input_dev *dev) 26022851890Sopenharmony_ci+{ 26122851890Sopenharmony_ci+ int i; 26222851890Sopenharmony_ci+ HidInfo *info = (HidInfo *)kmalloc(sizeof(HidInfo),GFP_KERNEL); 26322851890Sopenharmony_ci+ if (info == NULL) { 26422851890Sopenharmony_ci+ printk("%s: malloc failed\n",__func__); 26522851890Sopenharmony_ci+ return; 26622851890Sopenharmony_ci+ } 26722851890Sopenharmony_ci+ info->devName = dev->name; 26822851890Sopenharmony_ci+ memcpy(info->devProp, dev->propbit, sizeof(unsigned long) * BITS_TO_LONGS(INPUT_PROP_CNT)); 26922851890Sopenharmony_ci+ memcpy(info->eventType, dev->evbit, sizeof(unsigned long) * BITS_TO_LONGS(EV_CNT)); 27022851890Sopenharmony_ci+ memcpy(info->keyCode, dev->keybit, sizeof(unsigned long) * BITS_TO_LONGS(KEY_CNT)); 27122851890Sopenharmony_ci+ memcpy(info->relCode, dev->relbit, sizeof(unsigned long) * BITS_TO_LONGS(REL_CNT)); 27222851890Sopenharmony_ci+ memcpy(info->absCode, dev->absbit, sizeof(unsigned long) * BITS_TO_LONGS(ABS_CNT)); 27322851890Sopenharmony_ci+ memcpy(info->miscCode, dev->mscbit, sizeof(unsigned long) * BITS_TO_LONGS(MSC_CNT)); 27422851890Sopenharmony_ci+ memcpy(info->ledCode, dev->ledbit, sizeof(unsigned long) * BITS_TO_LONGS(LED_CNT)); 27522851890Sopenharmony_ci+ memcpy(info->soundCode, dev->sndbit, sizeof(unsigned long) * BITS_TO_LONGS(SND_CNT)); 27622851890Sopenharmony_ci+ memcpy(info->forceCode, dev->ffbit, sizeof(unsigned long) * BITS_TO_LONGS(FF_CNT)); 27722851890Sopenharmony_ci+ memcpy(info->switchCode, dev->swbit, sizeof(unsigned long) * BITS_TO_LONGS(SW_CNT)); 27822851890Sopenharmony_ci+ for (i = 0; i < BITS_TO_LONGS(ABS_CNT); i++) { 27922851890Sopenharmony_ci+ if (dev->absbit[i] != 0) { 28022851890Sopenharmony_ci+ memcpy(info->axisInfo, dev->absinfo, sizeof(struct input_absinfo) * ABS_CNT); 28122851890Sopenharmony_ci+ break; 28222851890Sopenharmony_ci+ } 28322851890Sopenharmony_ci+ } 28422851890Sopenharmony_ci+ info->bustype = dev->id.bustype; 28522851890Sopenharmony_ci+ info->vendor = dev->id.vendor; 28622851890Sopenharmony_ci+ info->product = dev->id.product; 28722851890Sopenharmony_ci+ info->version = dev->id.version; 28822851890Sopenharmony_ci+ SendInfoToHdf(info); 28922851890Sopenharmony_ci+ kfree(info); 29022851890Sopenharmony_ci+ info = NULL; 29122851890Sopenharmony_ci+} 29222851890Sopenharmony_ci+#endif 29322851890Sopenharmony_ci+ 29422851890Sopenharmony_ci /* 29522851890Sopenharmony_ci * Register the input device; print a message. 29622851890Sopenharmony_ci * Configure the input layer interface 29722851890Sopenharmony_ci@@ -1952,6 +2000,9 @@ int hidinput_connect(struct hid_device *hid, unsigned int force) 29822851890Sopenharmony_ci continue; 29922851890Sopenharmony_ci } 30022851890Sopenharmony_ci 30122851890Sopenharmony_ci+#if defined(CONFIG_DRIVERS_HDF_INPUT) 30222851890Sopenharmony_ci+ transfer_info(hidinput->input); 30322851890Sopenharmony_ci+#endif 30422851890Sopenharmony_ci if (input_register_device(hidinput->input)) 30522851890Sopenharmony_ci goto out_unwind; 30622851890Sopenharmony_ci hidinput->registered = true; 30722851890Sopenharmony_cidiff --git a/drivers/input/misc/Makefile b/drivers/input/misc/Makefile 30822851890Sopenharmony_ciindex a48e5f2d8..2a1480815 100644 30922851890Sopenharmony_ci--- a/drivers/input/misc/Makefile 31022851890Sopenharmony_ci+++ b/drivers/input/misc/Makefile 31122851890Sopenharmony_ci@@ -85,3 +85,21 @@ obj-$(CONFIG_INPUT_XEN_KBDDEV_FRONTEND) += xen-kbdfront.o 31222851890Sopenharmony_ci obj-$(CONFIG_INPUT_YEALINK) += yealink.o 31322851890Sopenharmony_ci obj-$(CONFIG_INPUT_IDEAPAD_SLIDEBAR) += ideapad_slidebar.o 31422851890Sopenharmony_ci 31522851890Sopenharmony_ci+ccflags-y +=-I$(srctree)/drivers/hdf/framework/model/input/driver \ 31622851890Sopenharmony_ci+ -I$(srctree)/drivers/hdf/framework/model/input/driver/input_bus_ops \ 31722851890Sopenharmony_ci+ -I$(srctree)/drivers/hdf/framework/include/core \ 31822851890Sopenharmony_ci+ -I$(srctree)/drivers/hdf/framework/core/common/include/host \ 31922851890Sopenharmony_ci+ -I$(srctree)/drivers/hdf/framework/include/utils \ 32022851890Sopenharmony_ci+ -I$(srctree)/drivers/hdf/framework/include/osal \ 32122851890Sopenharmony_ci+ -I$(srctree)/drivers/hdf/framework/include/platform \ 32222851890Sopenharmony_ci+ -I$(srctree)/drivers/hdf/framework/include/config \ 32322851890Sopenharmony_ci+ -I$(srctree)/drivers/hdf/framework/core/host/include \ 32422851890Sopenharmony_ci+ -I$(srctree)/drivers/hdf/framework/core/shared/include \ 32522851890Sopenharmony_ci+ -I$(srctree)/drivers/hdf/framework/utils/include \ 32622851890Sopenharmony_ci+ -I$(srctree)/drivers/hdf/inner_api/osal/shared \ 32722851890Sopenharmony_ci+ -I$(srctree)/drivers/hdf/inner_api/host/shared \ 32822851890Sopenharmony_ci+ -I$(srctree)/drivers/hdf/inner_api/utils \ 32922851890Sopenharmony_ci+ -I$(srctree)/drivers/hdf/inner_api/core \ 33022851890Sopenharmony_ci+ -I$(srctree)/drivers/hdf/khdf/osal/include 33122851890Sopenharmony_ci+ccflags-y +=-I$(srctree)/bounds_checking_function/include \ 33222851890Sopenharmony_ci+ -I$(srctree)/drivers/hdf/evdev 33322851890Sopenharmony_cidiff --git a/drivers/input/misc/rk805-pwrkey.c b/drivers/input/misc/rk805-pwrkey.c 33422851890Sopenharmony_ciindex 3fb64dbda..c6b21aff9 100644 33522851890Sopenharmony_ci--- a/drivers/input/misc/rk805-pwrkey.c 33622851890Sopenharmony_ci+++ b/drivers/input/misc/rk805-pwrkey.c 33722851890Sopenharmony_ci@@ -14,6 +14,9 @@ 33822851890Sopenharmony_ci #include <linux/kernel.h> 33922851890Sopenharmony_ci #include <linux/module.h> 34022851890Sopenharmony_ci #include <linux/platform_device.h> 34122851890Sopenharmony_ci+#include "hdf_hid_adapter.h" 34222851890Sopenharmony_ci+ 34322851890Sopenharmony_ci+InputDevice *HidinputDev=NULL; 34422851890Sopenharmony_ci 34522851890Sopenharmony_ci static irqreturn_t pwrkey_fall_irq(int irq, void *_pwr) 34622851890Sopenharmony_ci { 34722851890Sopenharmony_ci@@ -22,6 +25,8 @@ static irqreturn_t pwrkey_fall_irq(int irq, void *_pwr) 34822851890Sopenharmony_ci input_report_key(pwr, KEY_POWER, 1); 34922851890Sopenharmony_ci input_sync(pwr); 35022851890Sopenharmony_ci 35122851890Sopenharmony_ci+ HidReportEvent(HidinputDev, EV_KEY, KEY_POWER, 1); 35222851890Sopenharmony_ci+ HidReportEvent(HidinputDev, EV_SYN, SYN_REPORT, 0); 35322851890Sopenharmony_ci return IRQ_HANDLED; 35422851890Sopenharmony_ci } 35522851890Sopenharmony_ci 35622851890Sopenharmony_ci@@ -32,9 +37,24 @@ static irqreturn_t pwrkey_rise_irq(int irq, void *_pwr) 35722851890Sopenharmony_ci input_report_key(pwr, KEY_POWER, 0); 35822851890Sopenharmony_ci input_sync(pwr); 35922851890Sopenharmony_ci 36022851890Sopenharmony_ci+ HidReportEvent(HidinputDev, EV_KEY, KEY_POWER, 0); 36122851890Sopenharmony_ci+ HidReportEvent(HidinputDev, EV_SYN, SYN_REPORT, 0); 36222851890Sopenharmony_ci return IRQ_HANDLED; 36322851890Sopenharmony_ci } 36422851890Sopenharmony_ci 36522851890Sopenharmony_ci+static InputDevice* HidRegisterHdfPowerKeyDev(void) 36622851890Sopenharmony_ci+{ 36722851890Sopenharmony_ci+ InputDevice* inputDev = NULL; 36822851890Sopenharmony_ci+ HidInfo Hid_keyInfo; 36922851890Sopenharmony_ci+ 37022851890Sopenharmony_ci+ Hid_keyInfo.devType = HID_TYPE_KEY; 37122851890Sopenharmony_ci+ Hid_keyInfo.eventType[0] = SET_BIT(EV_KEY); 37222851890Sopenharmony_ci+ Hid_keyInfo.keyCode[3] = SET_BIT(KEY_POWER); 37322851890Sopenharmony_ci+ Hid_keyInfo.devName = "hid-powerkey"; 37422851890Sopenharmony_ci+ inputDev = HidRegisterHdfInputDev(&Hid_keyInfo); 37522851890Sopenharmony_ci+ return inputDev; 37622851890Sopenharmony_ci+} 37722851890Sopenharmony_ci+ 37822851890Sopenharmony_ci static int rk805_pwrkey_probe(struct platform_device *pdev) 37922851890Sopenharmony_ci { 38022851890Sopenharmony_ci struct input_dev *pwr; 38122851890Sopenharmony_ci@@ -87,6 +107,11 @@ static int rk805_pwrkey_probe(struct platform_device *pdev) 38222851890Sopenharmony_ci platform_set_drvdata(pdev, pwr); 38322851890Sopenharmony_ci device_init_wakeup(&pdev->dev, true); 38422851890Sopenharmony_ci 38522851890Sopenharmony_ci+ HidinputDev = HidRegisterHdfPowerKeyDev(); 38622851890Sopenharmony_ci+ if (NULL == HidinputDev) { 38722851890Sopenharmony_ci+ pr_err("HidRegisterHdfInputDev error\n"); 38822851890Sopenharmony_ci+ return -EINVAL; 38922851890Sopenharmony_ci+ } 39022851890Sopenharmony_ci return 0; 39122851890Sopenharmony_ci } 39222851890Sopenharmony_ci 39322851890Sopenharmony_cidiff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c 39422851890Sopenharmony_ciindex 505c562a5..67d451beb 100644 39522851890Sopenharmony_ci--- a/drivers/input/mousedev.c 39622851890Sopenharmony_ci+++ b/drivers/input/mousedev.c 39722851890Sopenharmony_ci@@ -869,7 +869,7 @@ static struct mousedev *mousedev_create(struct input_dev *dev, 39822851890Sopenharmony_ci 39922851890Sopenharmony_ci if (mixdev) { 40022851890Sopenharmony_ci dev_set_name(&mousedev->dev, "mice"); 40122851890Sopenharmony_ci- 40222851890Sopenharmony_ci+ mousedev->open = 1; 40322851890Sopenharmony_ci mousedev->open_device = mixdev_open_devices; 40422851890Sopenharmony_ci mousedev->close_device = mixdev_close_devices; 40522851890Sopenharmony_ci } else { 40622851890Sopenharmony_cidiff --git a/include/linux/hid.h b/include/linux/hid.h 40722851890Sopenharmony_ciindex fc56d53cc..90822e3d3 100644 40822851890Sopenharmony_ci--- a/include/linux/hid.h 40922851890Sopenharmony_ci+++ b/include/linux/hid.h 41022851890Sopenharmony_ci@@ -622,6 +622,7 @@ struct hid_device { /* device report descriptor */ 41122851890Sopenharmony_ci struct list_head debug_list; 41222851890Sopenharmony_ci spinlock_t debug_list_lock; 41322851890Sopenharmony_ci wait_queue_head_t debug_wait; 41422851890Sopenharmony_ci+ void *input_dev; 41522851890Sopenharmony_ci }; 41622851890Sopenharmony_ci 41722851890Sopenharmony_ci #define to_hid_device(pdev) \ 418