From da452d4ba6127b2b3b83832ba142bece911e2490 Mon Sep 17 00:00:00 2001
From: hathach <thach@tinyusb.org>
Date: Wed, 27 Mar 2019 17:48:42 +0700
Subject: [PATCH] cleanup, remove the use of _TINY_USB_SOURCE_FILE_

---
 src/class/cdc/cdc_device.c       |  2 --
 src/class/cdc/cdc_device.h       |  7 ++-----
 src/class/cdc/cdc_host.c         |  2 --
 src/class/cdc/cdc_host.h         |  6 +-----
 src/class/cdc/cdc_rndis_host.c   |  2 --
 src/class/cdc/cdc_rndis_host.h   |  6 +-----
 src/class/custom/custom_device.c |  2 --
 src/class/custom/custom_device.h |  6 +-----
 src/class/custom/custom_host.c   |  2 --
 src/class/custom/custom_host.h   |  7 +++----
 src/class/hid/hid_device.c       |  1 -
 src/class/hid/hid_device.h       |  4 ----
 src/class/hid/hid_host.c         |  4 ----
 src/class/hid/hid_host.h         |  6 +-----
 src/class/midi/midi_device.c     |  1 -
 src/class/midi/midi_device.h     | 10 +++-------
 src/class/msc/msc_device.c       |  5 -----
 src/class/msc/msc_device.h       |  6 +-----
 src/class/msc/msc_host.c         |  2 --
 src/class/msc/msc_host.h         |  6 +-----
 src/device/usbd.c                |  2 --
 src/device/usbd_control.c        |  2 --
 src/host/hub.c                   |  2 --
 src/host/hub.h                   |  6 +-----
 src/host/usbh.c                  |  2 --
 src/host/usbh.h                  |  3 ---
 src/tusb.c                       |  1 -
 27 files changed, 15 insertions(+), 90 deletions(-)

diff --git a/src/class/cdc/cdc_device.c b/src/class/cdc/cdc_device.c
index 48e94a6e1..2ac8d471c 100644
--- a/src/class/cdc/cdc_device.c
+++ b/src/class/cdc/cdc_device.c
@@ -28,8 +28,6 @@
 
 #if (TUSB_OPT_DEVICE_ENABLED && CFG_TUD_CDC)
 
-#define _TINY_USB_SOURCE_FILE_
-
 #include "cdc_device.h"
 #include "device/usbd_pvt.h"
 
diff --git a/src/class/cdc/cdc_device.h b/src/class/cdc/cdc_device.h
index 3375fc98d..468edef45 100644
--- a/src/class/cdc/cdc_device.h
+++ b/src/class/cdc/cdc_device.h
@@ -96,10 +96,9 @@ ATTR_WEAK void tud_cdc_line_state_cb(uint8_t itf, bool dtr, bool rts);
 ATTR_WEAK void tud_cdc_line_coding_cb(uint8_t itf, cdc_line_coding_t const* p_line_coding);
 
 //--------------------------------------------------------------------+
-// USBD-CLASS DRIVER API
-//--------------------------------------------------------------------+
-#ifdef _TINY_USB_SOURCE_FILE_
+// INTERNAL USBD-CLASS DRIVER API
 
+//--------------------------------------------------------------------+
 void cdcd_init               (void);
 bool cdcd_open               (uint8_t rhport, tusb_desc_interface_t const * p_interface_desc, uint16_t *p_length);
 bool cdcd_control_request (uint8_t rhport, tusb_control_request_t const * p_request);
@@ -107,8 +106,6 @@ bool cdcd_control_request_complete (uint8_t rhport, tusb_control_request_t const
 bool cdcd_xfer_cb            (uint8_t rhport, uint8_t ep_addr, xfer_result_t result, uint32_t xferred_bytes);
 void cdcd_reset              (uint8_t rhport);
 
-#endif
-
 #ifdef __cplusplus
  }
 #endif
