add external configure file: tusb_config.h

rename the internal/default configure from tusb_cfg.h to tusb_option.h

5 files changed, 10 insertions, 23 deletions

diff --git a/tinyusb/common/common.h b/tinyusb/common/common.h
index e63747d68..abd0743d0 100644
--- a/tinyusb/common/common.h
+++ b/tinyusb/common/common.h
@@ -62,7 +62,7 @@
 #include <stdio.h>
 
 #include "compiler/compiler.h"
-#include "tusb_cfg.h"
+#include "tusb_option.h"
 #include "errors.h"
 #include "mcu/mcu.h"
 
diff --git a/tinyusb/common/errors.h b/tinyusb/common/errors.h
index 469034e72..ae3d4a7cb 100644
--- a/tinyusb/common/errors.h
+++ b/tinyusb/common/errors.h
@@ -49,7 +49,7 @@
 #ifndef _TUSB_ERRORS_H_
 #define _TUSB_ERRORS_H_
 
-#include "../tusb_cfg.h"
+#include "../tusb_option.h"
 
 #ifdef __cplusplus
  extern "C" {
diff --git a/tinyusb/device/romdriver/mw_usbd_core.h b/tinyusb/device/romdriver/mw_usbd_core.h
index 068eecf23..fa1995bcb 100644
--- a/tinyusb/device/romdriver/mw_usbd_core.h
+++ b/tinyusb/device/romdriver/mw_usbd_core.h
@@ -26,7 +26,7 @@
 
 #include "error.h"
 #include "mw_usbd.h"
-#include "tusb_cfg.h"
+#include "tusb_option.h"
 
 /** \file
  *  \brief ROM API for USB device stack.
diff --git a/tinyusb/device/romdriver/mw_usbd_mscuser.h b/tinyusb/device/romdriver/mw_usbd_mscuser.h
index cce102525..62ca2ee9d 100644
--- a/tinyusb/device/romdriver/mw_usbd_mscuser.h
+++ b/tinyusb/device/romdriver/mw_usbd_mscuser.h
@@ -28,7 +28,7 @@
 #include "mw_usbd.h"
 #include "mw_usbd_msc.h"
 #include "mw_usbd_core.h"
-#include "tusb_cfg.h"
+#include "tusb_option.h"
 
 /** \file
  *  \brief Mass Storage Class (MSC) API structures and function prototypes.
diff --git a/tinyusb/tusb_cfg.h b/tinyusb/tusb_option.h
index c3841d3d8..d29574da4 100644
--- a/tinyusb/tusb_cfg.h
+++ b/tinyusb/tusb_option.h
@@ -1,5 +1,5 @@
 /*
- * tusb_cfg.h
+ * tusb_option.h
  *
  *  Created on: Nov 26, 2012
  *      Author: hathach
@@ -42,21 +42,19 @@
  */
 
 /** 
- *  \defgroup Group_TinyUSB_Configure Configuration tusb_cfg.h
+ *  \defgroup Group_TinyUSB_Configure Configuration tusb_option.h
  *  @{
  */
 
-#ifndef _TUSB_TUSB_CFG_H_
-#define _TUSB_TUSB_CFG_H_
+#ifndef _TUSB_TUSB_OPTION_H_
+#define _TUSB_TUSB_OPTION_H_
 
 #ifdef __cplusplus
  extern "C" {
 #endif
 
 /// define this symbol will make tinyusb look for external configure file
-#ifdef TUSB_USE_CONFIG_FILE
 #include "tusb_config.h"
-#endif
 
 /// 0: no debug infor 3: most debug infor provided
 #ifndef TUSB_CFG_DEBUG
@@ -67,22 +65,11 @@
 //#define TUSB_CFG_HOST
 
 /// Enable Device Support
-#define TUSB_CFG_DEVICE
-
-/// Enable CDC Support
-#define TUSB_CFG_DEVICE_CDC
-
-/// Enable HID Keyboard support
-#define TUSB_CFG_DEVICE_HID_KEYBOARD
-
-/// Enable HID Mouse support
-#define TUSB_CFG_DEVICE_HID_MOUSE
+//#define TUSB_CFG_DEVICE
 
 #define DEVICE_CLASS_HID ( (defined TUSB_CFG_DEVICE_HID_KEYBOARD) || (defined TUSB_CFG_DEVICE_HID_MOUSE) )
 #define HOST_EHCI
 
-
-
 // TODO APP
 #define USB_MAX_IF_NUM          8
 #define USB_MAX_EP_NUM          5
@@ -110,6 +97,6 @@
  }
 #endif
 
-#endif /* _TUSB_TUSB_CFG_H_ */
+#endif /* _TUSB_TUSB_OPTION_H_ */
 
 /** @} */