diff options
| author | Reinhard Panhuber <[email protected]> | 2021-02-17 21:59:32 +0100 |
|---|---|---|
| committer | Reinhard Panhuber <[email protected]> | 2021-02-17 21:59:32 +0100 |
| commit | eee47493a336eb334fdd7f1713903e2131a86650 (patch) | |
| tree | 4b8c3471b1fb5720c2114016b1445ccc10dec408 /src | |
| parent | e407ce463d007231f0d24e55768c1d0ab3b2c049 (diff) | |
Fix bug in evasion buffer list
Diffstat (limited to 'src')
| -rw-r--r-- | src/class/audio/audio_device.c | 4 | ||||
| -rw-r--r-- | src/portable/st/stm32_fsdev/dcd_stm32_fsdev.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/class/audio/audio_device.c b/src/class/audio/audio_device.c index c93de9380..9dd2ee704 100644 --- a/src/class/audio/audio_device.c +++ b/src/class/audio/audio_device.c @@ -132,7 +132,7 @@ typedef struct CFG_TUSB_MCU == OPT_MCU_LPC18XX || /* No clue how driver works */ \ CFG_TUSB_MCU == OPT_MCU_LPC43XX || \ CFG_TUSB_MCU == OPT_MCU_MIMXRT10XX || \ - CFG_TUSB_MCU == OPT_MCU_RP2040) || /* Don't want to change driver */ \ + CFG_TUSB_MCU == OPT_MCU_RP2040 || /* Don't want to change driver */ \ CFG_TUSB_MCU == OPT_MCU_VALENTYUSB_EPTRI || /* Intermediate software buffer required */ \ CFG_TUSB_MCU == OPT_MCU_CXD56 || /* No clue how driver works */ \ CFG_TUSB_MCU == OPT_MCU_DA1469X || /* Uses DMA - Ok for FIFO, had no time for implementation */ \ @@ -148,7 +148,7 @@ typedef struct CFG_TUSB_MCU == OPT_MCU_SAMD11 || /* Uses DMA - Ok for FIFO, had no time for implementation */ \ CFG_TUSB_MCU == OPT_MCU_SAMD21 || \ CFG_TUSB_MCU == OPT_MCU_SAMD51 || \ - CFG_TUSB_MCU == OPT_MCU_SAME5X) + CFG_TUSB_MCU == OPT_MCU_SAME5X ) #define USE_EVADE_BUFFER 1 diff --git a/src/portable/st/stm32_fsdev/dcd_stm32_fsdev.c b/src/portable/st/stm32_fsdev/dcd_stm32_fsdev.c index 9d813d4a5..0d25cceb8 100644 --- a/src/portable/st/stm32_fsdev/dcd_stm32_fsdev.c +++ b/src/portable/st/stm32_fsdev/dcd_stm32_fsdev.c @@ -984,7 +984,7 @@ static bool dcd_write_packet_memory_ff(tu_fifo_t * ff, uint16_t dst, uint16_t wN { // Since we copy from a ring buffer FIFO, a wrap might occur making it necessary to conduct two copies // Check for first linear part - void *__restrict src; + void * src; uint16_t len = tu_fifo_get_linear_read_info(ff, 0, &src, wNBytes); // We want to read from the FIFO TU_VERIFY(len && dcd_write_packet_memory(dst, src, len)); // and write it into the PMA tu_fifo_advance_read_pointer(ff, len); @@ -1064,7 +1064,7 @@ static bool dcd_read_packet_memory_ff(tu_fifo_t * ff, uint16_t src, uint16_t wNB { // Since we copy into a ring buffer FIFO, a wrap might occur making it necessary to conduct two copies // Check for first linear part - void *__restrict dst; + void * dst; uint16_t len = tu_fifo_get_linear_write_info(ff, 0, &dst, wNBytes); TU_VERIFY(len && dcd_read_packet_memory(dst, src, len)); tu_fifo_advance_write_pointer(ff, len); |