From f52e1889c7f4bca23311a97b5869eab70c766094 Mon Sep 17 00:00:00 2001
From: MasterPhi <admin@hifiphile.com>
Date: Sat, 17 Jul 2021 20:41:19 +0200
Subject: [PATCH] Fix merge error.

---
 examples/device/cdc_msc/src/msc_disk.c         |  2 +-
 .../device/hid_composite/src/tusb_config.h     |  2 +-
 src/class/cdc/cdc_device.c                     | 14 --------------
 src/class/cdc/cdc_device.h                     | 18 ------------------
 4 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/examples/device/cdc_msc/src/msc_disk.c b/examples/device/cdc_msc/src/msc_disk.c
index 3caf3fd42..503baace9 100644
--- a/examples/device/cdc_msc/src/msc_disk.c
+++ b/examples/device/cdc_msc/src/msc_disk.c
@@ -23,7 +23,7 @@
  *
  */
 
-//#include "bsp/board.h"
+#include "bsp/board.h"
 #include "tusb.h"
 
 #if CFG_TUD_MSC
diff --git a/examples/device/hid_composite/src/tusb_config.h b/examples/device/hid_composite/src/tusb_config.h
index 31dea4ee9..868424e6d 100644
--- a/examples/device/hid_composite/src/tusb_config.h
+++ b/examples/device/hid_composite/src/tusb_config.h
@@ -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
diff --git a/src/class/cdc/cdc_device.c b/src/class/cdc/cdc_device.c
index 68080c61d..e622bd616 100644
--- a/src/class/cdc/cdc_device.c
+++ b/src/class/cdc/cdc_device.c
@@ -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
diff --git a/src/class/cdc/cdc_device.h b/src/class/cdc/cdc_device.h
index f8a2216c1..7ff757add 100644
--- a/src/class/cdc/cdc_device.h
+++ b/src/class/cdc/cdc_device.h
@@ -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);
-}
-
 /** @} */
 /** @} */