aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarti Bolivar <mbolivar@leaflabs.com>2011-06-24 14:37:54 -0400
committerMarti Bolivar <mbolivar@leaflabs.com>2011-06-24 14:37:54 -0400
commit1a825f8a475f0b10c5c528cedd6c930a2f248255 (patch)
tree1f84b59ed38561b3964c881cfef67d7c556c78c3
parente4a791ad5673b86ab30f79d2347fe4ae3b8ef072 (diff)
downloadlibrambutan-1a825f8a475f0b10c5c528cedd6c930a2f248255.tar.gz
librambutan-1a825f8a475f0b10c5c528cedd6c930a2f248255.zip
Make FreeRTOS changes comply with the coding standard.
Don't modify the core FreeRTOS code; only change source that's specific to libmaple.
-rwxr-xr-xexamples/freertos-blinky.cpp11
-rw-r--r--libmaple/systick.c6
-rw-r--r--libraries/FreeRTOS/MapleFreeRTOS.cpp17
-rw-r--r--libraries/FreeRTOS/MapleFreeRTOS.h14
4 files changed, 28 insertions, 20 deletions
diff --git a/examples/freertos-blinky.cpp b/examples/freertos-blinky.cpp
index acdfc0f..6f82d71 100755
--- a/examples/freertos-blinky.cpp
+++ b/examples/freertos-blinky.cpp
@@ -1,8 +1,8 @@
#include "wirish.h"
#include "libraries/FreeRTOS/MapleFreeRTOS.h"
-static void vLEDFlashTask( void *pvParameters ) {
- for(;;) {
+static void vLEDFlashTask(void *pvParameters) {
+ for (;;) {
vTaskDelay(1000);
digitalWrite(BOARD_LED_PIN, HIGH);
vTaskDelay(50);
@@ -14,7 +14,12 @@ void setup() {
// initialize the digital pin as an output:
pinMode(BOARD_LED_PIN, OUTPUT);
- xTaskCreate( vLEDFlashTask, ( signed portCHAR * ) "Task1", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY + 2, NULL );
+ xTaskCreate(vLEDFlashTask,
+ (signed portCHAR *)"Task1",
+ configMINIMAL_STACK_SIZE,
+ NULL,
+ tskIDLE_PRIORITY + 2,
+ NULL);
vTaskStartScheduler();
}
diff --git a/libmaple/systick.c b/libmaple/systick.c
index 388f7aa..5025328 100644
--- a/libmaple/systick.c
+++ b/libmaple/systick.c
@@ -66,7 +66,9 @@ void systick_enable() {
}
/**
- * Attach a callback called each ms.
+ * @brief Attach a callback to be called from the SysTick exception handler.
+ *
+ * To detach a callback, call this function again with a null argument.
*/
void systick_attach_callback(void (*callback)(void)) {
systick_user_callback = callback;
@@ -77,7 +79,7 @@ void systick_attach_callback(void (*callback)(void)) {
*/
void __exc_systick(void) {
- if (systick_user_callback) {
+ if (systick_user_callback) {
systick_user_callback();
}
systick_uptime_millis++;
diff --git a/libraries/FreeRTOS/MapleFreeRTOS.cpp b/libraries/FreeRTOS/MapleFreeRTOS.cpp
index 2d63e0d..d235ceb 100644
--- a/libraries/FreeRTOS/MapleFreeRTOS.cpp
+++ b/libraries/FreeRTOS/MapleFreeRTOS.cpp
@@ -28,16 +28,17 @@
extern "C" {
-void vApplicationStackOverflowHook( xTaskHandle *pxTask, signed char *pcTaskName )
-{
- /* This function will get called if a task overflows its stack. If the
- parameters are corrupt then inspect pxCurrentTCB to find which was the
- offending task. */
+void vApplicationStackOverflowHook(xTaskHandle *pxTask,
+ signed char *pcTaskName) {
+ /* This function will get called if a task overflows its stack.
+ * If the parameters are corrupt then inspect pxCurrentTCB to find
+ * which was the offending task. */
- ( void ) pxTask;
- ( void ) pcTaskName;
+ (void) pxTask;
+ (void) pcTaskName;
- for( ;; );
+ while (1)
+ ;
}
}
diff --git a/libraries/FreeRTOS/MapleFreeRTOS.h b/libraries/FreeRTOS/MapleFreeRTOS.h
index 0fcc2ae..839e3e2 100644
--- a/libraries/FreeRTOS/MapleFreeRTOS.h
+++ b/libraries/FreeRTOS/MapleFreeRTOS.h
@@ -24,17 +24,17 @@
* SOFTWARE.
*****************************************************************************/
-#ifndef __FREERTOS__
-#define __FREERTOS__
+#ifndef __MAPLE_FREERTOS_H__
+#define __MAPLE_FREERTOS_H__
#include "wirish.h"
extern "C" {
- #define GCC_ARMCM3
- #include "utility/FreeRTOS.h"
- #include "utility/task.h"
- #include "utility/queue.h"
- #include "utility/semphr.h"
+#define GCC_ARMCM3
+#include "utility/FreeRTOS.h"
+#include "utility/task.h"
+#include "utility/queue.h"
+#include "utility/semphr.h"
}
#endif