uhk/firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move usb_device_get_*() functions back to usb_descriptor.h

Browse Source
This commit is contained in:
László Monda
2017-04-14 00:42:43 +02:00
parent 9a91a9e372
commit 874e07c303
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
right/src/buspal/bm_usb/usb_descriptor.c
-13
View File
@@ -2,19 +2,6 @@
#include "bootloader_hid_report_ids.h" #include "bootloader_hid_report_ids.h"
#include "usb_descriptor.h" #include "usb_descriptor.h"
usb_status_t usb_device_get_device_descriptor(
usb_device_handle handle, usb_device_get_device_descriptor_struct_t *device_descriptor);
usb_status_t usb_device_get_configuration_descriptor(
usb_device_handle handle, usb_device_get_configuration_descriptor_struct_t *configuration_descriptor);
usb_status_t usb_device_get_string_descriptor(
usb_device_handle handle, usb_device_get_string_descriptor_struct_t *string_descriptor);
usb_status_t usb_device_get_hid_descriptor(
usb_device_handle handle, usb_device_get_hid_descriptor_struct_t *hid_descriptor);
usb_status_t usb_device_get_hid_report_descriptor(
usb_device_handle handle, usb_device_get_hid_report_descriptor_struct_t *hid_report_descriptor);
usb_status_t usb_device_get_hid_physical_descriptor(
usb_device_handle handle, usb_device_get_hid_physical_descriptor_struct_t *hid_physical_descriptor);
#define BL_MIN_PACKET_SIZE (32) #define BL_MIN_PACKET_SIZE (32)
#define BL_PACKET_SIZE_HEADER_SIZE (3) // alignment byte + length lsb + length msb (does not include report id) #define BL_PACKET_SIZE_HEADER_SIZE (3) // alignment byte + length lsb + length msb (does not include report id)
#define BL_REPORT_SIZE (BL_MIN_PACKET_SIZE + BL_PACKET_SIZE_HEADER_SIZE) #define BL_REPORT_SIZE (BL_MIN_PACKET_SIZE + BL_PACKET_SIZE_HEADER_SIZE)
right/src/buspal/bm_usb/usb_descriptor.h
+14
View File
@@ -75,6 +75,20 @@ typedef struct _usb_hid_config_descriptor {
extern usb_device_class_struct_t g_hid_generic_class; extern usb_device_class_struct_t g_hid_generic_class;
usb_status_t usb_device_get_device_descriptor(
usb_device_handle handle, usb_device_get_device_descriptor_struct_t *device_descriptor);
usb_status_t usb_device_get_configuration_descriptor(
usb_device_handle handle, usb_device_get_configuration_descriptor_struct_t *configuration_descriptor);
usb_status_t usb_device_get_string_descriptor(
usb_device_handle handle, usb_device_get_string_descriptor_struct_t *string_descriptor);
usb_status_t usb_device_get_hid_descriptor(
usb_device_handle handle, usb_device_get_hid_descriptor_struct_t *hid_descriptor);
usb_status_t usb_device_get_hid_report_descriptor(
usb_device_handle handle, usb_device_get_hid_report_descriptor_struct_t *hid_report_descriptor);
usb_status_t usb_device_get_hid_physical_descriptor(
usb_device_handle handle, usb_device_get_hid_physical_descriptor_struct_t *hid_physical_descriptor);
extern uint8_t g_device_descriptor[]; extern uint8_t g_device_descriptor[];
extern usb_language_list_t g_language_list; extern usb_language_list_t g_language_list;
extern usb_language_list_t *g_language_ptr; extern usb_language_list_t *g_language_ptr;