From 522b0c11efa9be870f806b452d0ca734738880c9 Mon Sep 17 00:00:00 2001 From: hathach Date: Thu, 29 Nov 2018 22:59:00 +0700 Subject: move nvic prio in hal/dcd to bsp for portability --- src/portable/nxp/lpc17xx/dcd_lpc175x_6x.c | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'src') diff --git a/src/portable/nxp/lpc17xx/dcd_lpc175x_6x.c b/src/portable/nxp/lpc17xx/dcd_lpc175x_6x.c index 517f037d0..af7ceae0c 100644 --- a/src/portable/nxp/lpc17xx/dcd_lpc175x_6x.c +++ b/src/portable/nxp/lpc17xx/dcd_lpc175x_6x.c @@ -44,8 +44,6 @@ #include "dcd_lpc175x_6x.h" #include "LPC17xx.h" -#include "osal/osal.h" - //--------------------------------------------------------------------+ // MACRO CONSTANT TYPEDEF //--------------------------------------------------------------------+ @@ -199,14 +197,6 @@ bool dcd_init(uint8_t rhport) sie_write(SIE_CMDCODE_DEVICE_STATUS, 1, 1); // connect // USB IRQ priority should be set by application previously - // If freeRTOS is used, IRQ priority is limit by max syscall ( smaller is higher ) -#if CFG_TUSB_OS == OPT_OS_FREERTOS - if ( NVIC_GetPriority(USB_IRQn) < configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY ) - { - NVIC_SetPriority(USB_IRQn, configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY ); - } -#endif - NVIC_ClearPendingIRQ(USB_IRQn); NVIC_EnableIRQ(USB_IRQn); -- cgit v1.3.1 From d96347a0f5ec9272088b11425e1a8a3fb4115e8a Mon Sep 17 00:00:00 2001 From: hathach Date: Fri, 30 Nov 2018 12:48:06 +0700 Subject: rename OPT_MCU_LPC13UXX to OPT_MCU_LPC13XX --- examples/device/device_virtual_com/src/tusb_config.h | 8 ++++---- examples/obsolete/device/device_freertos/.cproject | 2 +- examples/obsolete/device/device_os_none/.cproject | 2 +- examples/obsolete/device/src/msc_device_app.h | 2 +- examples/obsolete/device/src/tusb_config.h | 8 ++++---- hw/mcu/nxp/lpc13uxx/hal_mcu/hal_lpc13uxx.c | 2 +- src/class/msc/msc_device.c | 2 +- src/portable/nxp/lpc11xx_lpc13xx/dcd_lpc_11uxx_13uxx.c | 2 +- src/tusb_option.h | 4 ++-- 9 files changed, 16 insertions(+), 16 deletions(-) (limited to 'src') diff --git a/examples/device/device_virtual_com/src/tusb_config.h b/examples/device/device_virtual_com/src/tusb_config.h index fd3f41b01..77be85df3 100644 --- a/examples/device/device_virtual_com/src/tusb_config.h +++ b/examples/device/device_virtual_com/src/tusb_config.h @@ -92,7 +92,7 @@ //--------------------------------------------------------------------+ #ifdef __CODE_RED // compiled with lpcxpresso - #if (CFG_TUSB_MCU == OPT_MCU_LPC11UXX) || (CFG_TUSB_MCU == OPT_MCU_LPC13UXX) + #if (CFG_TUSB_MCU == OPT_MCU_LPC11UXX) || (CFG_TUSB_MCU == OPT_MCU_LPC13XX) #define CFG_TUSB_MEM_SECTION ATTR_SECTION(.data.$RAM2) ATTR_ALIGNED(64) // lp11u & lp13u requires data to be 64 byte aligned #elif CFG_TUSB_MCU == OPT_MCU_LPC175X_6X #define CFG_TUSB_MEM_SECTION // LPC17xx USB DMA can access all @@ -102,7 +102,7 @@ #elif defined __CC_ARM // Compiled with Keil armcc, USBRAM_SECTION is defined in scatter files - #if (CFG_TUSB_MCU == OPT_MCU_LPC11UXX) || (CFG_TUSB_MCU == OPT_MCU_LPC13UXX) + #if (CFG_TUSB_MCU == OPT_MCU_LPC11UXX) || (CFG_TUSB_MCU == OPT_MCU_LPC13XX) #define CFG_TUSB_MEM_SECTION ATTR_SECTION(USBRAM_SECTION) ATTR_ALIGNED(64) // lp11u & lp13u requires data to be 64 byte aligned #elif (CFG_TUSB_MCU == OPT_MCU_LPC175X_6X) #define CFG_TUSB_MEM_SECTION // LPC17xx USB DMA can access all address @@ -112,7 +112,7 @@ #elif defined __ICCARM__ // compiled with IAR - #if (CFG_TUSB_MCU == OPT_MCU_LPC11UXX) || (CFG_TUSB_MCU == OPT_MCU_LPC13UXX) + #if (CFG_TUSB_MCU == OPT_MCU_LPC11UXX) || (CFG_TUSB_MCU == OPT_MCU_LPC13XX) #define CFG_TUSB_MEM_SECTION _Pragma("location=\"USB_PACKET_MEMORY\"") ATTR_ALIGNED(64) #elif (CFG_TUSB_MCU == OPT_MCU_LPC175X_6X) #define CFG_TUSB_MEM_SECTION @@ -132,7 +132,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 +#if CFG_TUSB_MCU == OPT_MCU_LPC11UXX || CFG_TUSB_MCU == OPT_MCU_LPC13XX #define CFG_TUSB_MEM_ALIGN ATTR_ALIGNED(64) #elif CFG_TUSB_MCU == OPT_MCU_NRF5X #define CFG_TUSB_MEM_ALIGN ATTR_ALIGNED(4) diff --git a/examples/obsolete/device/device_freertos/.cproject b/examples/obsolete/device/device_freertos/.cproject index eb09f25e7..53b3552b1 100644 --- a/examples/obsolete/device/device_freertos/.cproject +++ b/examples/obsolete/device/device_freertos/.cproject @@ -34,7 +34,7 @@ - + diff --git a/examples/obsolete/device/device_os_none/.cproject b/examples/obsolete/device/device_os_none/.cproject index fabc46d88..355f8ba96 100644 --- a/examples/obsolete/device/device_os_none/.cproject +++ b/examples/obsolete/device/device_os_none/.cproject @@ -33,7 +33,7 @@