From ac222754ce584045b24fef94ed0fd6aff64c437a Mon Sep 17 00:00:00 2001
From: Ludwig Ortmann <ludwig.ortmann@fu-berlin.de>
Date: Thu, 15 Aug 2013 23:51:49 +0200
Subject: [PATCH] harmonize LED implementation fix
https://github.com/RIOT-OS/RIOT/issues/145
---
native/board_init.c | 4 ++--
native/drivers/native-led.c | 12 ++++++------
native/include/board.h | 18 ++++++++++++------
3 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/native/board_init.c b/native/board_init.c
index fa1a319afc..0abc01573c 100644
--- a/native/board_init.c
+++ b/native/board_init.c
@@ -26,7 +26,7 @@ void board_init()
#ifdef MODULE_UART0
_native_init_uart0();
#endif
- LED_GREEN_OFF();
- LED_RED_ON();
+ LED_GREEN_OFF;
+ LED_RED_ON;
puts("RIOT native board initialized.");
}
diff --git a/native/drivers/native-led.c b/native/drivers/native-led.c
index f2091c9a37..7f9296d7c3 100644
--- a/native/drivers/native-led.c
+++ b/native/drivers/native-led.c
@@ -19,32 +19,32 @@
#include "board.h"
-void LED_GREEN_OFF(void)
+void _native_LED_GREEN_OFF(void)
{
printf("LED_GREEN_OFF\n");
}
-void LED_GREEN_ON(void)
+void _native_LED_GREEN_ON(void)
{
printf("LED_GREEN_ON\n");
}
-void LED_GREEN_TOGGLE(void)
+void _native_LED_GREEN_TOGGLE(void)
{
printf("LED_GREEN_TOGGLE\n");
}
-void LED_RED_OFF(void)
+void _native_LED_RED_OFF(void)
{
printf("LED_RED_OFF\n");
}
-void LED_RED_ON(void)
+void _native_LED_RED_ON(void)
{
printf("LED_RED_ON\n");
}
-void LED_RED_TOGGLE(void)
+void _native_LED_RED_TOGGLE(void)
{
printf("LED_RED_TOGGLE\n");
}
diff --git a/native/include/board.h b/native/include/board.h
index 18ee528271..f4797f2060 100644
--- a/native/include/board.h
+++ b/native/include/board.h
@@ -15,9 +15,15 @@
* @}
*/
-void LED_GREEN_OFF(void);
-void LED_GREEN_ON(void);
-void LED_GREEN_TOGGLE(void);
-void LED_RED_OFF(void);
-void LED_RED_ON(void);
-void LED_RED_TOGGLE(void);
+void _native_LED_GREEN_OFF(void);
+#define LED_GREEN_OFF (_native_LED_GREEN_OFF())
+void _native_LED_GREEN_ON(void);
+#define LED_GREEN_ON (_native_LED_GREEN_ON())
+void _native_LED_GREEN_TOGGLE(void);
+#define LED_GREEN_TOGGLE (_native_LED_GREEN_TOGGLE())
+void _native_LED_RED_OFF(void);
+#define LED_RED_OFF (_native_LED_RED_OFF())
+void _native_LED_RED_ON(void);
+#define LED_RED_ON (_native_LED_RED_ON())
+void _native_LED_RED_TOGGLE(void);
+#define LED_RED_TOGGLE (_native_LED_RED_TOGGLE())
--
GitLab