summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorNicolas "Pixel" Noble <pixel@nobis-crew.org>2011-01-27 20:07:13 +0100
committerNicolas "Pixel" Noble <pixel@nobis-crew.org>2011-01-27 20:07:17 +0100
commit18d53779c4fef3efca606aead2da3af40ec76332 (patch)
treec188db847d9ccc3073dc2f28bfc9d4ab16d8d06a /arch/arm
parentd29a7d2ad9fa2d8c9815fe602c7f4647735d549d (diff)
FreeRTOS now boots and run properly. Yay!
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/lpc17xx/hooks.c4
-rw-r--r--arch/arm/lpc17xx/startup.s25
2 files changed, 5 insertions, 24 deletions
diff --git a/arch/arm/lpc17xx/hooks.c b/arch/arm/lpc17xx/hooks.c
index 5aeb335..e68c74a 100644
--- a/arch/arm/lpc17xx/hooks.c
+++ b/arch/arm/lpc17xx/hooks.c
@@ -7,7 +7,7 @@ void vConfigureTimerForRunTimeStats() {
}
void vApplicationTickHook() {
- DBGOUT("vApplicationTickHook()\r\n");
+// DBGOUT("vApplicationTickHook()\r\n");
}
void vApplicationStackOverflowHook(xTaskHandle *pxTask, signed portCHAR *pcTaskName) {
@@ -15,5 +15,5 @@ void vApplicationStackOverflowHook(xTaskHandle *pxTask, signed portCHAR *pcTaskN
}
void vApplicationIdleHook() {
- DBGOUT("vApplicationIdleHook()\r\n");
+// DBGOUT("vApplicationIdleHook()\r\n");
}
diff --git a/arch/arm/lpc17xx/startup.s b/arch/arm/lpc17xx/startup.s
index 2f79741..7b9e56c 100644
--- a/arch/arm/lpc17xx/startup.s
+++ b/arch/arm/lpc17xx/startup.s
@@ -71,11 +71,11 @@ __cs3_interrupt_vector_cortex_m:
.long 0 /* Reserved */
.long 0 /* Reserved */
.long 0 /* Reserved */
- .long SVC_Handler /* SVCall Handler */
+ .long vPortSVCHandler /* SVCall Handler */
.long DebugMon_Handler /* Debug Monitor Handler */
.long 0 /* Reserved */
- .long PendSV_Handler /* PendSV Handler */
- .long SysTick_Handler /* SysTick Handler */
+ .long xPortPendSVHandler /* PendSV Handler */
+ .long xPortSysTickHandler /* SysTick Handler */
/* External Interrupts */
.long WDT_IRQHandler /* 16: Watchdog Timer */
@@ -190,13 +190,6 @@ __cs3_reset_cortex_m:
.section ".privileged_code"
-/* Exception Handlers */
-
- .weak SVC_Handler
- .type SVC_Handler, %function
-SVC_Handler:
- B .
- .size SVC_Handler, . - SVC_Handler
.weak DebugMon_Handler
.type DebugMon_Handler, %function
@@ -204,18 +197,6 @@ DebugMon_Handler:
B .
.size DebugMon_Handler, . - DebugMon_Handler
- .weak PendSV_Handler
- .type PendSV_Handler, %function
-PendSV_Handler:
- B .
- .size PendSV_Handler, . - PendSV_Handler
-
- .weak SysTick_Handler
- .type SysTick_Handler, %function
-SysTick_Handler:
- B .
- .size SysTick_Handler, . - SysTick_Handler
-
/* IRQ Handlers */