From 5db838bfb20509a093c068805b2bd524f233613b Mon Sep 17 00:00:00 2001 From: YOUR_NAME <18729315380@163.com> Date: Wed, 16 Jun 2021 08:20:57 +0000 Subject: [PATCH 1/5] huangkai71@huawei.com Signed-off-by: YOUR_NAME <18729315380@163.com> --- model/input/driver/hdf_hid_adapter.c | 5 +++ model/input/driver/hdf_hid_adapter.h | 56 +++++++++++++++++++++++++++- 2 files changed, 60 insertions(+), 1 deletion(-) diff --git a/model/input/driver/hdf_hid_adapter.c b/model/input/driver/hdf_hid_adapter.c index b6e2218de..443983b20 100644 --- a/model/input/driver/hdf_hid_adapter.c +++ b/model/input/driver/hdf_hid_adapter.c @@ -121,6 +121,11 @@ void HidReportEvent(const void *inputDev, uint32_t type, uint32_t code, int32_t PushOnePackage((InputDevice *)inputDev, type, code, value); } +void GetInfoFromHid(HidInfo info) +{ + (void)info; +] + static int32_t HdfHIDDriverInit(struct HdfDeviceObject *device) { (void)device; diff --git a/model/input/driver/hdf_hid_adapter.h b/model/input/driver/hdf_hid_adapter.h index fc2aac7b3..b1862c7ef 100644 --- a/model/input/driver/hdf_hid_adapter.h +++ b/model/input/driver/hdf_hid_adapter.h @@ -8,9 +8,62 @@ #ifndef HDF_HID_ADAPTER_H #define HDF_HID_ADAPTER_H + +#ifdef DIV_ROUND_UP +#undef DIV_ROUND_UP +#endif +#define DIV_ROUND_UP(nr, d) (((nr) + (d) - 1) / (d)) + +#ifdef BYTE_HAS_BITS +#undef BYTE_HAS_BITS +#endif +#define BYTE_HAS_BITS 8 + +#ifdef BITS_TO_LONG +#undef BITS_TO_LONG +#endif +#define BITS_TO_LONG(count) DIV_ROUND_UP(count, BYTE_HAS_BITS * sizeof(unsigned long)) + +#define INPUT_PROP_MAX 0x1f +#define INPUT_PROP_CNT (INPUT_PROP_MAX + 1) +#define EV_MAX 0x1f +#define EV_CNT (EV_MAX+1) +#define ABS_MAX 0x3f +#define ABS_CNT (ABS_MAX+1) +#define REL_MAX 0x0f +#define REL_CNT (REL_MAX+1) +#define KEY_MAX 0x2ff +#define KEY_CNT (KEY_MAX+1) +#define SND_MAX 0x07 +#define SND_CNT (SND_MAX+1) +#define LED_MAX 0x0f +#define LED_CNT (LED_MAX+1) +#define MSC_MAX 0x07 +#define MSC_CNT (MSC_MAX+1) +#define SW_MAX 0x0f +#define SW_CNT (SW_MAX+1) +#define FF_MAX 0x7f +#define FF_CNT (FF_MAX+1) + typedef struct HidInformation { uint32_t devType; const char *devName; + + unsigned long devProp[BITS_TO_LONG(INPUT_PROP_CNT)]; + unsigned long eventType[BITS_TO_LONG(EV_CNT)]; + unsigned long absCode[BITS_TO_LONG(ABS_CNT)]; + unsigned long relCode[BITS_TO_LONG(REL_CNT)]; + unsigned long keyCode[BITS_TO_LONG(KEY_CNT)]; + unsigned long ledCode[BITS_TO_LONG(LED_CNT)]; + unsigned long miscCode[BITS_TO_LONG(MSC_CNT)]; + unsigned long soundCode[BITS_TO_LONG(SND_CNT)]; + unsigned long forceCode[BITS_TO_LONG(FF_CNT)]; + unsigned long switchCode[BITS_TO_LONG(SW_CNT)]; + + uint16_t bustype; + uint16_t vendor; + uint16_t product; + uint16_t version; } HidInfo; enum HidType { @@ -20,8 +73,9 @@ enum HidType { HID_TYPE_UNKNOWN, /* Unknown input device type */ }; +void GetInfoFromHid(HidInfo info); void* HidRegisterHdfInputDev(HidInfo dev); void HidUnregisterHdfInputDev(const void *inputDev); void HidReportEvent(const void *inputDev, uint32_t type, uint32_t code, int32_t value); -#endif \ No newline at end of file +#endif -- Gitee From 9bf6cb164b05c5582b601cc3131bc24b7ff6a293 Mon Sep 17 00:00:00 2001 From: YOUR_NAME <18729315380@163.com> Date: Wed, 16 Jun 2021 10:42:32 +0000 Subject: [PATCH 2/5] huangkai71@huawei.com Signed-off-by: YOUR_NAME <18729315380@163.com> --- model/input/driver/hdf_hid_adapter.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/model/input/driver/hdf_hid_adapter.c b/model/input/driver/hdf_hid_adapter.c index 443983b20..d47aae18c 100644 --- a/model/input/driver/hdf_hid_adapter.c +++ b/model/input/driver/hdf_hid_adapter.c @@ -124,7 +124,7 @@ void HidReportEvent(const void *inputDev, uint32_t type, uint32_t code, int32_t void GetInfoFromHid(HidInfo info) { (void)info; -] +} static int32_t HdfHIDDriverInit(struct HdfDeviceObject *device) { @@ -166,4 +166,4 @@ struct HdfDriverEntry g_hdfHIDEntry = { .Init = HdfHIDDriverInit, }; -HDF_INIT(g_hdfHIDEntry); \ No newline at end of file +HDF_INIT(g_hdfHIDEntry); -- Gitee From f67ff3f5f3e4791c6b6050f21c177817274bbcda Mon Sep 17 00:00:00 2001 From: YOUR_NAME <18729315380@163.com> Date: Wed, 16 Jun 2021 10:48:50 +0000 Subject: [PATCH 3/5] huangkai71@huawei.com Signed-off-by: YOUR_NAME <18729315380@163.com> --- model/input/driver/hdf_hid_adapter.c | 2 +- model/input/driver/hdf_hid_adapter.h | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/model/input/driver/hdf_hid_adapter.c b/model/input/driver/hdf_hid_adapter.c index d47aae18c..b838468a7 100644 --- a/model/input/driver/hdf_hid_adapter.c +++ b/model/input/driver/hdf_hid_adapter.c @@ -123,7 +123,7 @@ void HidReportEvent(const void *inputDev, uint32_t type, uint32_t code, int32_t void GetInfoFromHid(HidInfo info) { - (void)info; + (void)info; } static int32_t HdfHIDDriverInit(struct HdfDeviceObject *device) diff --git a/model/input/driver/hdf_hid_adapter.h b/model/input/driver/hdf_hid_adapter.h index b1862c7ef..24cc4802b 100644 --- a/model/input/driver/hdf_hid_adapter.h +++ b/model/input/driver/hdf_hid_adapter.h @@ -12,7 +12,7 @@ #ifdef DIV_ROUND_UP #undef DIV_ROUND_UP #endif -#define DIV_ROUND_UP(nr, d) (((nr) + (d) - 1) / (d)) +#define DIV_ROUND_UP((nr), (d)) (((nr) + (d) - 1) / (d)) #ifdef BYTE_HAS_BITS #undef BYTE_HAS_BITS @@ -27,23 +27,23 @@ #define INPUT_PROP_MAX 0x1f #define INPUT_PROP_CNT (INPUT_PROP_MAX + 1) #define EV_MAX 0x1f -#define EV_CNT (EV_MAX+1) +#define EV_CNT (EV_MAX + 1) #define ABS_MAX 0x3f -#define ABS_CNT (ABS_MAX+1) +#define ABS_CNT (ABS_MAX + 1) #define REL_MAX 0x0f -#define REL_CNT (REL_MAX+1) +#define REL_CNT (REL_MAX + 1) #define KEY_MAX 0x2ff -#define KEY_CNT (KEY_MAX+1) +#define KEY_CNT (KEY_MAX + 1) #define SND_MAX 0x07 -#define SND_CNT (SND_MAX+1) +#define SND_CNT (SND_MAX + 1) #define LED_MAX 0x0f -#define LED_CNT (LED_MAX+1) +#define LED_CNT (LED_MAX + 1) #define MSC_MAX 0x07 -#define MSC_CNT (MSC_MAX+1) +#define MSC_CNT (MSC_MAX + 1) #define SW_MAX 0x0f -#define SW_CNT (SW_MAX+1) +#define SW_CNT (SW_MAX + 1) #define FF_MAX 0x7f -#define FF_CNT (FF_MAX+1) +#define FF_CNT (FF_MAX + 1) typedef struct HidInformation { uint32_t devType; -- Gitee From 863b17093f20dabc6d4e0b0b353d68b8b162a06c Mon Sep 17 00:00:00 2001 From: YOUR_NAME <18729315380@163.com> Date: Wed, 16 Jun 2021 11:50:50 +0000 Subject: [PATCH 4/5] huangkai71@huawei.com Signed-off-by: YOUR_NAME <18729315380@163.com> --- model/input/driver/hdf_hid_adapter.h | 40 ++++++++++++++-------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/model/input/driver/hdf_hid_adapter.h b/model/input/driver/hdf_hid_adapter.h index 24cc4802b..b05803e12 100644 --- a/model/input/driver/hdf_hid_adapter.h +++ b/model/input/driver/hdf_hid_adapter.h @@ -25,40 +25,40 @@ #define BITS_TO_LONG(count) DIV_ROUND_UP(count, BYTE_HAS_BITS * sizeof(unsigned long)) #define INPUT_PROP_MAX 0x1f -#define INPUT_PROP_CNT (INPUT_PROP_MAX + 1) +#define HDF_INPUT_PROP_CNT (INPUT_PROP_MAX + 1) #define EV_MAX 0x1f -#define EV_CNT (EV_MAX + 1) +#define HDF_EV_CNT (EV_MAX + 1) #define ABS_MAX 0x3f -#define ABS_CNT (ABS_MAX + 1) +#define HDF_ABS_CNT (ABS_MAX + 1) #define REL_MAX 0x0f -#define REL_CNT (REL_MAX + 1) +#define HDF_REL_CNT (REL_MAX + 1) #define KEY_MAX 0x2ff -#define KEY_CNT (KEY_MAX + 1) +#define HDF_KEY_CNT (KEY_MAX + 1) #define SND_MAX 0x07 -#define SND_CNT (SND_MAX + 1) +#define HDF_SND_CNT (SND_MAX + 1) #define LED_MAX 0x0f -#define LED_CNT (LED_MAX + 1) +#define HDF_LED_CNT (LED_MAX + 1) #define MSC_MAX 0x07 -#define MSC_CNT (MSC_MAX + 1) +#define HDF_MSC_CNT (MSC_MAX + 1) #define SW_MAX 0x0f -#define SW_CNT (SW_MAX + 1) +#define HDF_SW_CNT (SW_MAX + 1) #define FF_MAX 0x7f -#define FF_CNT (FF_MAX + 1) +#define HDF_FF_CNT (FF_MAX + 1) typedef struct HidInformation { uint32_t devType; const char *devName; - unsigned long devProp[BITS_TO_LONG(INPUT_PROP_CNT)]; - unsigned long eventType[BITS_TO_LONG(EV_CNT)]; - unsigned long absCode[BITS_TO_LONG(ABS_CNT)]; - unsigned long relCode[BITS_TO_LONG(REL_CNT)]; - unsigned long keyCode[BITS_TO_LONG(KEY_CNT)]; - unsigned long ledCode[BITS_TO_LONG(LED_CNT)]; - unsigned long miscCode[BITS_TO_LONG(MSC_CNT)]; - unsigned long soundCode[BITS_TO_LONG(SND_CNT)]; - unsigned long forceCode[BITS_TO_LONG(FF_CNT)]; - unsigned long switchCode[BITS_TO_LONG(SW_CNT)]; + unsigned long devProp[BITS_TO_LONG(HDF_INPUT_PROP_CNT)]; + unsigned long eventType[BITS_TO_LONG(HDF_EV_CNT)]; + unsigned long absCode[BITS_TO_LONG(HDF_ABS_CNT)]; + unsigned long relCode[BITS_TO_LONG(HDF_REL_CNT)]; + unsigned long keyCode[BITS_TO_LONG(HDF_KEY_CNT)]; + unsigned long ledCode[BITS_TO_LONG(HDF_LED_CNT)]; + unsigned long miscCode[BITS_TO_LONG(HDF_MSC_CNT)]; + unsigned long soundCode[BITS_TO_LONG(HDF_SND_CNT)]; + unsigned long forceCode[BITS_TO_LONG(HDF_FF_CNT)]; + unsigned long switchCode[BITS_TO_LONG(HDF_SW_CNT)]; uint16_t bustype; uint16_t vendor; -- Gitee From ad6c6c7ff55099e704043b15bc8ec352de9a5bd4 Mon Sep 17 00:00:00 2001 From: YOUR_NAME <18729315380@163.com> Date: Wed, 16 Jun 2021 12:16:02 +0000 Subject: [PATCH 5/5] huangkai71@huawei.com Signed-off-by: YOUR_NAME <18729315380@163.com> --- model/input/driver/hdf_hid_adapter.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/input/driver/hdf_hid_adapter.h b/model/input/driver/hdf_hid_adapter.h index b05803e12..67285c385 100644 --- a/model/input/driver/hdf_hid_adapter.h +++ b/model/input/driver/hdf_hid_adapter.h @@ -12,7 +12,7 @@ #ifdef DIV_ROUND_UP #undef DIV_ROUND_UP #endif -#define DIV_ROUND_UP((nr), (d)) (((nr) + (d) - 1) / (d)) +#define DIV_ROUND_UP(nr, d) (((nr) + (d) - 1) / (d)) #ifdef BYTE_HAS_BITS #undef BYTE_HAS_BITS -- Gitee