mirror/tinyusb
1
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2025-03-28 16:20:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

clean up

Browse Source
This commit is contained in:
hathach 2018-12-12 12:36:40 +07:00
parent 6c0b0917e1
commit 5fd60e5761
No known key found for this signature in database
GPG Key ID: 2FA891220FBFD581
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/tusb_types.h
View File

@ -181,7 +181,6 @@ enum {
typedef enum typedef enum
{ {
TUSB_DEVICE_STATE_UNPLUG = 0 , TUSB_DEVICE_STATE_UNPLUG = 0 ,
TUSB_DEVICE_STATE_ADDRESSED ,
TUSB_DEVICE_STATE_CONFIGURED , TUSB_DEVICE_STATE_CONFIGURED ,
TUSB_DEVICE_STATE_SUSPENDED , TUSB_DEVICE_STATE_SUSPENDED ,
}tusb_device_state_t; }tusb_device_state_t;

10
src/host/usbh.c
View File

@ -438,7 +438,6 @@ bool enum_task(hcd_event_t* event)
#endif #endif
TU_ASSERT_ERR( usbh_pipe_control_open(0, 8) ); TU_ASSERT_ERR( usbh_pipe_control_open(0, 8) );
dev0->state = TUSB_DEVICE_STATE_ADDRESSED;
//------------- Get first 8 bytes of device descriptor to get Control Endpoint Size -------------// //------------- Get first 8 bytes of device descriptor to get Control Endpoint Size -------------//
request = (tusb_control_request_t ) { request = (tusb_control_request_t ) {
@ -493,7 +492,6 @@ bool enum_task(hcd_event_t* event)
new_dev->hub_addr = dev0->hub_addr; new_dev->hub_addr = dev0->hub_addr;
new_dev->hub_port = dev0->hub_port; new_dev->hub_port = dev0->hub_port;
new_dev->speed = dev0->speed; new_dev->speed = dev0->speed;
new_dev->state = TUSB_DEVICE_STATE_ADDRESSED;
hcd_device_close(dev0->rhport, 0); // close device 0 hcd_device_close(dev0->rhport, 0); // close device 0
dev0->state = TUSB_DEVICE_STATE_UNPLUG; dev0->state = TUSB_DEVICE_STATE_UNPLUG;
@ -655,13 +653,11 @@ void usbh_task(void* param)
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
static inline uint8_t get_new_address(void) static inline uint8_t get_new_address(void)
{ {
uint8_t addr; for (uint8_t addr=1; addr <= CFG_TUSB_HOST_DEVICE_MAX; addr++)
for (addr=1; addr <= CFG_TUSB_HOST_DEVICE_MAX; addr++)
{ {
if (_usbh_devices[addr].state == TUSB_DEVICE_STATE_UNPLUG) if (_usbh_devices[addr].state == TUSB_DEVICE_STATE_UNPLUG) return addr;
break;
} }
return addr; return CFG_TUSB_HOST_DEVICE_MAX;
} }
static inline uint8_t get_configure_number_for_device(tusb_desc_device_t* dev_desc) static inline uint8_t get_configure_number_for_device(tusb_desc_device_t* dev_desc)