diff --git a/src/class/cdc/cdc_host.c b/src/class/cdc/cdc_host.c
index 4932a61ac..75c805152 100644
--- a/src/class/cdc/cdc_host.c
+++ b/src/class/cdc/cdc_host.c
@@ -28,8 +28,6 @@
 
 #if (TUSB_OPT_HOST_ENABLED && CFG_TUH_CDC)
 
-#define _TINY_USB_SOURCE_FILE_
-
 #include "common/tusb_common.h"
 #include "cdc_host.h"
 
diff --git a/src/class/cdc/cdc_host.h b/src/class/cdc/cdc_host.h
index 716203b96..7a302eb0f 100644
--- a/src/class/cdc/cdc_host.h
+++ b/src/class/cdc/cdc_host.h
@@ -109,17 +109,13 @@ void tuh_cdc_xfer_isr(uint8_t dev_addr, xfer_result_t event, cdc_pipeid_t pipe_i
 /// @}
 
 //--------------------------------------------------------------------+
-// USBH-CLASS API
+// Internal Class Driver API
 //--------------------------------------------------------------------+
-#ifdef _TINY_USB_SOURCE_FILE_
-
 void cdch_init(void);
 bool cdch_open(uint8_t rhport, uint8_t dev_addr, tusb_desc_interface_t const *itf_desc, uint16_t *p_length);
 void cdch_isr(uint8_t dev_addr, uint8_t ep_addr, xfer_result_t event, uint32_t xferred_bytes);
 void cdch_close(uint8_t dev_addr);
 
-#endif
-
 #ifdef __cplusplus
  }
 #endif
diff --git a/src/class/cdc/cdc_rndis_host.c b/src/class/cdc/cdc_rndis_host.c
index d377ddca3..587e9ddc8 100644
--- a/src/class/cdc/cdc_rndis_host.c
+++ b/src/class/cdc/cdc_rndis_host.c
@@ -28,8 +28,6 @@
 
 #if (TUSB_OPT_HOST_ENABLED && CFG_TUH_CDC && CFG_TUH_CDC_RNDIS)
 
-#define _TINY_USB_SOURCE_FILE_
-
 //--------------------------------------------------------------------+
 // INCLUDE
 //--------------------------------------------------------------------+
diff --git a/src/class/cdc/cdc_rndis_host.h b/src/class/cdc/cdc_rndis_host.h
index 377ae64ba..24becee07 100644
--- a/src/class/cdc/cdc_rndis_host.h
+++ b/src/class/cdc/cdc_rndis_host.h
@@ -40,10 +40,8 @@
 #endif
 
 //--------------------------------------------------------------------+
-// RNDIS-CDC Driver API
+// INTERNAL RNDIS-CDC Driver API
 //--------------------------------------------------------------------+
-#ifdef _TINY_USB_SOURCE_FILE_
-
 typedef struct {
   OSAL_SEM_DEF(semaphore_notification);
   osal_semaphore_handle_t sem_notification_hdl;  // used to wait on notification pipe
@@ -56,8 +54,6 @@ tusb_error_t rndish_open_subtask(uint8_t dev_addr, cdch_data_t *p_cdc);
 void rndish_xfer_isr(cdch_data_t *p_cdc, pipe_handle_t pipe_hdl, xfer_result_t event, uint32_t xferred_bytes);
 void rndish_close(uint8_t dev_addr);
 
-#endif
-
 #ifdef __cplusplus
  }
 #endif
diff --git a/src/class/custom/custom_device.c b/src/class/custom/custom_device.c
index bc2f98c1b..04921259f 100644
--- a/src/class/custom/custom_device.c
+++ b/src/class/custom/custom_device.c
@@ -28,8 +28,6 @@
 
 #if (TUSB_OPT_DEVICE_ENABLED && CFG_TUD_CUSTOM_CLASS)
 
