uhid: Remove local copy of uhid header
Luiz Augusto von Dentz
maintainerPATCH 1/1 uhid: Remove local copy of uhid header
From: Luiz Augusto von Dentz <[email protected]>
uhid.h is part of kernel uapi nowadays so it can be included directly from linux/uhid.h so this removes the local copy to use it instead.
--- profiles/input/uhid_copy.h | 199 ------------------------------------- src/shared/uhid.h | 3 +- 2 files changed, 1 insertion(+), 201 deletions(-) delete mode 100644 profiles/input/uhid_copy.h
profiles/input/uhid_copy.h deleted +0 -199
@@ -1,199 +0,0 @@ -#ifndef __UHID_H_ -#define __UHID_H_ - -/* -* User-space I/O driver support for HID subsystem -* Copyright (c) 2012 David Herrmann -*/ - -/* -* This program is free software; you can redistribute it and/or modify it -* under the terms of the GNU General Public License as published by the Free -* Software Foundation; either version 2 of the License, or (at your option) -* any later version. -*/ - -/* -* Public header for user-space communication. We try to keep every structure -* aligned but to be safe we also use __attribute__((__packed__)). Therefore, -* the communication should be ABI compatible even between architectures. -*/ - -#include <linux/input.h> -#include <linux/types.h> -#include <linux/hid.h> - -enum uhid_event_type { - __UHID_LEGACY_CREATE, -UHID_DESTROY , -UHID_START , -UHID_STOP , -UHID_OPEN , -UHID_CLOSE , -UHID_OUTPUT , - __UHID_LEGACY_OUTPUT_EV, - __UHID_LEGACY_INPUT, -UHID_GET_REPORT , -UHID_GET_REPORT_REPLY , -UHID_CREATE2 , -UHID_INPUT2 , -UHID_SET_REPORT , -UHID_SET_REPORT_REPLY , -}; - -struct uhid_create2_req { -__u8 name[128 ]; -__u8 phys[64 ]; -__u8 uniq[64 ]; -__u16 rd_size; -__u16 bus; -__u32 vendor; -__u32 product; -__u32 version; -__u32 country; -__u8 rd_data[HID_MAX_DESCRIPTOR_SIZE ]; -} __attribute__((__packed__ )); - -enum uhid_dev_flag { -UHID_DEV_NUMBERED_FEATURE_REPORTS = (1ULL <<0 ), -UHID_DEV_NUMBERED_OUTPUT_REPORTS = (1ULL <<1 ), -UHID_DEV_NUMBERED_INPUT_REPORTS = (1ULL <<2 ), -}; - -struct uhid_start_req { -__u64 dev_flags; -}; - -#define UHID_DATA_MAX 4096 - -enum uhid_report_type { -UHID_FEATURE_REPORT , -UHID_OUTPUT_REPORT , -UHID_INPUT_REPORT , -}; - -struct uhid_input2_req { -__u16 size; -__u8 data[UHID_DATA_MAX ]; -} __attribute__((__packed__ )); - -struct uhid_output_req { -__u8 data[UHID_DATA_MAX ]; -__u16 size; -__u8 rtype; -} __attribute__((__packed__ )); - -struct uhid_get_report_req { -__u32 id; -__u8 rnum; -__u8 rtype; -} __attribute__((__packed__ )); - -struct uhid_get_report_reply_req { -__u32 id; -__u16 err; -__u16 size; -__u8 data[UHID_DATA_MAX ]; -} __attribute__((__packed__ )); - -struct uhid_set_report_req { -__u32 id; -__u8 rnum; -__u8 rtype; -__u16 size; -__u8 data[UHID_DATA_MAX ]; -} __attribute__((__packed__ )); - -struct uhid_set_report_reply_req { -__u32 id; -__u16 err; -} __attribute__((__packed__ )); - -/* -* Compat Layer -* All these commands and requests are obsolete. You should avoid using them in -* new code. We support them for backwards-compatibility, but you might not get -* access to new feature in case you use them. -*/ - -enum uhid_legacy_event_type { -UHID_CREATE = __UHID_LEGACY_CREATE, -UHID_OUTPUT_EV = __UHID_LEGACY_OUTPUT_EV, -UHID_INPUT = __UHID_LEGACY_INPUT, -UHID_FEATURE =UHID_GET_REPORT , -UHID_FEATURE_ANSWER =UHID_GET_REPORT_REPLY , -}; - -/* Obsolete! Use UHID_CREATE2. */ -struct uhid_create_req { -__u8 name[128 ]; -__u8 phys[64 ]; -__u8 uniq[64 ]; -__u8 *rd_data; -__u16 rd_size; - -__u16 bus; -__u32 vendor; -__u32 product; -__u32 version; -__u32 country; -} __attribute__((__packed__ )); - -/* Obsolete! Use UHID_INPUT2. */ -struct uhid_input_req { -__u8 data[UHID_DATA_MAX ]; -__u16 size; -} __attribute__((__packed__ )); - -/* Obsolete! Kernel uses UHID_OUTPUT exclusively now. */ -struct uhid_output_ev_req { -__u16 type; -__u16 code; -__s32 value; -} __attribute__((__packed__ )); - -/* Obsolete! Kernel uses ABI compatible UHID_GET_REPORT. */ -struct uhid_feature_req { -__u32 id; -__u8 rnum; -__u8 rtype; -} __attribute__((__packed__ )); - -/* Obsolete! Use ABI compatible UHID_GET_REPORT_REPLY. */ -struct uhid_feature_answer_req { -__u32 id; -__u16 err; -__u16 size; -__u8 data[UHID_DATA_MAX ]; -} __attribute__((__packed__ )); - -/* -* UHID Events -* All UHID events from and to the kernel are encoded as "struct uhid_event". -* The "type" field contains a UHID_* type identifier. All payload depends on -* that type and can be accessed via ev->u.XYZ accordingly. -* If user-space writes short events, they're extended with 0s by the kernel. If -* the kernel writes short events, user-space shall extend them with 0s. -*/ - -struct uhid_event { -__u32 type; - -union { -struct uhid_create_req create; -struct uhid_input_req input; -struct uhid_output_req output; -struct uhid_output_ev_req output_ev; -struct uhid_feature_req feature; -struct uhid_get_report_req get_report; -struct uhid_feature_answer_req feature_answer; -struct uhid_get_report_reply_req get_report_reply; -struct uhid_create2_req create2; -struct uhid_input2_req input2; -struct uhid_set_report_req set_report; -struct uhid_set_report_reply_req set_report_reply; -struct uhid_start_req start; - } u; -} __attribute__((__packed__ )); - -#endif /* __UHID_H_ */
src/shared/uhid.h +1 -2
@@ -10,8 +10,7 @@#include <stdbool.h> #include <stdint.h> - -#include "profiles/input/uhid_copy.h" +#include <linux/uhid.h> struct bt_uhid ;
Signature · 1 line
2.33.1
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=584155
---Test result---
Test Summary:
CheckPatch PASS 1.53 seconds GitLint PASS 1.02 seconds Prep - Setup ELL PASS 50.03 seconds Build - Prep PASS 0.55 seconds Build - Configure PASS 9.24 seconds Build - Make FAIL 0.17 seconds Make Check FAIL 0.44 seconds Make Distcheck FAIL 11.67 seconds Build w/ext ELL - Configure PASS 9.64 seconds Build w/ext ELL - Make FAIL 0.48 seconds
Details
##############################
Test: Build - Make - FAIL
Desc: Build the BlueZ source tree
Output:
make: *** No rule to make target 'profiles/input/uhid_copy.h', needed by 'src/builtin.h'. Stop.
##############################
Test: Make Check - FAIL
Desc: Run 'make check'
Output:
make: *** No rule to make target 'profiles/input/uhid_copy.h', needed by 'src/builtin.h'. Stop.
##############################
Test: Make Distcheck - FAIL
Desc: Run distcheck to check the distribution
Output:
make[1]: *** No rule to make target 'profiles/input/uhid_copy.h', needed by 'src/builtin.h'. Stop.
make: *** [Makefile:10410: dist] Error 2
##############################
Test: Build w/ext ELL - Make - FAIL
Desc: Build BlueZ source with '--enable-external-ell' configuration
Output:
make: *** No rule to make target 'profiles/input/uhid_copy.h', needed by 'src/builtin.h'. Stop.
---
Regards,
Linux Bluetooth