mirror/tinyusb
1
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2025-02-23 09:41:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #386 from hathach/follow-383

Browse Source 
Follow 383
This commit is contained in:
Ha Thach 2020-04-29 15:27:25 +07:00 committed by GitHub
commit e9c71055ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/device/board_test/sdkconfig.defaults
View File

@ -1,4 +1,4 @@
CONFIG_IDF_CMAKE=y CONFIG_IDF_CMAKE=y
CONFIG_IDF_TARGET="esp32s2" CONFIG_IDF_TARGET="esp32s2"
CONFIG_IDF_TARGET_ESP32S2=y CONFIG_IDF_TARGET_ESP32S2=y
CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y

1
examples/device/cdc_msc_freertos/sdkconfig.defaults
View File

@ -2,3 +2,4 @@ CONFIG_IDF_CMAKE=y
CONFIG_IDF_TARGET="esp32s2" CONFIG_IDF_TARGET="esp32s2"
CONFIG_IDF_TARGET_ESP32S2=y CONFIG_IDF_TARGET_ESP32S2=y
CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y
CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y

1
examples/device/hid_composite_freertos/sdkconfig.defaults
View File

@ -2,3 +2,4 @@ CONFIG_IDF_CMAKE=y
CONFIG_IDF_TARGET="esp32s2" CONFIG_IDF_TARGET="esp32s2"
CONFIG_IDF_TARGET_ESP32S2=y CONFIG_IDF_TARGET_ESP32S2=y
CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y
CONFIG_FREERTOS_SUPPORT_STATIC_ALLOCATION=y

4
hw/bsp/esp32s2_saola_1/esp32s2_saola_1.c
View File

@ -37,8 +37,8 @@
// Note: On the production version (v1.2) WS2812 is connected to GPIO 18, // Note: On the production version (v1.2) WS2812 is connected to GPIO 18,
// however earlier revision v1.1 WS2812 is connected to GPIO 17 // however earlier revision v1.1 WS2812 is connected to GPIO 17
#define LED_PIN 18 // v1.2 and later //#define LED_PIN 18 // v1.2 and later
//#define LED_PIN 17 // v1.1 #define LED_PIN 17 // v1.1
#define BUTTON_PIN 0 #define BUTTON_PIN 0
#define BUTTON_STATE_ACTIVE 0 #define BUTTON_STATE_ACTIVE 0

17
src/device/usbd.c
View File

@ -995,12 +995,21 @@ bool usbd_edpt_xfer(uint8_t rhport, uint8_t ep_addr, uint8_t * buffer, uint16_t
TU_LOG2(" Queue EP %02X with %u bytes ... ", ep_addr, total_bytes); TU_LOG2(" Queue EP %02X with %u bytes ... ", ep_addr, total_bytes);
// Set busy first since the actual transfer can be complete before dcd_edpt_xfer() could return
// and usbd task can preempt and clear the busy
_usbd_dev.ep_status[epnum][dir].busy = true; _usbd_dev.ep_status[epnum][dir].busy = true;
TU_VERIFY_HDLR( dcd_edpt_xfer(rhport, ep_addr, buffer, total_bytes), _usbd_dev.ep_status[epnum][dir].busy = false);
TU_LOG2("OK\r\n"); if ( dcd_edpt_xfer(rhport, ep_addr, buffer, total_bytes) )
{
return true; TU_LOG2("OK\r\n");
return true;
}else
{
_usbd_dev.ep_status[epnum][dir].busy = false;
TU_LOG2("failed\r\n");
TU_BREAKPOINT();
return false;
}
} }
bool usbd_edpt_busy(uint8_t rhport, uint8_t ep_addr) bool usbd_edpt_busy(uint8_t rhport, uint8_t ep_addr)