kingkevin
/
passkey_fw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor cleanup

This commit is contained in:
hathach 2022-03-04 17:26:21 +07:00
parent 039b235ca4
commit 3a7d1cfead
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
examples/host/libusb_api/src/main.c
View File

@ -40,9 +40,6 @@
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
void led_blinking_task(void); void led_blinking_task(void);
extern void cdc_task(void);
extern void hid_app_task(void);
/*------------- MAIN -------------*/ /*------------- MAIN -------------*/
int main(void) int main(void)
{ {
@ -67,10 +64,17 @@ int main(void)
// TinyUSB Callbacks // TinyUSB Callbacks
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
void print_device_descriptor(uint8_t dev_addr)
{
printf("Device Descriptor:\r\n");
}
// Invoked when device is mounted (configured) // Invoked when device is mounted (configured)
void tuh_mount_cb (uint8_t dev_addr) void tuh_mount_cb (uint8_t dev_addr)
{ {
printf("Device attached, address = %d\r\n", dev_addr); printf("Device attached, address = %d\r\n", dev_addr);
print_device_descriptor(dev_addr);
} }
/// Invoked when device is unmounted (bus reset/unplugged) /// Invoked when device is unmounted (bus reset/unplugged)

13
src/host/usbh.c
View File

@ -37,11 +37,6 @@
// USBH Configuration // USBH Configuration
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
// TODO remove,update
#ifndef CFG_TUH_EP_MAX
#define CFG_TUH_EP_MAX 9
#endif
#ifndef CFG_TUH_TASK_QUEUE_SZ #ifndef CFG_TUH_TASK_QUEUE_SZ
#define CFG_TUH_TASK_QUEUE_SZ 16 #define CFG_TUH_TASK_QUEUE_SZ 16
#endif #endif
@ -72,7 +67,7 @@ typedef struct
} usbh_dev0_t; } usbh_dev0_t;
typedef struct { typedef struct {
// port // port, must be same layout as usbh_dev0_t
uint8_t rhport; uint8_t rhport;
uint8_t hub_addr; uint8_t hub_addr;
uint8_t hub_port; uint8_t hub_port;
@ -102,7 +97,7 @@ typedef struct {
volatile uint8_t state; // device state, value from enum tusbh_device_state_t volatile uint8_t state; // device state, value from enum tusbh_device_state_t
uint8_t itf2drv[16]; // map interface number to driver (0xff is invalid) uint8_t itf2drv[16]; // map interface number to driver (0xff is invalid)
uint8_t ep2drv[CFG_TUH_EP_MAX][2]; // map endpoint to driver ( 0xff is invalid ) uint8_t ep2drv[CFG_TUH_ENDPOINT_MAX][2]; // map endpoint to driver ( 0xff is invalid )
struct TU_ATTR_PACKED struct TU_ATTR_PACKED
{ {
@ -111,7 +106,7 @@ typedef struct {
volatile bool claimed : 1; volatile bool claimed : 1;
// TODO merge ep2drv here, 4-bit should be sufficient // TODO merge ep2drv here, 4-bit should be sufficient
}ep_status[CFG_TUH_EP_MAX][2]; }ep_status[CFG_TUH_ENDPOINT_MAX][2];
// Mutex for claiming endpoint, only needed when using with preempted RTOS // Mutex for claiming endpoint, only needed when using with preempted RTOS
#if CFG_TUSB_OS != OPT_OS_NONE #if CFG_TUSB_OS != OPT_OS_NONE
@ -344,6 +339,8 @@ bool tuh_init(uint8_t rhport)
TU_LOG2("USBH init\r\n"); TU_LOG2("USBH init\r\n");
TU_LOG2_INT(sizeof(usbh_device_t));
tu_memclr(_usbh_devices, sizeof(_usbh_devices)); tu_memclr(_usbh_devices, sizeof(_usbh_devices));
tu_memclr(&_dev0, sizeof(_dev0)); tu_memclr(&_dev0, sizeof(_dev0));