123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110 |
- From 137c23ed9e6ad2cba575842065bffa6e59170e17 Mon Sep 17 00:00:00 2001
- From: Jeroen Hofstee <jeroen@myspectrum.nl>
- Date: Mon, 23 Jun 2014 23:20:19 +0200
- Subject: [PATCH 6/6] common: board_f: cosmetic use __weak for leds
- First of all this looks a lot better, but it also
- prevents a gcc warning (W=1), that the weak function
- has no previous prototype.
- cc: Simon Glass <sjg@chromium.org>
- Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
- Acked-by: Simon Glass <sjg@chromium.org>
- common/board_f.c | 29 ++++++++++-------------------
- include/status_led.h | 22 +++++++++++-----------
- 2 files changed, 21 insertions(+), 30 deletions(-)
- diff --git a/common/board_f.c b/common/board_f.c
- index 215cc4a..6e955bb 100644
- @@ -37,6 +37,7 @@
- #include <os.h>
- #include <post.h>
- #include <spi.h>
- +#include <status_led.h>
- #include <trace.h>
- #include <watchdog.h>
- #include <asm/errno.h>
- @@ -78,25 +79,15 @@ DECLARE_GLOBAL_DATA_PTR;
-
- * May be supplied by boards if desired
- */
- -inline void __coloured_LED_init(void) {}
- -void coloured_LED_init(void)
- - __attribute__((weak, alias("__coloured_LED_init")));
- -inline void __red_led_on(void) {}
- -void red_led_on(void) __attribute__((weak, alias("__red_led_on")));
- -inline void __red_led_off(void) {}
- -void red_led_off(void) __attribute__((weak, alias("__red_led_off")));
- -inline void __green_led_on(void) {}
- -void green_led_on(void) __attribute__((weak, alias("__green_led_on")));
- -inline void __green_led_off(void) {}
- -void green_led_off(void) __attribute__((weak, alias("__green_led_off")));
- -inline void __yellow_led_on(void) {}
- -void yellow_led_on(void) __attribute__((weak, alias("__yellow_led_on")));
- -inline void __yellow_led_off(void) {}
- -void yellow_led_off(void) __attribute__((weak, alias("__yellow_led_off")));
- -inline void __blue_led_on(void) {}
- -void blue_led_on(void) __attribute__((weak, alias("__blue_led_on")));
- -inline void __blue_led_off(void) {}
- -void blue_led_off(void) __attribute__((weak, alias("__blue_led_off")));
- +__weak void coloured_LED_init(void) {}
- +__weak void red_led_on(void) {}
- +__weak void red_led_off(void) {}
- +__weak void green_led_on(void) {}
- +__weak void green_led_off(void) {}
- +__weak void yellow_led_on(void) {}
- +__weak void yellow_led_off(void) {}
- +__weak void blue_led_on(void) {}
- +__weak void blue_led_off(void) {}
-
- /*
- * Why is gd allocated a register? Prior to reloc it might be better to
- diff --git a/include/status_led.h b/include/status_led.h
- index 0eb91b8..b8aaaf7 100644
- @@ -272,19 +272,21 @@ extern void __led_set (led_id_t mask, int state);
- # include <asm/status_led.h>
- #endif
-
- +#endif /* CONFIG_STATUS_LED */
- +
- /*
- * Coloured LEDs API
- */
- #ifndef __ASSEMBLY__
- -extern void coloured_LED_init (void);
- -extern void red_led_on(void);
- -extern void red_led_off(void);
- -extern void green_led_on(void);
- -extern void green_led_off(void);
- -extern void yellow_led_on(void);
- -extern void yellow_led_off(void);
- -extern void blue_led_on(void);
- -extern void blue_led_off(void);
- +void coloured_LED_init(void);
- +void red_led_on(void);
- +void red_led_off(void);
- +void green_led_on(void);
- +void green_led_off(void);
- +void yellow_led_on(void);
- +void yellow_led_off(void);
- +void blue_led_on(void);
- +void blue_led_off(void);
- #else
- .extern LED_init
- .extern red_led_on
- @@ -297,6 +299,4 @@ extern void blue_led_off(void);
- .extern blue_led_off
- #endif
-
- -#endif /* CONFIG_STATUS_LED */
- -
- #endif /* _STATUS_LED_H_ */
- --
- 2.4.4
|