diff options
author | Christopher Ferris <cferris@google.com> | 2022-12-14 19:34:35 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-12-14 19:34:35 +0000 |
commit | a248dafd7653b99fc45f9d29e5f139b04f2f28bc (patch) | |
tree | 73fa9a557e6cbd55222048f95d34a73b707e8ae7 | |
parent | 654a5cb3cf2d9839c80ba7ec6710398704f1db7d (diff) | |
parent | cfe03e6e1f706019093cdc099c4bb2ee2d1b5a60 (diff) | |
download | rmi4utils-a248dafd7653b99fc45f9d29e5f139b04f2f28bc.tar.gz |
Fix code to compile with new kernel 6.1 headers. am: acae70240d am: 42ccf2f566 am: cfe03e6e1fHEADandroid-14.0.0_r51android-14.0.0_r50android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_hef_341717050aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000mastermainandroid14-qpr3-releaseandroid14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-devandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-release
Original change: https://android-review.googlesource.com/c/platform/external/rmi4utils/+/2343406
Change-Id: I8e84066f7e9d28feb19b2cb8aef7559642d9ea69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rwxr-xr-x | rmidevice/hiddevice.cpp | 40 |
1 files changed, 23 insertions, 17 deletions
diff --git a/rmidevice/hiddevice.cpp b/rmidevice/hiddevice.cpp index b81d70a..4cedc5a 100755 --- a/rmidevice/hiddevice.cpp +++ b/rmidevice/hiddevice.cpp @@ -43,13 +43,19 @@ #define RMI_SET_LID_MODE_REPORT_ID 0xe // Feature Report -enum hid_report_type { - HID_REPORT_TYPE_UNKNOWN = 0x0, - HID_REPORT_TYPE_INPUT = 0x81, - HID_REPORT_TYPE_OUTPUT = 0x91, - HID_REPORT_TYPE_FEATURE = 0xb1, +// Make sure that none of the enums/macros conflict with possible +// kernel definition/names. +enum hid_rmi4_report_type { + HID_RMI4_REPORT_UNKNOWN = 0, + HID_RMI4_REPORT_INPUT = 1, + HID_RMI4_REPORT_OUTPUT = 2, + HID_RMI4_REPORT_FEATURE = 3, }; +#define HID_RMI4_REPORT_TYPE_INPUT 0x81 +#define HID_RMI4_REPORT_TYPE_OUTPUT 0x91 +#define HID_RMI4_REPORT_TYPE_FEATURE 0xb1 + #define HID_RMI4_REPORT_ID 0 #define HID_RMI4_READ_INPUT_COUNT 1 #define HID_RMI4_READ_INPUT_DATA 2 @@ -163,7 +169,7 @@ void HIDDevice::ParseReportDescriptor() int totalReportSize = 0; int reportSize = 0; int reportCount = 0; - enum hid_report_type hidReportType = HID_REPORT_TYPE_UNKNOWN; + enum hid_rmi4_report_type hidReportType = HID_RMI4_REPORT_UNKNOWN; bool inCollection = false; for (unsigned int i = 0; i < m_rptDesc.size; ++i) { @@ -181,16 +187,16 @@ void HIDDevice::ParseReportDescriptor() totalReportSize = (reportSize * reportCount) >> 3; switch (hidReportType) { - case HID_REPORT_TYPE_INPUT: + case HID_RMI4_REPORT_INPUT: m_inputReportSize = totalReportSize + 1; break; - case HID_REPORT_TYPE_OUTPUT: + case HID_RMI4_REPORT_OUTPUT: m_outputReportSize = totalReportSize + 1; break; - case HID_REPORT_TYPE_FEATURE: + case HID_RMI4_REPORT_FEATURE: m_featureReportSize = totalReportSize + 1; break; - case HID_REPORT_TYPE_UNKNOWN: + case HID_RMI4_REPORT_UNKNOWN: default: break; } @@ -200,7 +206,7 @@ void HIDDevice::ParseReportDescriptor() totalReportSize = 0; reportSize = 0; reportCount = 0; - hidReportType = HID_REPORT_TYPE_UNKNOWN; + hidReportType = HID_RMI4_REPORT_UNKNOWN; isReport = true; } @@ -224,14 +230,14 @@ void HIDDevice::ParseReportDescriptor() hasVendorDefineLIDMode = true; } - if (m_rptDesc.value[i] == HID_REPORT_TYPE_INPUT) - hidReportType = HID_REPORT_TYPE_INPUT; + if (m_rptDesc.value[i] == HID_RMI4_REPORT_TYPE_INPUT) + hidReportType = HID_RMI4_REPORT_INPUT; - if (m_rptDesc.value[i] == HID_REPORT_TYPE_OUTPUT) - hidReportType = HID_REPORT_TYPE_OUTPUT; + if (m_rptDesc.value[i] == HID_RMI4_REPORT_TYPE_OUTPUT) + hidReportType = HID_RMI4_REPORT_OUTPUT; - if (m_rptDesc.value[i] == HID_REPORT_TYPE_FEATURE) { - hidReportType = HID_REPORT_TYPE_FEATURE; + if (m_rptDesc.value[i] == HID_RMI4_REPORT_TYPE_FEATURE) { + hidReportType = HID_RMI4_REPORT_FEATURE; } } } |