Fix merge error.
This commit is contained in:
parent
bae0d3b7bb
commit
f52e1889c7
|
@ -23,7 +23,7 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
//#include "bsp/board.h"
|
#include "bsp/board.h"
|
||||||
#include "tusb.h"
|
#include "tusb.h"
|
||||||
|
|
||||||
#if CFG_TUD_MSC
|
#if CFG_TUD_MSC
|
||||||
|
|
|
@ -69,7 +69,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// CFG_TUSB_DEBUG is defined by compiler in DEBUG build
|
// 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.
|
/* 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
|
* Tinyusb use follows macros to declare transferring memory so that they can be put
|
||||||
|
|
|
@ -481,18 +481,4 @@ bool cdcd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t result, uint32_
|
||||||
return true;
|
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
|
#endif
|
||||||
|
|
|
@ -104,12 +104,6 @@ uint32_t tud_cdc_n_write_available (uint8_t itf);
|
||||||
// Clear the transmit FIFO
|
// Clear the transmit FIFO
|
||||||
bool tud_cdc_n_write_clear (uint8_t itf);
|
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)
|
// Application API (Single Port)
|
||||||
//--------------------------------------------------------------------+
|
//--------------------------------------------------------------------+
|
||||||
|
@ -247,18 +241,6 @@ static inline bool tud_cdc_write_clear(void)
|
||||||
return tud_cdc_n_write_clear(0);
|
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);
|
|
||||||
}
|
|
||||||
|
|
||||||
/** @} */
|
/** @} */
|
||||||
/** @} */
|
/** @} */
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue