michaelh/zephyr
1
0
Fork 0
Code Releases Activity

usb: hid: remove usb_hid_descriptor from public header

Browse source 
usb_hid_descriptor struct is only used internally and
is not intended to be used by the USB HID device application.

Signed-off-by: Johann Fischer <johann.fischer@nordicsemi.no>
This commit is contained in:
Johann Fischer 2021-02-23 16:12:05 +01:00 • committed by Anas Nashif
commit 6568f4ab99
2 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

19
include/usb/class/usb_hid.h
View file

@ -26,25 +26,6 @@ extern "C" {
* @} * @}
*/ */
struct usb_hid_class_subdescriptor {
uint8_t bDescriptorType;
uint16_t wDescriptorLength;
} __packed;
struct usb_hid_descriptor {
uint8_t bLength;
uint8_t bDescriptorType;
uint16_t bcdHID;
uint8_t bCountryCode;
uint8_t bNumDescriptors;
/*
* Specification says at least one Class Descriptor needs to
* be present (Report Descriptor).
*/
struct usb_hid_class_subdescriptor subdesc[1];
} __packed;
/** /**
* @defgroup usb_hid_device_api HID class USB specific definitions * @defgroup usb_hid_device_api HID class USB specific definitions
* @ingroup usb_hid_class * @ingroup usb_hid_class

19
subsys/usb/class/hid/core.c
View file

@ -23,6 +23,25 @@ LOG_MODULE_REGISTER(usb_hid);
#define HID_INT_IN_EP_IDX 0 #define HID_INT_IN_EP_IDX 0
#define HID_INT_OUT_EP_IDX 1 #define HID_INT_OUT_EP_IDX 1
struct usb_hid_class_subdescriptor {
uint8_t bDescriptorType;
uint16_t wDescriptorLength;
} __packed;
struct usb_hid_descriptor {
uint8_t bLength;
uint8_t bDescriptorType;
uint16_t bcdHID;
uint8_t bCountryCode;
uint8_t bNumDescriptors;
/*
* Specification says at least one Class Descriptor needs to
* be present (Report Descriptor).
*/
struct usb_hid_class_subdescriptor subdesc[1];
} __packed;
struct usb_hid_config { struct usb_hid_config {
struct usb_if_descriptor if0; struct usb_if_descriptor if0;
struct usb_hid_descriptor if0_hid; struct usb_hid_descriptor if0_hid;