diff options
| author | hathach <[email protected]> | 2018-03-26 22:54:34 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2018-03-26 22:54:34 +0700 |
| commit | 0c09269fd4c48673c1873db2f6ab0ef3a2282cd6 (patch) | |
| tree | 47651632f0bbb5ac23e76627c53edf30a907102e | |
| parent | c8f6175ad52e8a2754e8668b576c23621463cc9b (diff) | |
clean up
| -rw-r--r-- | examples/device/nrf52840/segger/nrf52840.emProject | 5 | ||||
| -rw-r--r-- | tinyusb/portable/nordic/nrf5x/dcd_nrf5x.c | 4 | ||||
| -rw-r--r-- | tinyusb/portable/nordic/nrf5x/hal_nrf5x.c | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/examples/device/nrf52840/segger/nrf52840.emProject b/examples/device/nrf52840/segger/nrf52840.emProject index 918a7a3a3..4f29a8188 100644 --- a/examples/device/nrf52840/segger/nrf52840.emProject +++ b/examples/device/nrf52840/segger/nrf52840.emProject @@ -70,11 +70,6 @@ <folder Name="mcu"> <folder Name="nordic"> <folder Name="nrf52"> - <folder Name="tusb_port"> - <file file_name="../../../../hw/mcu/nordic/nrf52/tusb_port/hal_nrf52.c" /> - <file file_name="../../../../hw/mcu/nordic/nrf52/tusb_port/dcd_nrf52.c" /> - <file file_name="../../../../hw/mcu/nordic/nrf52/tusb_port/dcd_nrf52.h" /> - </folder> <folder Name="sdk"> <file file_name="../../../../hw/mcu/nordic/nrf52/sdk/sdk_config.h" /> <folder diff --git a/tinyusb/portable/nordic/nrf5x/dcd_nrf5x.c b/tinyusb/portable/nordic/nrf5x/dcd_nrf5x.c index ecb896c8f..a57427d6b 100644 --- a/tinyusb/portable/nordic/nrf5x/dcd_nrf5x.c +++ b/tinyusb/portable/nordic/nrf5x/dcd_nrf5x.c @@ -34,6 +34,8 @@ */ /**************************************************************************/ +#ifdef NRF52840_XXAA + // TODO remove #include "nrf.h" #include "nrf_power.h" @@ -648,3 +650,5 @@ void USBD_IRQHandler(void) } } + +#endif diff --git a/tinyusb/portable/nordic/nrf5x/hal_nrf5x.c b/tinyusb/portable/nordic/nrf5x/hal_nrf5x.c index 2264dadfc..145f1bf5d 100644 --- a/tinyusb/portable/nordic/nrf5x/hal_nrf5x.c +++ b/tinyusb/portable/nordic/nrf5x/hal_nrf5x.c @@ -34,6 +34,8 @@ */ /**************************************************************************/ +#ifdef NRF52840_XXAA + #include <stdbool.h> #include "nrf.h" #include "nrf_gpio.h" @@ -98,3 +100,5 @@ void tusb_hal_dbg_breakpoint(void) } #endif } + +#endif |