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

Remove the unused usb_device_set_speed()

Browse Source
This commit is contained in:
László Monda
2017-04-14 00:10:30 +02:00
parent 38d07b27ef
commit 98fdcfc555
2 changed files with 13 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
right/src/buspal/bm_usb/usb_descriptor.c
View File

@@ -1,13 +1,20 @@
#include "usb_device_config.h" #include "usb_device_config.h"
#include "usb.h"
#include "usb_device.h"
#include "usb_device_class.h"
#include "usb_device_hid.h"
#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)
@@ -352,26 +359,3 @@ usb_status_t usb_device_get_string_descriptor(
} }
return kStatus_USB_Success; return kStatus_USB_Success;
} }
usb_status_t usb_device_set_speed(usb_device_handle handle, uint8_t speed)
{
usb_hid_config_descriptor_t *ptr_hid = NULL;
ptr_hid = (usb_hid_config_descriptor_t *)&g_config_descriptor[USB_HID_CONFIG_INDEX];
// HID interface
USB_SHORT_TO_LITTLE_ENDIAN_ADDRESS(FS_HID_GENERIC_INTERRUPT_IN_PACKET_SIZE, ptr_hid->endpoint_in.wMaxPacketSize);
ptr_hid->endpoint_in.bInterval = FS_HID_GENERIC_INTERRUPT_IN_INTERVAL;
USB_SHORT_TO_LITTLE_ENDIAN_ADDRESS(FS_HID_GENERIC_INTERRUPT_OUT_PACKET_SIZE, ptr_hid->endpoint_out.wMaxPacketSize);
ptr_hid->endpoint_out.bInterval = FS_HID_GENERIC_INTERRUPT_OUT_INTERVAL;
for (uint32_t i = 0; i < USB_HID_GENERIC_ENDPOINT_COUNT; i++) {
if (g_hid_generic_endpoints[i].endpointAddress & USB_DESCRIPTOR_ENDPOINT_ADDRESS_DIRECTION_IN) {
g_hid_generic_endpoints[i].maxPacketSize = FS_HID_GENERIC_INTERRUPT_IN_PACKET_SIZE;
} else {
g_hid_generic_endpoints[i].maxPacketSize = FS_HID_GENERIC_INTERRUPT_OUT_PACKET_SIZE;
}
}
return kStatus_USB_Success;
}

14
right/src/buspal/bm_usb/usb_descriptor.h
View File

@@ -74,20 +74,6 @@ typedef struct _usb_hid_config_descriptor {
} usb_hid_config_descriptor_t; } usb_hid_config_descriptor_t;
extern usb_device_class_struct_t g_hid_generic_class; extern usb_device_class_struct_t g_hid_generic_class;
extern usb_status_t usb_device_set_speed(usb_device_handle handle, uint8_t speed);
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;