diff --git a/demos/bsp/boards/board.h b/demos/bsp/boards/board.h index 74030f2f..80051e14 100644 --- a/demos/bsp/boards/board.h +++ b/demos/bsp/boards/board.h @@ -64,11 +64,11 @@ #define BIT_(n) (1 << (n)) #endif -#define BOARD_NGX43XX 1 +#define BOARD_NGX4330 1 #define BOARD_LPCXPRESSO1347 2 #define BOARD_AT86RF2XX 3 -#if BOARD == BOARD_NGX43XX +#if BOARD == BOARD_NGX4330 #elif BOARD == BOARD_LPCXPRESSO1347 diff --git a/demos/bsp/boards/board_ngx43xx.c b/demos/bsp/boards/board_ngx4330.c similarity index 99% rename from demos/bsp/boards/board_ngx43xx.c rename to demos/bsp/boards/board_ngx4330.c index 0f14214c..d9ffc5cb 100644 --- a/demos/bsp/boards/board_ngx43xx.c +++ b/demos/bsp/boards/board_ngx4330.c @@ -37,7 +37,7 @@ #include "board.h" -#if BOARD == BOARD_NGX43XX +#if BOARD == BOARD_NGX4330 #include "lpc43xx_uart.h" #include "lpc43xx_scu.h" diff --git a/demos/device/keyboard/.cproject b/demos/device/keyboard/.cproject index bebbfb04..2370d499 100644 --- a/demos/device/keyboard/.cproject +++ b/demos/device/keyboard/.cproject @@ -79,7 +79,7 @@ - + @@ -728,7 +728,7 @@ - + diff --git a/tinyusb/.cproject b/tinyusb/.cproject index 4a33ccba..06a0c2b4 100644 --- a/tinyusb/.cproject +++ b/tinyusb/.cproject @@ -202,7 +202,7 @@ - + @@ -357,6 +357,184 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tinyusb/hal/hal.h b/tinyusb/hal/hal.h index 10fcc615..467f75f3 100644 --- a/tinyusb/hal/hal.h +++ b/tinyusb/hal/hal.h @@ -82,8 +82,9 @@ static inline void hal_interrupt_disable() ATTR_ALWAYS_INLINE; #elif MCU == MCU_LPC13UXX #include "hal_lpc13uxx.h" #elif MCU == MCU_LPC43XX - + #include "hal_lpc43xx.h" #endif + #ifdef __cplusplus } #endif diff --git a/tinyusb/hal/hal_lpc11uxx.h b/tinyusb/hal/hal_lpc11uxx.h index f65f95ad..1f1d6779 100644 --- a/tinyusb/hal/hal_lpc11uxx.h +++ b/tinyusb/hal/hal_lpc11uxx.h @@ -63,9 +63,6 @@ static inline void hal_interrupt_enable() NVIC_EnableIRQ(USB_IRQn); } -/** - * Disable USB Interrupt - */ static inline void hal_interrupt_disable() { NVIC_DisableIRQ(USB_IRQn); diff --git a/tinyusb/hal/hal_lpc13uxx.h b/tinyusb/hal/hal_lpc13uxx.h index 795782fc..f29bab7b 100644 --- a/tinyusb/hal/hal_lpc13uxx.h +++ b/tinyusb/hal/hal_lpc13uxx.h @@ -62,9 +62,6 @@ static inline void hal_interrupt_enable() NVIC_EnableIRQ(USB_IRQ_IRQn); } -/** - * Disable USB Interrupt - */ static inline void hal_interrupt_disable() { NVIC_DisableIRQ(USB_IRQ_IRQn); diff --git a/tinyusb/tusb_cfg.h b/tinyusb/tusb_cfg.h index efb236ce..6cda1583 100644 --- a/tinyusb/tusb_cfg.h +++ b/tinyusb/tusb_cfg.h @@ -57,10 +57,10 @@ #define CFG_TUSB_DEBUG_LEVEL 3 /// Enable Host Support -//#define CFG_TUSB_HOST +#define CFG_TUSB_HOST /// Enable Device Support -#define CFG_TUSB_DEVICE +//#define CFG_TUSB_DEVICE /// Enable CDC Support #define CFG_CLASS_CDC