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

more clean up

Browse Source
This commit is contained in:
hathach
2023-03-18 11:43:47 +07:00
parent d919f107c7
commit 9f54cc1eb7
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/class/usbtmc/usbtmc_device.c
View File

@@ -154,7 +154,10 @@ TU_VERIFY_STATIC(USBTMCD_BUFFER_SIZE >= 32u,"USBTMC dev buffer size too small");
static bool handle_devMsgOutStart(uint8_t rhport, void *data, size_t len); static bool handle_devMsgOutStart(uint8_t rhport, void *data, size_t len);
static bool handle_devMsgOut(uint8_t rhport, void *data, size_t len, size_t packetLen); static bool handle_devMsgOut(uint8_t rhport, void *data, size_t len, size_t packetLen);
#ifndef NDEBUG
tu_static uint8_t termChar; tu_static uint8_t termChar;
#endif
tu_static uint8_t termCharRequested = false; tu_static uint8_t termCharRequested = false;
#if OSAL_MUTEX_REQUIRED #if OSAL_MUTEX_REQUIRED
@@ -442,7 +445,10 @@ static bool handle_devMsgIn(void *data, size_t len)
usbtmc_state.transfer_size_sent = 0u; usbtmc_state.transfer_size_sent = 0u;
termCharRequested = msg->bmTransferAttributes.TermCharEnabled; termCharRequested = msg->bmTransferAttributes.TermCharEnabled;
#ifndef NDEBUG
termChar = msg->TermChar; termChar = msg->TermChar;
#endif
if(termCharRequested) if(termCharRequested)
TU_VERIFY(usbtmc_state.capabilities->bmDevCapabilities.canEndBulkInOnTermChar); TU_VERIFY(usbtmc_state.capabilities->bmDevCapabilities.canEndBulkInOnTermChar);
@@ -511,6 +517,7 @@ bool usbtmcd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t result, uint
return true; return true;
case STATE_ABORTING_BULK_OUT: case STATE_ABORTING_BULK_OUT:
// Should be stalled by now, shouldn't have received a packet.
return false; return false;
case STATE_TX_REQUESTED: case STATE_TX_REQUESTED:

4
src/portable/raspberrypi/rp2040/rp2040_usb.h
View File

@@ -36,8 +36,8 @@
#define __tusb_irq_path_func(x) x #define __tusb_irq_path_func(x) x
#endif #endif
#define usb_hw_set hw_set_alias(usb_hw) #define usb_hw_set ((usb_hw_t *) hw_set_alias(usb_hw))
#define usb_hw_clear hw_clear_alias(usb_hw) #define usb_hw_clear ((usb_hw_t *) hw_clear_alias(usb_hw))
#define pico_info(...) TU_LOG(2, __VA_ARGS__) #define pico_info(...) TU_LOG(2, __VA_ARGS__)
#define pico_trace(...) TU_LOG(3, __VA_ARGS__) #define pico_trace(...) TU_LOG(3, __VA_ARGS__)