Continue work on Cortus demo.

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

diff --git a/Demo/CORTUS_APS3_GCC/Demo/RegTest.c b/Demo/CORTUS_APS3_GCC/Demo/RegTest.c
index e542f02f5da85df6a584fd3c66bdaac2dbd2fa90..243c7b6ba521996eddc38458d60899e55a111c86 100644 (file)
--- a/Demo/CORTUS_APS3_GCC/Demo/RegTest.c
+++ b/Demo/CORTUS_APS3_GCC/Demo/RegTest.c
@@ -86,6 +86,7 @@ static void vRegTest1( void *pvParameters )
                "       mov             r15, #0x0f                                                      \n"
                "                                                                                               \n"
                "reg_check_loop_1:                                                              \n"
+               "       trap    #31                                                                     \n"
                "       cmp             r2, #0x02                                                       \n" /* Check that each register still contains the expected value, jump to an infinite loop if an error is found. */
                "       bne.s   reg_check_error_1                                       \n"
                "       cmp             r3, #0x03                                                       \n"

diff --git a/Demo/CORTUS_APS3_GCC/Demo/serial.c b/Demo/CORTUS_APS3_GCC/Demo/serial.c
index 81a68e5443d79af5c86444aca2b96579b9b314a4..08f75245260874b7bf6875ce1729a080f1020e97 100644 (file)
--- a/Demo/CORTUS_APS3_GCC/Demo/serial.c
+++ b/Demo/CORTUS_APS3_GCC/Demo/serial.c
@@ -71,10 +71,6 @@
 #define comBLOCK_RETRY_TIME                            10
 /*-----------------------------------------------------------*/
 
-void vUARTInterruptHandlerTxWrapper(void) __attribute((naked));
-void vUARTInterruptHandlerRxWrapper(void) __attribute((naked));
-/*-----------------------------------------------------------*/
-
 /* Queues used to hold received characters, and characters waiting to be
 transmitted. */
 static xQueueHandle xRxedChars;
@@ -99,6 +95,7 @@ xComPortHandle xSerialPortInitMinimal( unsigned long ulWantedBaud, unsigned port
                irq[IRQ_UART1_RX].ien = 1;
                irq[IRQ_UART1_RX].ipl = portSYSTEM_INTERRUPT_PRIORITY_LEVEL;
        }
+
        return ( xComPortHandle ) 0;
 }
 /*-----------------------------------------------------------*/