mirror/tinyusb
1
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2025-03-14 04:18:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge error.

Browse Source
This commit is contained in:
MasterPhi 2021-07-17 20:41:19 +02:00
parent bae0d3b7bb
commit f52e1889c7
4 changed files with 2 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/device/cdc_msc/src/msc_disk.c
View File

@ -23,7 +23,7 @@
*
*/
//#include "bsp/board.h"
#include "bsp/board.h"
#include "tusb.h"
#if CFG_TUD_MSC

2
examples/device/hid_composite/src/tusb_config.h
View File

@ -69,7 +69,7 @@
#endif
// CFG_TUSB_DEBUG is defined by compiler in DEBUG build
#define CFG_TUSB_DEBUG 0
// #define CFG_TUSB_DEBUG 0
/* USB DMA on some MCUs can only access a specific SRAM region with restriction on alignment.
* Tinyusb use follows macros to declare transferring memory so that they can be put

14
src/class/cdc/cdc_device.c
View File

@ -481,18 +481,4 @@ bool cdcd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t result, uint32_
return true;
}
// Get the Receive FIFO (for DMA transfer)
tu_fifo_t* tud_cdc_n_get_rx_ff (uint8_t itf)
{
TU_ASSERT(itf < CFG_TUD_CDC);
return &_cdcd_itf[itf].rx_ff;
}
// Get the transmit FIFO (for DMA transfer)
tu_fifo_t* tud_cdc_n_get_tx_ff (uint8_t itf)
{
TU_ASSERT(itf < CFG_TUD_CDC);
return &_cdcd_itf[itf].tx_ff;
}
#endif

18
src/class/cdc/cdc_device.h
View File

@ -104,12 +104,6 @@ uint32_t tud_cdc_n_write_available (uint8_t itf);
// Clear the transmit FIFO
bool tud_cdc_n_write_clear (uint8_t itf);
// Get the Receive FIFO (for DMA transfer)
tu_fifo_t* tud_cdc_n_get_rx_ff (uint8_t itf);
// Get the transmit FIFO (for DMA transfer)
tu_fifo_t* tud_cdc_n_get_tx_ff (uint8_t itf);
//--------------------------------------------------------------------+
// Application API (Single Port)
//--------------------------------------------------------------------+
@ -247,18 +241,6 @@ static inline bool tud_cdc_write_clear(void)
return tud_cdc_n_write_clear(0);
}
// Get the Receive FIFO
static inline tu_fifo_t* tud_cdc_get_rx_ff (void)
{
return tud_cdc_n_get_rx_ff(0);
}
// Get the transmit FIFO
static inline tu_fifo_t* tud_cdc_get_tx_ff (void)
{
return tud_cdc_n_get_tx_ff(0);
}
/** @} */
/** @} */