refactor nrf5x mcu macro

7 files changed, 11 insertions, 7 deletions

diff --git a/examples/device/nrf52840/src/tusb_config.h b/examples/device/nrf52840/src/tusb_config.h
index b9346aaf9..e98009acc 100644
--- a/examples/device/nrf52840/src/tusb_config.h
+++ b/examples/device/nrf52840/src/tusb_config.h
@@ -48,6 +48,7 @@
 //--------------------------------------------------------------------+
 //#define CFG_TUSB_MCU will be passed from IDE/command line for easy board/mcu switching
 
+#define CFG_TUSB_MCU                    OPT_MCU_NRF5X
 #define CFG_TUSB_CONTROLLER_0_MODE      (TUSB_MODE_DEVICE)
 
 //--------------------------------------------------------------------+
@@ -78,7 +79,7 @@
 // LPC11uxx and LPC13uxx requires each buffer has to be 64-byte alignment
 #if CFG_TUSB_MCU == OPT_MCU_LPC11UXX || CFG_TUSB_MCU == OPT_MCU_LPC13UXX
  #define CFG_TUSB_MEM_ALIGN   ATTR_ALIGNED(64)
-#elif defined NRF52840_XXAA
+#elif CFG_TUSB_MCU == OPT_MCU_NRF5X
  #define CFG_TUSB_MEM_ALIGN   ATTR_ALIGNED(4)
 #else
  #define CFG_TUSB_MEM_ALIGN
diff --git a/examples/obsolete/device/src/tusb_config.h b/examples/obsolete/device/src/tusb_config.h
index 8a7fcabdf..f68fe59eb 100644
--- a/examples/obsolete/device/src/tusb_config.h
+++ b/examples/obsolete/device/src/tusb_config.h
@@ -113,7 +113,7 @@
 // LPC11uxx and LPC13uxx requires each buffer has to be 64-byte alignment
 #if CFG_TUSB_MCU == OPT_MCU_LPC11UXX || CFG_TUSB_MCU == OPT_MCU_LPC13UXX
  #define CFG_TUSB_MEM_ALIGN   ATTR_ALIGNED(64)
-#elif defined NRF52840_XXAA
+#elif CFG_TUSB_MCU == OPT_MCU_NRF5X
  #define CFG_TUSB_MEM_ALIGN   ATTR_ALIGNED(4)
 #else
  #define CFG_TUSB_MEM_ALIGN
diff --git a/tinyusb/class/cdc/cdc_device.c b/tinyusb/class/cdc/cdc_device.c
index da38b15fe..c0a5ff6cf 100644
--- a/tinyusb/class/cdc/cdc_device.c
+++ b/tinyusb/class/cdc/cdc_device.c
@@ -66,7 +66,7 @@ typedef struct {
 }cdcd_data_t;

 

 // TODO multiple rhport

-#ifdef NRF52840_XXAA

+#if CFG_TUSB_MCU == OPT_MCU_NRF5X

 // FIXME nrf52 OUT bug ( Controller ACK data even we didn't prepare transfer )

 CFG_TUSB_ATTR_USBRAM CFG_TUSB_MEM_ALIGN uint8_t _tmp_rx_buf[1024];

 #else

diff --git a/tinyusb/device/usbd.c b/tinyusb/device/usbd.c
index a1886b9b4..c11d1fe42 100644
--- a/tinyusb/device/usbd.c
+++ b/tinyusb/device/usbd.c
@@ -344,7 +344,7 @@ static tusb_error_t proc_control_request_st(uint8_t rhport, tusb_control_request
       dcd_set_address(rhport, (uint8_t) p_request->wValue);

       usbd_devices[rhport].state = TUSB_DEVICE_STATE_ADDRESSED;

 

-      #ifndef NRF52840_XXAA // nrf52 auto handle set address, we must not return status

+      #if CFG_TUSB_MCU != OPT_MCU_NRF5X // nrf5x auto handle set address, we must not return status

       dcd_control_status(rhport, p_request->bmRequestType_bit.direction);

       #endif

     }

diff --git a/tinyusb/portable/nordic/nrf5x/dcd_nrf5x.c b/tinyusb/portable/nordic/nrf5x/dcd_nrf5x.c
index 072086b38..2f7d97172 100644
--- a/tinyusb/portable/nordic/nrf5x/dcd_nrf5x.c
+++ b/tinyusb/portable/nordic/nrf5x/dcd_nrf5x.c
@@ -34,7 +34,9 @@
 */
 /**************************************************************************/
 
-#ifdef NRF52840_XXAA
+#include "tusb_option.h"
+
+#if MODE_DEVICE_SUPPORTED && CFG_TUSB_MCU == OPT_MCU_NRF5X
 
 // TODO remove
 #include "nrf.h"
diff --git a/tinyusb/portable/nordic/nrf5x/hal_nrf5x.c b/tinyusb/portable/nordic/nrf5x/hal_nrf5x.c
index 473ebf138..47ce9f945 100644
--- a/tinyusb/portable/nordic/nrf5x/hal_nrf5x.c
+++ b/tinyusb/portable/nordic/nrf5x/hal_nrf5x.c
@@ -34,7 +34,9 @@
 */
 /**************************************************************************/
 
-#ifdef NRF52840_XXAA
+#include "tusb_option.h"
+
+#if MODE_DEVICE_SUPPORTED && CFG_TUSB_MCU == OPT_MCU_NRF5X
 
 #include <stdbool.h>
 #include "nrf.h"
diff --git a/tinyusb/tusb_option.h b/tinyusb/tusb_option.h
index 6d0156ee1..62b3a1a72 100644
--- a/tinyusb/tusb_option.h
+++ b/tinyusb/tusb_option.h
@@ -45,7 +45,6 @@
 #define TUSB_VERSION_NAME   "alpha"

 #define TUSB_VERSION        XSTRING_(TUSB_VERSION_YEAR) "." XSTRING_(TUSB_VERSION_MONTH)

 

-// TODO remove, use vendor specific flag

 /** \defgroup group_mcu Supported MCU

  * \ref CFG_TUSB_MCU must be defined to one of these

  *  @{ */