-#define _TINY_USB_SOURCE_FILE_
-
 #include "common/tusb_common.h"
 #include "custom_device.h"
 #include "device/usbd_pvt.h"
diff --git a/src/class/custom/custom_device.h b/src/class/custom/custom_device.h
index a1dc09430..704ecb23a 100644
--- a/src/class/custom/custom_device.h
+++ b/src/class/custom/custom_device.h
@@ -46,17 +46,13 @@
 //--------------------------------------------------------------------+
 
 //--------------------------------------------------------------------+
-// USBD-CLASS DRIVER API
+// Internal Class Driver API
 //--------------------------------------------------------------------+
-#ifdef _TINY_USB_SOURCE_FILE_
-
 void cusd_init(void);
 bool cusd_open(uint8_t rhport, tusb_desc_interface_t const * itf_desc, uint16_t *p_length);
 bool cusd_control_request_st(uint8_t rhport, tusb_control_request_t const * p_request);
 bool cusd_control_request_complete (uint8_t rhport, tusb_control_request_t const * p_request);
 bool cusd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t event, uint32_t xferred_bytes);
 void cusd_reset(uint8_t rhport);
-#endif
-
 
 #endif /* _TUSB_CUSTOM_DEVICE_H_ */
diff --git a/src/class/custom/custom_host.c b/src/class/custom/custom_host.c
index 3ac12a688..488e26b20 100644
--- a/src/class/custom/custom_host.c
+++ b/src/class/custom/custom_host.c
@@ -28,8 +28,6 @@
 
 #if (TUSB_OPT_HOST_ENABLED && CFG_TUSB_HOST_CUSTOM_CLASS)
 
-#define _TINY_USB_SOURCE_FILE_
-
 //--------------------------------------------------------------------+
 // INCLUDE
 //--------------------------------------------------------------------+
diff --git a/src/class/custom/custom_host.h b/src/class/custom/custom_host.h
index 2ba288e1f..cf612a40b 100644
--- a/src/class/custom/custom_host.h
+++ b/src/class/custom/custom_host.h
@@ -57,15 +57,14 @@ static inline bool tusbh_custom_is_mounted(uint8_t dev_addr, uint16_t vendor_id,
 tusb_error_t tusbh_custom_read(uint8_t dev_addr, uint16_t vendor_id, uint16_t product_id, void * p_buffer, uint16_t length);
 tusb_error_t tusbh_custom_write(uint8_t dev_addr, uint16_t vendor_id, uint16_t product_id, void const * p_data, uint16_t length);
 
-#ifdef _TINY_USB_SOURCE_FILE_
-
+//--------------------------------------------------------------------+
+// Internal Class Driver API
+//--------------------------------------------------------------------+
 void         cush_init(void);
 tusb_error_t cush_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_interface_desc, uint16_t *p_length);
 void         cush_isr(pipe_handle_t pipe_hdl, xfer_result_t event);
 void         cush_close(uint8_t dev_addr);
 
-#endif
-
 #ifdef __cplusplus
  }
 #endif
diff --git a/src/class/hid/hid_device.c b/src/class/hid/hid_device.c
index fd7602251..3a20a9cc8 100644
--- a/src/class/hid/hid_device.c
+++ b/src/class/hid/hid_device.c
@@ -28,7 +28,6 @@
 
 #if (TUSB_OPT_DEVICE_ENABLED && CFG_TUD_HID)
 
-#define _TINY_USB_SOURCE_FILE_
 //--------------------------------------------------------------------+
 // INCLUDE
 //--------------------------------------------------------------------+
