diff options
author | Rafaël Carré <rafael.carre@gmail.com> | 2012-01-08 00:18:43 +0000 |
---|---|---|
committer | Rafaël Carré <rafael.carre@gmail.com> | 2012-01-08 00:18:43 +0000 |
commit | 7c547be19d1999932534fda39a0b73c5eb16e618 (patch) | |
tree | c37e0e4950142b6b5dfb9a8e4056bbc152ad95be | |
parent | 95cf63b294f3cbe2d4da60f32a35c7b07c4b74a3 (diff) | |
download | rockbox-7c547be19d1999932534fda39a0b73c5eb16e618.tar.gz rockbox-7c547be19d1999932534fda39a0b73c5eb16e618.zip |
fix previous commit
implement button_init_device for ondio
include button.h to get prototypes
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31621 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/target/arm/as3525/kernel-as3525.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/imx233/system-imx233.c | 2 | ||||
-rw-r--r-- | firmware/target/sh/archos/ondio/button-ondio.c | 4 | ||||
-rw-r--r-- | firmware/target/sh/archos/ondio/button-target.h | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/firmware/target/arm/as3525/kernel-as3525.c b/firmware/target/arm/as3525/kernel-as3525.c index d44b120387..527ae70bb2 100644 --- a/firmware/target/arm/as3525/kernel-as3525.c +++ b/firmware/target/arm/as3525/kernel-as3525.c | |||
@@ -25,7 +25,7 @@ | |||
25 | #include "timer.h" | 25 | #include "timer.h" |
26 | 26 | ||
27 | #if INCREASED_SCROLLWHEEL_POLLING | 27 | #if INCREASED_SCROLLWHEEL_POLLING |
28 | #include "button-target.h" | 28 | #include "button.h" |
29 | /* The scrollwheel is polled every 5 ms (the tick tasks only every 10) */ | 29 | /* The scrollwheel is polled every 5 ms (the tick tasks only every 10) */ |
30 | static int poll_scrollwheel = 0; | 30 | static int poll_scrollwheel = 0; |
31 | 31 | ||
diff --git a/firmware/target/arm/imx233/system-imx233.c b/firmware/target/arm/imx233/system-imx233.c index a97cf198c8..19d0a7fac9 100644 --- a/firmware/target/arm/imx233/system-imx233.c +++ b/firmware/target/arm/imx233/system-imx233.c | |||
@@ -32,7 +32,7 @@ | |||
32 | #include "i2c-imx233.h" | 32 | #include "i2c-imx233.h" |
33 | #include "lcd.h" | 33 | #include "lcd.h" |
34 | #include "backlight-target.h" | 34 | #include "backlight-target.h" |
35 | #include "button-target.h" | 35 | #include "button.h" |
36 | 36 | ||
37 | #define default_interrupt(name) \ | 37 | #define default_interrupt(name) \ |
38 | extern __attribute__((weak, alias("UIRQ"))) void name(void) | 38 | extern __attribute__((weak, alias("UIRQ"))) void name(void) |
diff --git a/firmware/target/sh/archos/ondio/button-ondio.c b/firmware/target/sh/archos/ondio/button-ondio.c index 91e43fc41a..e3b370bc1f 100644 --- a/firmware/target/sh/archos/ondio/button-ondio.c +++ b/firmware/target/sh/archos/ondio/button-ondio.c | |||
@@ -37,6 +37,10 @@ | |||
37 | ON/OFF: AN3, low active (assigned as OFF) | 37 | ON/OFF: AN3, low active (assigned as OFF) |
38 | */ | 38 | */ |
39 | 39 | ||
40 | void button_init_device(void) | ||
41 | { | ||
42 | } | ||
43 | |||
40 | int button_read_device(void) | 44 | int button_read_device(void) |
41 | { | 45 | { |
42 | int btn = BUTTON_NONE; | 46 | int btn = BUTTON_NONE; |
diff --git a/firmware/target/sh/archos/ondio/button-target.h b/firmware/target/sh/archos/ondio/button-target.h index b23d157b6d..a84be2851a 100644 --- a/firmware/target/sh/archos/ondio/button-target.h +++ b/firmware/target/sh/archos/ondio/button-target.h | |||
@@ -22,8 +22,6 @@ | |||
22 | #ifndef _BUTTON_TARGET_H_ | 22 | #ifndef _BUTTON_TARGET_H_ |
23 | #define _BUTTON_TARGET_H_ | 23 | #define _BUTTON_TARGET_H_ |
24 | 24 | ||
25 | #define button_init_device() | ||
26 | |||
27 | #define BUTTON_OFF 0x00000001 | 25 | #define BUTTON_OFF 0x00000001 |
28 | #define BUTTON_MENU 0x00000002 | 26 | #define BUTTON_MENU 0x00000002 |
29 | 27 | ||