andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

remove static port defined for device/host

Browse Source
This commit is contained in:
hathach
2022-06-03 11:32:09 +07:00
parent 8b9cf152a0
commit 2571211957
4 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/device/cdc_msc/src/main.c
View File

@@ -54,7 +54,9 @@ void cdc_task(void);
int main(void) int main(void)
{ {
board_init(); board_init();
tusb_init();
// init device stack on configured roothub port
tud_init(BOARD_TUD_RHPORT);
while (1) while (1)
{ {

10
src/tusb.c
View File

@@ -38,12 +38,14 @@
bool tusb_init(void) bool tusb_init(void)
{ {
#if CFG_TUD_ENABLED #if CFG_TUD_ENABLED && defined(TUD_OPT_RHPORT)
TU_ASSERT ( tud_init(TUD_OPT_RHPORT) ); // init device stack // init device stack CFG_TUSB_RHPORTx_MODE must be defined
TU_ASSERT ( tud_init(TUD_OPT_RHPORT) );
#endif #endif
#if CFG_TUH_ENABLED #if CFG_TUH_ENABLED && defined(TUH_OPT_RHPORT)
TU_ASSERT( tuh_init(TUH_OPT_RHPORT) ); // init host stack // init host stack CFG_TUSB_RHPORTx_MODE must be defined
TU_ASSERT( tuh_init(TUH_OPT_RHPORT) );
#endif #endif
return true; return true;

10
src/tusb_option.h
View File

@@ -197,15 +197,6 @@ typedef int make_iso_compilers_happy ;
//------------- Roothub as Device -------------// //------------- Roothub as Device -------------//
//#ifndef CFG_TUSB_RHPORT0_MODE
// #define CFG_TUSB_RHPORT0_MODE OPT_MODE_NONE
//#endif
//
//#ifndef CFG_TUSB_RHPORT1_MODE
// #define CFG_TUSB_RHPORT1_MODE OPT_MODE_NONE
//#endif
#if defined(CFG_TUSB_RHPORT0_MODE) && ((CFG_TUSB_RHPORT0_MODE) & OPT_MODE_DEVICE) #if defined(CFG_TUSB_RHPORT0_MODE) && ((CFG_TUSB_RHPORT0_MODE) & OPT_MODE_DEVICE)
#define TUD_RHPORT_MODE (CFG_TUSB_RHPORT0_MODE) #define TUD_RHPORT_MODE (CFG_TUSB_RHPORT0_MODE)
#define TUD_OPT_RHPORT 0 #define TUD_OPT_RHPORT 0
@@ -214,7 +205,6 @@ typedef int make_iso_compilers_happy ;
#define TUD_OPT_RHPORT 1 #define TUD_OPT_RHPORT 1
#else #else
#define TUD_RHPORT_MODE OPT_MODE_NONE #define TUD_RHPORT_MODE OPT_MODE_NONE
#define TUD_OPT_RHPORT -1
#endif #endif
#ifndef CFG_TUD_ENABLED #ifndef CFG_TUD_ENABLED