diff --git a/src/class/hid/hid_device.h b/src/class/hid/hid_device.h
index e0d8907de..096daad18 100644
--- a/src/class/hid/hid_device.h
+++ b/src/class/hid/hid_device.h
@@ -361,8 +361,6 @@ ATTR_WEAK void tud_hid_mouse_set_report_cb(uint8_t report_id, hid_report_type_t
 //--------------------------------------------------------------------+
 // INTERNAL API
 //--------------------------------------------------------------------+
-#ifdef _TINY_USB_SOURCE_FILE_
-
 void hidd_init(void);
 bool hidd_open(uint8_t rhport, tusb_desc_interface_t const * itf_desc, uint16_t *p_length);
 bool hidd_control_request(uint8_t rhport, tusb_control_request_t const * p_request);
@@ -370,8 +368,6 @@ bool hidd_control_request_complete (uint8_t rhport, tusb_control_request_t const
 bool hidd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t event, uint32_t xferred_bytes);
 void hidd_reset(uint8_t rhport);
 
-#endif
-
 #ifdef __cplusplus
  }
 #endif
diff --git a/src/class/hid/hid_host.c b/src/class/hid/hid_host.c
index a52cf64b3..5aabbc01f 100644
--- a/src/class/hid/hid_host.c
+++ b/src/class/hid/hid_host.c
@@ -28,10 +28,6 @@
 
 #if (TUSB_OPT_HOST_ENABLED && HOST_CLASS_HID)
 
-#define _TINY_USB_SOURCE_FILE_
-//--------------------------------------------------------------------+
-// INCLUDE
-//--------------------------------------------------------------------+
 #include "common/tusb_common.h"
 #include "hid_host.h"
 
diff --git a/src/class/hid/hid_host.h b/src/class/hid/hid_host.h
index 0e5e48c64..8fa974c92 100644
--- a/src/class/hid/hid_host.h
+++ b/src/class/hid/hid_host.h
@@ -193,10 +193,8 @@ void tuh_hid_generic_isr(uint8_t dev_addr, xfer_result_t event);
 /** @} */ // ClassDriver_HID_Generic
 
 //--------------------------------------------------------------------+
-// USBH-CLASS DRIVER API
+// Internal Class Driver API
 //--------------------------------------------------------------------+
-#ifdef _TINY_USB_SOURCE_FILE_
-
 typedef struct {
   pipe_handle_t pipe_hdl;
   uint16_t report_size;
@@ -208,8 +206,6 @@ bool hidh_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_interfac
 void hidh_isr(pipe_handle_t pipe_hdl, xfer_result_t event, uint32_t xferred_bytes);
 void hidh_close(uint8_t dev_addr);
 
-#endif
-
 #ifdef __cplusplus
 }
 #endif
diff --git a/src/class/midi/midi_device.c b/src/class/midi/midi_device.c
index 53c7575f4..5ba111a22 100644
--- a/src/class/midi/midi_device.c
+++ b/src/class/midi/midi_device.c
@@ -28,7 +28,6 @@
 
 #if (TUSB_OPT_DEVICE_ENABLED && CFG_TUD_MIDI)
 
-#define _TINY_USB_SOURCE_FILE_
 //--------------------------------------------------------------------+
 // INCLUDE
 //--------------------------------------------------------------------+
diff --git a/src/class/midi/midi_device.h b/src/class/midi/midi_device.h
index 7cbad6e22..a43514044 100644
--- a/src/class/midi/midi_device.h
+++ b/src/class/midi/midi_device.h
@@ -85,18 +85,14 @@ static inline bool     tud_midi_write_flush     (void)
 ATTR_WEAK void tud_midi_rx_cb(uint8_t itf);
 
 //--------------------------------------------------------------------+
-// USBD-CLASS DRIVER API
+// Internal Class Driver API
 //--------------------------------------------------------------------+
-#ifdef _TINY_USB_SOURCE_FILE_
-
-void         midid_init               (void);
+void midid_init               (void);
 bool midid_open               (uint8_t rhport, tusb_desc_interface_t const * p_interface_desc, uint16_t *p_length);
 bool midid_control_request (uint8_t rhport, tusb_control_request_t const * p_request);
 bool midid_control_request_complete (uint8_t rhport, tusb_control_request_t const * p_request);
 bool midid_xfer_cb            (uint8_t rhport, uint8_t edpt_addr, xfer_result_t result, uint32_t xferred_bytes);
