From 874e07c303cb69b69d3b4fea654011bb8d9259ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= Date: Fri, 14 Apr 2017 00:42:43 +0200 Subject: [PATCH] Move usb_device_get_*() functions back to usb_descriptor.h --- right/src/buspal/bm_usb/usb_descriptor.c | 13 ------------- right/src/buspal/bm_usb/usb_descriptor.h | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/right/src/buspal/bm_usb/usb_descriptor.c b/right/src/buspal/bm_usb/usb_descriptor.c index 219e010..796b15a 100644 --- a/right/src/buspal/bm_usb/usb_descriptor.c +++ b/right/src/buspal/bm_usb/usb_descriptor.c @@ -2,19 +2,6 @@ #include "bootloader_hid_report_ids.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_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) diff --git a/right/src/buspal/bm_usb/usb_descriptor.h b/right/src/buspal/bm_usb/usb_descriptor.h index 71743de..649ce5b 100644 --- a/right/src/buspal/bm_usb/usb_descriptor.h +++ b/right/src/buspal/bm_usb/usb_descriptor.h @@ -75,6 +75,20 @@ typedef struct _usb_hid_config_descriptor { 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 usb_language_list_t g_language_list; extern usb_language_list_t *g_language_ptr;