Make corrections to the interrupt priority configuration in the LPC1800 UDP demo...

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@2052 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/CreateProjectDirectoryStructure.bat b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/CreateProjectDirectoryStructure.bat
index 1d63345688318251b6255b88603a169e1e504a96..e60a79eb8896769c6dad85fe497188b1edee509f 100644 (file)
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/CreateProjectDirectoryStructure.bat
+++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/CreateProjectDirectoryStructure.bat
@@ -51,7 +51,6 @@ IF EXIST FreeRTOS_Source Goto END
 \r
        REM Copy the FreeRTOS+UDP core files\r
        copy %FREERTOS_UDP_SOURCE%\*.c FreeRTOS_Plus_UDP\r
-       copy %FREERTOS_UDP_SOURCE%\include\*.h FreeRTOS_Plus_UDP\r
        copy %FREERTOS_UDP_SOURCE%\readme.txt FreeRTOS_Plus_UDP\r
        copy %FREERTOS_UDP_SOURCE%\include\*.* FreeRTOS_Plus_UDP\include\r
 \r

diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/FreeRTOSConfig.h b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/FreeRTOSConfig.h
index bf789f9698ff373499048a2f1a785d160c55046e..eaf23aad8ff40eaa9367322362bbc2f7955de09a 100644 (file)
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/FreeRTOSConfig.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/FreeRTOSConfig.h
@@ -155,7 +155,7 @@ is one */
 #ifdef __NVIC_PRIO_BITS\r
        #define configPRIO_BITS       __NVIC_PRIO_BITS\r
 #else\r
-       #define configPRIO_BITS       5        /* 32 priority levels */\r
+       #define configPRIO_BITS       3        /* 8 priority levels */\r
 #endif\r
 \r
 /* The maximum priority an interrupt that uses an interrupt safe FreeRTOS API\r
@@ -163,7 +163,7 @@ function can have.  Note that lower priority have numerically higher values.  */
 #define configMAX_LIBRARY_INTERRUPT_PRIORITY   ( 5 )\r
 \r
 /* The minimum possible interrupt priority. */\r
-#define configMIN_LIBRARY_INTERRUPT_PRIORITY   ( 31 )\r
+#define configMIN_LIBRARY_INTERRUPT_PRIORITY   ( 7 )\r
 \r
 /* The lowest priority. */\r
 #define configKERNEL_INTERRUPT_PRIORITY                ( configMIN_LIBRARY_INTERRUPT_PRIORITY << (8 - configPRIO_BITS) )\r
@@ -178,8 +178,6 @@ standard names. */
 #define xPortSysTickHandler SysTick_Handler\r
 \r
 \r
-\r
-\r
 /*\r
  * DEMO APPLICATION SPECIFIC DEFINITIONS FOLLOW FROM HERE\r
  */\r

diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/ThirdParty/CMSISv2p10_LPC18xx_DriverLib/inc/LPC18xx.h b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/ThirdParty/CMSISv2p10_LPC18xx_DriverLib/inc/LPC18xx.h
index 9241fba302ed5c66c52af8a6d20bc838c0c5657b..32fbff3b56f90e407d6937210e0bf7ce634c5c28 100644 (file)
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/ThirdParty/CMSISv2p10_LPC18xx_DriverLib/inc/LPC18xx.h
+++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/ThirdParty/CMSISv2p10_LPC18xx_DriverLib/inc/LPC18xx.h
@@ -158,7 +158,7 @@ typedef enum {
 \r
 #define __CM3_REV                              0x0101          /*!< Cortex-M3 Core Revision               */\r
 #define __MPU_PRESENT                  1               /*!< MPU present or not                    */\r
-#define __NVIC_PRIO_BITS               4               /*!< Number of Bits used for Priority Levels */\r
+#define __NVIC_PRIO_BITS               3               /*!< Number of Bits used for Priority Levels */\r
 #define __Vendor_SysTickConfig         0               /*!< Set to 1 if different SysTick Config is used */\r
 /** @} */ /* End of group Configuration_of_CMSIS */\r
 \r

diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/ThirdParty/USB_CDC/usbhw.c b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/ThirdParty/USB_CDC/usbhw.c
index a49596f8e3f217f3c5c27e377a460400b7054786..01c222d67e668cfe139cdddaa6022768af262791 100644 (file)
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/ThirdParty/USB_CDC/usbhw.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/ThirdParty/USB_CDC/usbhw.c
@@ -132,10 +132,10 @@ void USB_Init (LPC_USBDRV_INIT_T* cbs)
 
 #ifdef USE_USB0
        NVIC_EnableIRQ(USB0_IRQn); //  enable USB0 interrrupts
-       NVIC_SetPriority(USB0_IRQn, configMAX_SYSCALL_INTERRUPT_PRIORITY );
+       NVIC_SetPriority(USB0_IRQn, configMIN_LIBRARY_INTERRUPT_PRIORITY );
 #else
        NVIC_EnableIRQ(USB1_IRQn); //  enable USB1 interrrupts
-       NVIC_SetPriority(USB0_IRQn, configMAX_SYSCALL_INTERRUPT_PRIORITY );
+       NVIC_SetPriority(USB0_IRQn, configMIN_LIBRARY_INTERRUPT_PRIORITY );
 #endif
 
        USB_Reset();

diff --git a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/cr_startup_lpc18xx.c b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/cr_startup_lpc18xx.c
index c9d8e9d1787f2621f9b9a634cdb13624b90d1a05..13853fc1d7a158d0731e14c6d53387e1c22b0a01 100644 (file)
--- a/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/cr_startup_lpc18xx.c
+++ b/FreeRTOS-Plus/Demo/FreeRTOS_Plus_UDP_and_CLI_LPC1830_GCC/cr_startup_lpc18xx.c
@@ -413,7 +413,6 @@ void NMI_Handler(void)
 __attribute__ ((section(".after_vectors")))\r
 void HardFault_Handler(void)\r
 {\r
-return;\r
     __asm volatile\r
     (\r
         " tst lr, #4                                                \n"\r