-void         midid_reset              (uint8_t rhport);
-
-#endif
+void midid_reset              (uint8_t rhport);
 
 #ifdef __cplusplus
  }
diff --git a/src/class/msc/msc_device.c b/src/class/msc/msc_device.c
index 4585d520a..04a3178a3 100644
--- a/src/class/msc/msc_device.c
+++ b/src/class/msc/msc_device.c
@@ -28,11 +28,6 @@
 
 #if (TUSB_OPT_DEVICE_ENABLED && CFG_TUD_MSC)
 
-//--------------------------------------------------------------------+
-// INCLUDE
-//--------------------------------------------------------------------+
-#define _TINY_USB_SOURCE_FILE_
-
 #include "common/tusb_common.h"
 #include "msc_device.h"
 #include "device/usbd_pvt.h"
diff --git a/src/class/msc/msc_device.h b/src/class/msc/msc_device.h
index c97f6d111..e030951be 100644
--- a/src/class/msc/msc_device.h
+++ b/src/class/msc/msc_device.h
@@ -154,10 +154,8 @@ ATTR_WEAK bool tud_msc_is_writable_cb(uint8_t lun);
 /** @} */
 
 //--------------------------------------------------------------------+
-// USBD-CLASS DRIVER API
+// Internal Class Driver API
 //--------------------------------------------------------------------+
-#ifdef _TINY_USB_SOURCE_FILE_
-
 void mscd_init(void);
 bool mscd_open(uint8_t rhport, tusb_desc_interface_t const * itf_desc, uint16_t *p_length);
 bool mscd_control_request(uint8_t rhport, tusb_control_request_t const * p_request);
@@ -165,8 +163,6 @@ bool mscd_control_request_complete (uint8_t rhport, tusb_control_request_t const
 bool mscd_xfer_cb(uint8_t rhport, uint8_t ep_addr, xfer_result_t event, uint32_t xferred_bytes);
 void mscd_reset(uint8_t rhport);
 
-#endif
-
 #ifdef __cplusplus
  }
 #endif
diff --git a/src/class/msc/msc_host.c b/src/class/msc/msc_host.c
index 4e438a787..bb12c52d7 100644
--- a/src/class/msc/msc_host.c
+++ b/src/class/msc/msc_host.c
@@ -28,8 +28,6 @@
 
 #if TUSB_OPT_HOST_ENABLED & CFG_TUH_MSC
 
-#define _TINY_USB_SOURCE_FILE_
-
 //--------------------------------------------------------------------+
 // INCLUDE
 //--------------------------------------------------------------------+
diff --git a/src/class/msc/msc_host.h b/src/class/msc/msc_host.h
index dea090a94..1edce82c5 100644
--- a/src/class/msc/msc_host.h
+++ b/src/class/msc/msc_host.h
@@ -171,10 +171,8 @@ void tuh_msc_isr(uint8_t dev_addr, xfer_result_t event, uint32_t xferred_bytes);
 
 
 //--------------------------------------------------------------------+
-// USBH-CLASS DRIVER API
+// Internal Class Driver API
 //--------------------------------------------------------------------+
-#ifdef _TINY_USB_SOURCE_FILE_
-
 typedef struct
 {
   uint8_t itf_numr;
@@ -198,8 +196,6 @@ bool msch_open(uint8_t rhport, uint8_t dev_addr, tusb_desc_interface_t const *it
 void msch_isr(uint8_t dev_addr, uint8_t ep_addr, xfer_result_t event, uint32_t xferred_bytes);
 void msch_close(uint8_t dev_addr);
 
-#endif
-
 #ifdef __cplusplus
  }
 #endif
diff --git a/src/device/usbd.c b/src/device/usbd.c
index 17914fb6c..604f35bc5 100644
--- a/src/device/usbd.c
+++ b/src/device/usbd.c
@@ -28,8 +28,6 @@
 
 #if TUSB_OPT_DEVICE_ENABLED
 
-#define _TINY_USB_SOURCE_FILE_
-
 #include "tusb.h"
 #include "usbd.h"
 #include "device/usbd_pvt.h"
diff --git a/src/device/usbd_control.c b/src/device/usbd_control.c
index d907aca3b..24234f4d2 100644
--- a/src/device/usbd_control.c
+++ b/src/device/usbd_control.c
@@ -28,8 +28,6 @@
 
 #if TUSB_OPT_DEVICE_ENABLED
 
-#define _TINY_USB_SOURCE_FILE_
-
 #include "tusb.h"
 #include "device/usbd_pvt.h"
 
diff --git a/src/host/hub.c b/src/host/hub.c
index d54032299..157a77937 100644
--- a/src/host/hub.c
+++ b/src/host/hub.c
@@ -28,8 +28,6 @@
 
 #if (TUSB_OPT_HOST_ENABLED && CFG_TUH_HUB)
 
-#define _TINY_USB_SOURCE_FILE_
-
 //--------------------------------------------------------------------+
 // INCLUDE
 //--------------------------------------------------------------------+
diff --git a/src/host/hub.h b/src/host/hub.h
index c3a02af5e..5a4a5eb7f 100644
--- a/src/host/hub.h
+++ b/src/host/hub.h
@@ -178,17 +178,13 @@ tusb_speed_t hub_port_get_speed(void);
 bool hub_status_pipe_queue(uint8_t dev_addr);
 
 //--------------------------------------------------------------------+
-// USBH-CLASS DRIVER API
+// Internal Class Driver API
 //--------------------------------------------------------------------+
-#ifdef _TINY_USB_SOURCE_FILE_
-
 void hub_init(void);
 bool hub_open(uint8_t rhport, uint8_t dev_addr, tusb_desc_interface_t const *itf_desc, uint16_t *p_length);
 void hub_isr(uint8_t dev_addr, uint8_t ep_addr, xfer_result_t event, uint32_t xferred_bytes);
 void hub_close(uint8_t dev_addr);
 
-#endif
-
 #ifdef __cplusplus
  }
 #endif
diff --git a/src/host/usbh.c b/src/host/usbh.c
index 640bbfc8d..60d7afa76 100644
--- a/src/host/usbh.c
+++ b/src/host/usbh.c
@@ -28,8 +28,6 @@
 
 #if TUSB_OPT_HOST_ENABLED
 
-#define _TINY_USB_SOURCE_FILE_
-
 #ifndef CFG_TUH_TASK_QUEUE_SZ
 #define CFG_TUH_TASK_QUEUE_SZ   16
 #endif
diff --git a/src/host/usbh.h b/src/host/usbh.h
index a7e053626..84d0f0ec6 100644
--- a/src/host/usbh.h
+++ b/src/host/usbh.h
@@ -88,10 +88,7 @@ ATTR_WEAK void tuh_umount_cb(uint8_t dev_addr);
 //--------------------------------------------------------------------+
 // CLASS-USBH & INTERNAL API
 //--------------------------------------------------------------------+
-#ifdef _TINY_USB_SOURCE_FILE_
-
 bool usbh_init(void);
-
 bool usbh_control_xfer (uint8_t dev_addr, tusb_control_request_t* request, uint8_t* data);
 
 #endif
diff --git a/src/tusb.c b/src/tusb.c
index ec8f328b0..825aa988c 100644
--- a/src/tusb.c
+++ b/src/tusb.c
@@ -27,7 +27,6 @@
 #include "tusb_option.h"
 
 #if TUSB_OPT_HOST_ENABLED || TUSB_OPT_DEVICE_ENABLED
-#define _TINY_USB_SOURCE_FILE_
 
 #include "tusb.h"