diff options
68 files changed, 27 insertions, 502 deletions
diff --git a/firmware/export/button.h b/firmware/export/button.h index 3847d2ac9f..3f6052a309 100644 --- a/firmware/export/button.h +++ b/firmware/export/button.h | |||
@@ -28,8 +28,26 @@ | |||
28 | #include "button-target.h" | 28 | #include "button-target.h" |
29 | #endif | 29 | #endif |
30 | 30 | ||
31 | #ifndef BUTTON_REMOTE | ||
32 | # define BUTTON_REMOTE 0 | ||
33 | #endif | ||
34 | |||
31 | extern struct event_queue button_queue; | 35 | extern struct event_queue button_queue; |
32 | 36 | ||
37 | void button_init_device(void); | ||
38 | #ifdef HAVE_BUTTON_DATA | ||
39 | int button_read_device(int *); | ||
40 | #else | ||
41 | int button_read_device(void); | ||
42 | #endif | ||
43 | |||
44 | #ifdef HAS_BUTTON_HOLD | ||
45 | bool button_hold(void); | ||
46 | #endif | ||
47 | #ifdef HAS_REMOTE_BUTTON_HOLD | ||
48 | bool remote_button_hold(void); | ||
49 | #endif | ||
50 | |||
33 | void button_init (void) INIT_ATTR; | 51 | void button_init (void) INIT_ATTR; |
34 | void button_close(void); | 52 | void button_close(void); |
35 | int button_queue_count(void); | 53 | int button_queue_count(void); |
diff --git a/firmware/target/arm/archos/av300/button-target.h b/firmware/target/arm/archos/av300/button-target.h index bda6a341cd..a4c439690f 100644 --- a/firmware/target/arm/archos/av300/button-target.h +++ b/firmware/target/arm/archos/av300/button-target.h | |||
@@ -22,12 +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 | #include <stdbool.h> | ||
26 | #include "config.h" | ||
27 | |||
28 | void button_init_device(void); | ||
29 | int button_read_device(void); | ||
30 | |||
31 | /* Main unit's buttons */ | 25 | /* Main unit's buttons */ |
32 | 26 | ||
33 | #define BUTTON_ON 0x00000001 | 27 | #define BUTTON_ON 0x00000001 |
diff --git a/firmware/target/arm/as3525/button-clip.c b/firmware/target/arm/as3525/button-clip.c index 04be8450fd..18bac8aa01 100644 --- a/firmware/target/arm/as3525/button-clip.c +++ b/firmware/target/arm/as3525/button-clip.c | |||
@@ -21,7 +21,7 @@ | |||
21 | * | 21 | * |
22 | ****************************************************************************/ | 22 | ****************************************************************************/ |
23 | #include "system.h" | 23 | #include "system.h" |
24 | #include "button-target.h" | 24 | #include "button.h" |
25 | #include "as3525v2.h" | 25 | #include "as3525v2.h" |
26 | #ifndef BOOTLOADER | 26 | #ifndef BOOTLOADER |
27 | #include "backlight.h" | 27 | #include "backlight.h" |
diff --git a/firmware/target/arm/as3525/button-e200v2-fuze.c b/firmware/target/arm/as3525/button-e200v2-fuze.c index 2cbdcf5130..13bd461bb6 100644 --- a/firmware/target/arm/as3525/button-e200v2-fuze.c +++ b/firmware/target/arm/as3525/button-e200v2-fuze.c | |||
@@ -23,7 +23,7 @@ | |||
23 | #include "config.h" | 23 | #include "config.h" |
24 | #include "system.h" | 24 | #include "system.h" |
25 | #include "button.h" | 25 | #include "button.h" |
26 | #include "button-target.h" | 26 | #include "button.h" |
27 | #include "backlight.h" | 27 | #include "backlight.h" |
28 | #include "dbop-as3525.h" | 28 | #include "dbop-as3525.h" |
29 | 29 | ||
diff --git a/firmware/target/arm/as3525/sansa-c200v2/button-c200v2.c b/firmware/target/arm/as3525/sansa-c200v2/button-c200v2.c index 378b3131f2..36ef43d32b 100644 --- a/firmware/target/arm/as3525/sansa-c200v2/button-c200v2.c +++ b/firmware/target/arm/as3525/sansa-c200v2/button-c200v2.c | |||
@@ -21,7 +21,6 @@ | |||
21 | 21 | ||
22 | #include "config.h" | 22 | #include "config.h" |
23 | #include "system.h" | 23 | #include "system.h" |
24 | #include "button-target.h" | ||
25 | #include "button.h" | 24 | #include "button.h" |
26 | #include "backlight.h" | 25 | #include "backlight.h" |
27 | #include "dbop-as3525.h" | 26 | #include "dbop-as3525.h" |
diff --git a/firmware/target/arm/as3525/sansa-c200v2/button-target.h b/firmware/target/arm/as3525/sansa-c200v2/button-target.h index 5f3c72521e..d5b22583c4 100644 --- a/firmware/target/arm/as3525/sansa-c200v2/button-target.h +++ b/firmware/target/arm/as3525/sansa-c200v2/button-target.h | |||
@@ -22,15 +22,8 @@ | |||
22 | #ifndef _BUTTON_TARGET_H_ | 22 | #ifndef _BUTTON_TARGET_H_ |
23 | #define _BUTTON_TARGET_H_ | 23 | #define _BUTTON_TARGET_H_ |
24 | 24 | ||
25 | #include <stdbool.h> | ||
26 | #include "config.h" | ||
27 | |||
28 | #define HAS_BUTTON_HOLD | 25 | #define HAS_BUTTON_HOLD |
29 | 26 | ||
30 | bool button_hold(void); | ||
31 | void button_init_device(void); | ||
32 | int button_read_device(void); | ||
33 | |||
34 | /* Sandisk Sansa c200 button codes */ | 27 | /* Sandisk Sansa c200 button codes */ |
35 | 28 | ||
36 | /* Main unit's buttons */ | 29 | /* Main unit's buttons */ |
@@ -46,9 +39,6 @@ int button_read_device(void); | |||
46 | 39 | ||
47 | #define BUTTON_MAIN 0x00000fff | 40 | #define BUTTON_MAIN 0x00000fff |
48 | 41 | ||
49 | /* No Remote control */ | ||
50 | #define BUTTON_REMOTE 0 | ||
51 | |||
52 | #define POWEROFF_BUTTON BUTTON_POWER | 42 | #define POWEROFF_BUTTON BUTTON_POWER |
53 | #define POWEROFF_COUNT 10 | 43 | #define POWEROFF_COUNT 10 |
54 | 44 | ||
diff --git a/firmware/target/arm/as3525/sansa-clip/button-target.h b/firmware/target/arm/as3525/sansa-clip/button-target.h index 238fd1dee5..85d5a477e1 100644 --- a/firmware/target/arm/as3525/sansa-clip/button-target.h +++ b/firmware/target/arm/as3525/sansa-clip/button-target.h | |||
@@ -22,15 +22,8 @@ | |||
22 | #ifndef _BUTTON_TARGET_H_ | 22 | #ifndef _BUTTON_TARGET_H_ |
23 | #define _BUTTON_TARGET_H_ | 23 | #define _BUTTON_TARGET_H_ |
24 | 24 | ||
25 | #include <stdbool.h> | ||
26 | #include "config.h" | ||
27 | |||
28 | #define HAS_BUTTON_HOLD | 25 | #define HAS_BUTTON_HOLD |
29 | 26 | ||
30 | void button_init_device(void); | ||
31 | int button_read_device(void); | ||
32 | bool button_hold(void); | ||
33 | |||
34 | /* Main unit's buttons */ | 27 | /* Main unit's buttons */ |
35 | #define BUTTON_HOME 0x00000001 | 28 | #define BUTTON_HOME 0x00000001 |
36 | 29 | ||
@@ -50,8 +43,6 @@ bool button_hold(void); | |||
50 | |BUTTON_UP|BUTTON_DOWN|BUTTON_LEFT|BUTTON_RIGHT\ | 43 | |BUTTON_UP|BUTTON_DOWN|BUTTON_LEFT|BUTTON_RIGHT\ |
51 | |BUTTON_SELECT|BUTTON_POWER) | 44 | |BUTTON_SELECT|BUTTON_POWER) |
52 | 45 | ||
53 | #define BUTTON_REMOTE 0 | ||
54 | |||
55 | /* Software power-off */ | 46 | /* Software power-off */ |
56 | #define POWEROFF_BUTTON BUTTON_POWER | 47 | #define POWEROFF_BUTTON BUTTON_POWER |
57 | #define POWEROFF_COUNT 10 | 48 | #define POWEROFF_COUNT 10 |
diff --git a/firmware/target/arm/as3525/sansa-clipplus/button-clip.c b/firmware/target/arm/as3525/sansa-clipplus/button-clip.c index 6514346654..60b8c8f7a3 100644 --- a/firmware/target/arm/as3525/sansa-clipplus/button-clip.c +++ b/firmware/target/arm/as3525/sansa-clipplus/button-clip.c | |||
@@ -19,7 +19,7 @@ | |||
19 | * KIND, either express or implied. | 19 | * KIND, either express or implied. |
20 | * | 20 | * |
21 | ****************************************************************************/ | 21 | ****************************************************************************/ |
22 | #include "button-target.h" | 22 | #include "button.h" |
23 | #include "as3525v2.h" | 23 | #include "as3525v2.h" |
24 | #include "kernel.h" | 24 | #include "kernel.h" |
25 | 25 | ||
diff --git a/firmware/target/arm/as3525/sansa-clipplus/button-target.h b/firmware/target/arm/as3525/sansa-clipplus/button-target.h index c341a94220..8176382ba2 100644 --- a/firmware/target/arm/as3525/sansa-clipplus/button-target.h +++ b/firmware/target/arm/as3525/sansa-clipplus/button-target.h | |||
@@ -22,12 +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 | #include <stdbool.h> | ||
26 | #include "config.h" | ||
27 | |||
28 | void button_init_device(void); | ||
29 | int button_read_device(void); | ||
30 | |||
31 | /* Main unit's buttons */ | 25 | /* Main unit's buttons */ |
32 | #define BUTTON_HOME 0x00000001 | 26 | #define BUTTON_HOME 0x00000001 |
33 | 27 | ||
@@ -47,8 +41,6 @@ int button_read_device(void); | |||
47 | |BUTTON_UP|BUTTON_DOWN|BUTTON_LEFT|BUTTON_RIGHT\ | 41 | |BUTTON_UP|BUTTON_DOWN|BUTTON_LEFT|BUTTON_RIGHT\ |
48 | |BUTTON_SELECT|BUTTON_POWER) | 42 | |BUTTON_SELECT|BUTTON_POWER) |
49 | 43 | ||
50 | #define BUTTON_REMOTE 0 | ||
51 | |||
52 | /* Software power-off */ | 44 | /* Software power-off */ |
53 | #define POWEROFF_BUTTON BUTTON_POWER | 45 | #define POWEROFF_BUTTON BUTTON_POWER |
54 | #define POWEROFF_COUNT 10 | 46 | #define POWEROFF_COUNT 10 |
diff --git a/firmware/target/arm/as3525/sansa-clipv2/button-target.h b/firmware/target/arm/as3525/sansa-clipv2/button-target.h index 238fd1dee5..85d5a477e1 100644 --- a/firmware/target/arm/as3525/sansa-clipv2/button-target.h +++ b/firmware/target/arm/as3525/sansa-clipv2/button-target.h | |||
@@ -22,15 +22,8 @@ | |||
22 | #ifndef _BUTTON_TARGET_H_ | 22 | #ifndef _BUTTON_TARGET_H_ |
23 | #define _BUTTON_TARGET_H_ | 23 | #define _BUTTON_TARGET_H_ |
24 | 24 | ||
25 | #include <stdbool.h> | ||
26 | #include "config.h" | ||
27 | |||
28 | #define HAS_BUTTON_HOLD | 25 | #define HAS_BUTTON_HOLD |
29 | 26 | ||
30 | void button_init_device(void); | ||
31 | int button_read_device(void); | ||
32 | bool button_hold(void); | ||
33 | |||
34 | /* Main unit's buttons */ | 27 | /* Main unit's buttons */ |
35 | #define BUTTON_HOME 0x00000001 | 28 | #define BUTTON_HOME 0x00000001 |
36 | 29 | ||
@@ -50,8 +43,6 @@ bool button_hold(void); | |||
50 | |BUTTON_UP|BUTTON_DOWN|BUTTON_LEFT|BUTTON_RIGHT\ | 43 | |BUTTON_UP|BUTTON_DOWN|BUTTON_LEFT|BUTTON_RIGHT\ |
51 | |BUTTON_SELECT|BUTTON_POWER) | 44 | |BUTTON_SELECT|BUTTON_POWER) |
52 | 45 | ||
53 | #define BUTTON_REMOTE 0 | ||
54 | |||
55 | /* Software power-off */ | 46 | /* Software power-off */ |
56 | #define POWEROFF_BUTTON BUTTON_POWER | 47 | #define POWEROFF_BUTTON BUTTON_POWER |
57 | #define POWEROFF_COUNT 10 | 48 | #define POWEROFF_COUNT 10 |
diff --git a/firmware/target/arm/as3525/sansa-clipzip/button-clipzip.c b/firmware/target/arm/as3525/sansa-clipzip/button-clipzip.c index c22c5e24e9..4fdb87fc1d 100644 --- a/firmware/target/arm/as3525/sansa-clipzip/button-clipzip.c +++ b/firmware/target/arm/as3525/sansa-clipzip/button-clipzip.c | |||
@@ -21,7 +21,7 @@ | |||
21 | ****************************************************************************/ | 21 | ****************************************************************************/ |
22 | 22 | ||
23 | #include "config.h" | 23 | #include "config.h" |
24 | #include "button-target.h" | 24 | #include "button.h" |
25 | #include "as3525v2.h" | 25 | #include "as3525v2.h" |
26 | #include "system.h" | 26 | #include "system.h" |
27 | #include "kernel.h" | 27 | #include "kernel.h" |
diff --git a/firmware/target/arm/as3525/sansa-clipzip/button-target.h b/firmware/target/arm/as3525/sansa-clipzip/button-target.h index 8a93d45daa..8176382ba2 100644 --- a/firmware/target/arm/as3525/sansa-clipzip/button-target.h +++ b/firmware/target/arm/as3525/sansa-clipzip/button-target.h | |||
@@ -22,11 +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 | #include "config.h" | ||
26 | |||
27 | void button_init_device(void); | ||
28 | int button_read_device(void); | ||
29 | |||
30 | /* Main unit's buttons */ | 25 | /* Main unit's buttons */ |
31 | #define BUTTON_HOME 0x00000001 | 26 | #define BUTTON_HOME 0x00000001 |
32 | 27 | ||
@@ -46,8 +41,6 @@ int button_read_device(void); | |||
46 | |BUTTON_UP|BUTTON_DOWN|BUTTON_LEFT|BUTTON_RIGHT\ | 41 | |BUTTON_UP|BUTTON_DOWN|BUTTON_LEFT|BUTTON_RIGHT\ |
47 | |BUTTON_SELECT|BUTTON_POWER) | 42 | |BUTTON_SELECT|BUTTON_POWER) |
48 | 43 | ||
49 | #define BUTTON_REMOTE 0 | ||
50 | |||
51 | /* Software power-off */ | 44 | /* Software power-off */ |
52 | #define POWEROFF_BUTTON BUTTON_POWER | 45 | #define POWEROFF_BUTTON BUTTON_POWER |
53 | #define POWEROFF_COUNT 10 | 46 | #define POWEROFF_COUNT 10 |
diff --git a/firmware/target/arm/as3525/sansa-e200v2/button-target.h b/firmware/target/arm/as3525/sansa-e200v2/button-target.h index 7a0e9e50f1..4c41a4b6df 100644 --- a/firmware/target/arm/as3525/sansa-e200v2/button-target.h +++ b/firmware/target/arm/as3525/sansa-e200v2/button-target.h | |||
@@ -22,14 +22,8 @@ | |||
22 | #ifndef _BUTTON_TARGET_H_ | 22 | #ifndef _BUTTON_TARGET_H_ |
23 | #define _BUTTON_TARGET_H_ | 23 | #define _BUTTON_TARGET_H_ |
24 | 24 | ||
25 | #include <stdbool.h> | ||
26 | #include "config.h" | ||
27 | |||
28 | #define HAS_BUTTON_HOLD | 25 | #define HAS_BUTTON_HOLD |
29 | 26 | ||
30 | bool button_hold(void); | ||
31 | void button_init_device(void); | ||
32 | int button_read_device(void); | ||
33 | unsigned short button_read_dbop(void); | 27 | unsigned short button_read_dbop(void); |
34 | #define get_scrollwheel button_read_dbop | 28 | #define get_scrollwheel button_read_dbop |
35 | 29 | ||
@@ -54,9 +48,6 @@ unsigned short button_read_dbop(void); | |||
54 | 48 | ||
55 | #define BUTTON_MAIN 0x00000fff | 49 | #define BUTTON_MAIN 0x00000fff |
56 | 50 | ||
57 | /* No Remote control */ | ||
58 | #define BUTTON_REMOTE 0 | ||
59 | |||
60 | #define POWEROFF_BUTTON BUTTON_POWER | 51 | #define POWEROFF_BUTTON BUTTON_POWER |
61 | #define POWEROFF_COUNT 10 | 52 | #define POWEROFF_COUNT 10 |
62 | 53 | ||
diff --git a/firmware/target/arm/as3525/sansa-fuze/button-target.h b/firmware/target/arm/as3525/sansa-fuze/button-target.h index 2cee93723e..1bcc739413 100644 --- a/firmware/target/arm/as3525/sansa-fuze/button-target.h +++ b/firmware/target/arm/as3525/sansa-fuze/button-target.h | |||
@@ -22,14 +22,8 @@ | |||
22 | #ifndef _BUTTON_TARGET_H_ | 22 | #ifndef _BUTTON_TARGET_H_ |
23 | #define _BUTTON_TARGET_H_ | 23 | #define _BUTTON_TARGET_H_ |
24 | 24 | ||
25 | #include <stdbool.h> | ||
26 | #include "config.h" | ||
27 | |||
28 | #define HAS_BUTTON_HOLD | 25 | #define HAS_BUTTON_HOLD |
29 | 26 | ||
30 | void button_init_device(void); | ||
31 | bool button_hold(void); | ||
32 | int button_read_device(void); | ||
33 | unsigned short button_read_dbop(void); | 27 | unsigned short button_read_dbop(void); |
34 | #define get_scrollwheel button_read_dbop | 28 | #define get_scrollwheel button_read_dbop |
35 | 29 | ||
@@ -61,9 +55,6 @@ unsigned short button_read_dbop(void); | |||
61 | |BUTTON_SCROLL_BACK|BUTTON_SCROLL_FWD \ | 55 | |BUTTON_SCROLL_BACK|BUTTON_SCROLL_FWD \ |
62 | |BUTTON_HOLD) | 56 | |BUTTON_HOLD) |
63 | 57 | ||
64 | /* No Remote control */ | ||
65 | #define BUTTON_REMOTE 0 | ||
66 | |||
67 | #define POWEROFF_BUTTON BUTTON_POWER | 58 | #define POWEROFF_BUTTON BUTTON_POWER |
68 | #define POWEROFF_COUNT 10 | 59 | #define POWEROFF_COUNT 10 |
69 | 60 | ||
diff --git a/firmware/target/arm/as3525/sansa-fuzev2/button-target.h b/firmware/target/arm/as3525/sansa-fuzev2/button-target.h index 596ac01262..6ea1a9616e 100644 --- a/firmware/target/arm/as3525/sansa-fuzev2/button-target.h +++ b/firmware/target/arm/as3525/sansa-fuzev2/button-target.h | |||
@@ -22,14 +22,8 @@ | |||
22 | #ifndef _BUTTON_TARGET_H_ | 22 | #ifndef _BUTTON_TARGET_H_ |
23 | #define _BUTTON_TARGET_H_ | 23 | #define _BUTTON_TARGET_H_ |
24 | 24 | ||
25 | #include <stdbool.h> | ||
26 | #include "config.h" | ||
27 | |||
28 | #define HAS_BUTTON_HOLD | 25 | #define HAS_BUTTON_HOLD |
29 | 26 | ||
30 | void button_init_device(void); | ||
31 | bool button_hold(void); | ||
32 | int button_read_device(void); | ||
33 | /* Sandisk Sansa Fuze button codes */ | 27 | /* Sandisk Sansa Fuze button codes */ |
34 | 28 | ||
35 | /* Main unit's buttons - mapped for optimal reading */ | 29 | /* Main unit's buttons - mapped for optimal reading */ |
@@ -52,9 +46,6 @@ int button_read_device(void); | |||
52 | |BUTTON_SCROLL_BACK|BUTTON_SCROLL_FWD \ | 46 | |BUTTON_SCROLL_BACK|BUTTON_SCROLL_FWD \ |
53 | |BUTTON_HOLD) | 47 | |BUTTON_HOLD) |
54 | 48 | ||
55 | /* No Remote control */ | ||
56 | #define BUTTON_REMOTE 0 | ||
57 | |||
58 | #define POWEROFF_BUTTON BUTTON_POWER | 49 | #define POWEROFF_BUTTON BUTTON_POWER |
59 | #define POWEROFF_COUNT 10 | 50 | #define POWEROFF_COUNT 10 |
60 | 51 | ||
diff --git a/firmware/target/arm/as3525/sansa-m200v4/button-target.h b/firmware/target/arm/as3525/sansa-m200v4/button-target.h index 49a7409a6b..00876c4a3d 100644 --- a/firmware/target/arm/as3525/sansa-m200v4/button-target.h +++ b/firmware/target/arm/as3525/sansa-m200v4/button-target.h | |||
@@ -22,15 +22,8 @@ | |||
22 | #ifndef _BUTTON_TARGET_H_ | 22 | #ifndef _BUTTON_TARGET_H_ |
23 | #define _BUTTON_TARGET_H_ | 23 | #define _BUTTON_TARGET_H_ |
24 | 24 | ||
25 | #include <stdbool.h> | ||
26 | #include "config.h" | ||
27 | |||
28 | #define HAS_BUTTON_HOLD | 25 | #define HAS_BUTTON_HOLD |
29 | 26 | ||
30 | void button_init_device(void); | ||
31 | int button_read_device(void); | ||
32 | bool button_hold(void); | ||
33 | |||
34 | /* Main unit's buttons */ | 27 | /* Main unit's buttons */ |
35 | #define BUTTON_POWER 0x00000001 | 28 | #define BUTTON_POWER 0x00000001 |
36 | #define BUTTON_VOL_UP 0x00000002 | 29 | #define BUTTON_VOL_UP 0x00000002 |
@@ -46,8 +39,6 @@ bool button_hold(void); | |||
46 | |BUTTON_UP|BUTTON_DOWN|BUTTON_LEFT\ | 39 | |BUTTON_UP|BUTTON_DOWN|BUTTON_LEFT\ |
47 | |BUTTON_RIGHT|BUTTON_SELECT|BUTTON_HOLD) | 40 | |BUTTON_RIGHT|BUTTON_SELECT|BUTTON_HOLD) |
48 | 41 | ||
49 | #define BUTTON_REMOTE 0 | ||
50 | |||
51 | /* Software power-off */ | 42 | /* Software power-off */ |
52 | #define POWEROFF_BUTTON BUTTON_POWER | 43 | #define POWEROFF_BUTTON BUTTON_POWER |
53 | #define POWEROFF_COUNT 40 | 44 | #define POWEROFF_COUNT 40 |
diff --git a/firmware/target/arm/as3525/system-as3525.c b/firmware/target/arm/as3525/system-as3525.c index 965030ecc3..89a07939b6 100644 --- a/firmware/target/arm/as3525/system-as3525.c +++ b/firmware/target/arm/as3525/system-as3525.c | |||
@@ -29,7 +29,7 @@ | |||
29 | #include "dma-target.h" | 29 | #include "dma-target.h" |
30 | #include "clock-target.h" | 30 | #include "clock-target.h" |
31 | #include "fmradio_i2c.h" | 31 | #include "fmradio_i2c.h" |
32 | #include "button-target.h" | 32 | #include "button.h" |
33 | #include "backlight-target.h" | 33 | #include "backlight-target.h" |
34 | #include "lcd.h" | 34 | #include "lcd.h" |
35 | 35 | ||
diff --git a/firmware/target/arm/at91sam/lyre_proto1/button-target.h b/firmware/target/arm/at91sam/lyre_proto1/button-target.h index e05f9f294f..bfba483df1 100644 --- a/firmware/target/arm/at91sam/lyre_proto1/button-target.h +++ b/firmware/target/arm/at91sam/lyre_proto1/button-target.h | |||
@@ -22,9 +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 | #include <stdbool.h> | ||
26 | #include "config.h" | ||
27 | |||
28 | #define BUTTON_SELECT 0x00000001 | 25 | #define BUTTON_SELECT 0x00000001 |
29 | #define BUTTON_MENU 0x00000002 | 26 | #define BUTTON_MENU 0x00000002 |
30 | #define BUTTON_PLAY 0x00000004 | 27 | #define BUTTON_PLAY 0x00000004 |
@@ -38,11 +35,5 @@ | |||
38 | #define BUTTON_MAIN (BUTTON_UP|BUTTON_DOWN|BUTTON_RIGHT|BUTTON_LEFT \ | 35 | #define BUTTON_MAIN (BUTTON_UP|BUTTON_DOWN|BUTTON_RIGHT|BUTTON_LEFT \ |
39 | |BUTTON_SELECT|BUTTON_MENU|BUTTON_PLAY \ | 36 | |BUTTON_SELECT|BUTTON_MENU|BUTTON_PLAY \ |
40 | |BUTTON_STOP) | 37 | |BUTTON_STOP) |
41 | bool button_hold(void); | ||
42 | void button_init_device(void); | ||
43 | int button_read_device(void); | ||
44 | |||
45 | /* No Remote control */ | ||
46 | #define BUTTON_REMOTE 0 | ||
47 | 38 | ||
48 | #endif /* _BUTTON_TARGET_H_ */ | 39 | #endif /* _BUTTON_TARGET_H_ */ |
diff --git a/firmware/target/arm/imx233/sansa-fuzeplus/button-target.h b/firmware/target/arm/imx233/sansa-fuzeplus/button-target.h index 1536dbe1ab..89088b5d01 100644 --- a/firmware/target/arm/imx233/sansa-fuzeplus/button-target.h +++ b/firmware/target/arm/imx233/sansa-fuzeplus/button-target.h | |||
@@ -21,11 +21,6 @@ | |||
21 | #ifndef _BUTTON_TARGET_H_ | 21 | #ifndef _BUTTON_TARGET_H_ |
22 | #define _BUTTON_TARGET_H_ | 22 | #define _BUTTON_TARGET_H_ |
23 | 23 | ||
24 | #include <stdbool.h> | ||
25 | #include "config.h" | ||
26 | |||
27 | void button_init_device(void); | ||
28 | int button_read_device(void); | ||
29 | bool button_debug_screen(void); | 24 | bool button_debug_screen(void); |
30 | 25 | ||
31 | /* Main unit's buttons */ | 26 | /* Main unit's buttons */ |
@@ -49,8 +44,6 @@ bool button_debug_screen(void); | |||
49 | BUTTON_PLAYPAUSE|BUTTON_BACK| \ | 44 | BUTTON_PLAYPAUSE|BUTTON_BACK| \ |
50 | BUTTON_BOTTOMRIGHT|BUTTON_BOTTOMLEFT) | 45 | BUTTON_BOTTOMRIGHT|BUTTON_BOTTOMLEFT) |
51 | 46 | ||
52 | #define BUTTON_REMOTE 0 | ||
53 | |||
54 | /* Software power-off */ | 47 | /* Software power-off */ |
55 | #define POWEROFF_BUTTON BUTTON_POWER | 48 | #define POWEROFF_BUTTON BUTTON_POWER |
56 | #define POWEROFF_COUNT 10 | 49 | #define POWEROFF_COUNT 10 |
diff --git a/firmware/target/arm/imx31/gigabeat-s/button-target.h b/firmware/target/arm/imx31/gigabeat-s/button-target.h index 940ebac2f2..ce624ed6cc 100644 --- a/firmware/target/arm/imx31/gigabeat-s/button-target.h +++ b/firmware/target/arm/imx31/gigabeat-s/button-target.h | |||
@@ -21,7 +21,6 @@ | |||
21 | #ifndef _BUTTON_TARGET_H_ | 21 | #ifndef _BUTTON_TARGET_H_ |
22 | #define _BUTTON_TARGET_H_ | 22 | #define _BUTTON_TARGET_H_ |
23 | 23 | ||
24 | #include <stdbool.h> | ||
25 | #include "config.h" | 24 | #include "config.h" |
26 | 25 | ||
27 | #define HAS_BUTTON_HOLD | 26 | #define HAS_BUTTON_HOLD |
@@ -30,10 +29,7 @@ | |||
30 | #define BUTTON_DRIVER_CLOSE | 29 | #define BUTTON_DRIVER_CLOSE |
31 | #endif | 30 | #endif |
32 | 31 | ||
33 | bool button_hold(void); | ||
34 | void button_init_device(void); | ||
35 | void button_close_device(void); | 32 | void button_close_device(void); |
36 | int button_read_device(void); | ||
37 | void button_power_event(void); | 33 | void button_power_event(void); |
38 | void headphone_detect_event(void); | 34 | void headphone_detect_event(void); |
39 | void headphone_init(void); | 35 | void headphone_init(void); |
diff --git a/firmware/target/arm/ipod/button-target.h b/firmware/target/arm/ipod/button-target.h index 67bdc72955..82f600d302 100644 --- a/firmware/target/arm/ipod/button-target.h +++ b/firmware/target/arm/ipod/button-target.h | |||
@@ -21,15 +21,10 @@ | |||
21 | #ifndef _BUTTON_TARGET_H_ | 21 | #ifndef _BUTTON_TARGET_H_ |
22 | #define _BUTTON_TARGET_H_ | 22 | #define _BUTTON_TARGET_H_ |
23 | 23 | ||
24 | #include <stdbool.h> | ||
25 | #include "config.h" | 24 | #include "config.h" |
26 | 25 | ||
27 | #define HAS_BUTTON_HOLD | 26 | #define HAS_BUTTON_HOLD |
28 | 27 | ||
29 | bool button_hold(void); | ||
30 | void button_init_device(void); | ||
31 | int button_read_device(void); | ||
32 | |||
33 | void ipod_mini_button_int(void); | 28 | void ipod_mini_button_int(void); |
34 | void ipod_3g_button_int(void); | 29 | void ipod_3g_button_int(void); |
35 | void ipod_4g_button_int(void); | 30 | void ipod_4g_button_int(void); |
@@ -63,8 +58,6 @@ void ipod_4g_button_int(void); | |||
63 | #define BUTTON_REMOTE (BUTTON_RC_PLAY|BUTTON_RC_STOP\ | 58 | #define BUTTON_REMOTE (BUTTON_RC_PLAY|BUTTON_RC_STOP\ |
64 | |BUTTON_RC_LEFT|BUTTON_RC_RIGHT\ | 59 | |BUTTON_RC_LEFT|BUTTON_RC_RIGHT\ |
65 | |BUTTON_RC_VOL_UP|BUTTON_RC_VOL_DOWN) | 60 | |BUTTON_RC_VOL_UP|BUTTON_RC_VOL_DOWN) |
66 | #else | ||
67 | #define BUTTON_REMOTE 0 | ||
68 | #endif | 61 | #endif |
69 | 62 | ||
70 | /* This is for later | 63 | /* This is for later |
diff --git a/firmware/target/arm/iriver/h10/button-target.h b/firmware/target/arm/iriver/h10/button-target.h index c2d7165ac0..2cd4a1454c 100644 --- a/firmware/target/arm/iriver/h10/button-target.h +++ b/firmware/target/arm/iriver/h10/button-target.h | |||
@@ -24,17 +24,9 @@ | |||
24 | #ifndef _BUTTON_TARGET_H_ | 24 | #ifndef _BUTTON_TARGET_H_ |
25 | #define _BUTTON_TARGET_H_ | 25 | #define _BUTTON_TARGET_H_ |
26 | 26 | ||
27 | #include <stdbool.h> | ||
28 | #include "config.h" | ||
29 | |||
30 | #define HAS_BUTTON_HOLD | 27 | #define HAS_BUTTON_HOLD |
31 | #define HAS_REMOTE_BUTTON_HOLD | 28 | #define HAS_REMOTE_BUTTON_HOLD |
32 | 29 | ||
33 | bool button_hold(void); | ||
34 | bool remote_button_hold(void); | ||
35 | void button_init_device(void); | ||
36 | int button_read_device(void); | ||
37 | |||
38 | /* iriver H10 specific button codes */ | 30 | /* iriver H10 specific button codes */ |
39 | 31 | ||
40 | /* Main unit's buttons */ | 32 | /* Main unit's buttons */ |
diff --git a/firmware/target/arm/olympus/mrobe-100/button-target.h b/firmware/target/arm/olympus/mrobe-100/button-target.h index 93d42d62fb..050fc8de1a 100644 --- a/firmware/target/arm/olympus/mrobe-100/button-target.h +++ b/firmware/target/arm/olympus/mrobe-100/button-target.h | |||
@@ -22,17 +22,12 @@ | |||
22 | #ifndef _BUTTON_TARGET_H_ | 22 | #ifndef _BUTTON_TARGET_H_ |
23 | #define _BUTTON_TARGET_H_ | 23 | #define _BUTTON_TARGET_H_ |
24 | 24 | ||
25 | #include <stdbool.h> | ||
26 | #include "config.h" | 25 | #include "config.h" |
27 | 26 | ||
28 | #define MEP_BUTTON_HEADER 0x1a | 27 | #define MEP_BUTTON_HEADER 0x1a |
29 | #define MEP_BUTTON_ID 0x09 | 28 | #define MEP_BUTTON_ID 0x09 |
30 | #define MEP_ABSOLUTE_HEADER 0x0b | 29 | #define MEP_ABSOLUTE_HEADER 0x0b |
31 | 30 | ||
32 | bool button_hold(void); | ||
33 | void button_init_device(void); | ||
34 | int button_read_device(void); | ||
35 | |||
36 | #ifndef BOOTLOADER | 31 | #ifndef BOOTLOADER |
37 | void button_int(void); | 32 | void button_int(void); |
38 | #endif | 33 | #endif |
@@ -60,7 +55,6 @@ void button_int(void); | |||
60 | 55 | ||
61 | #ifdef HAVE_REMOTE_LCD | 56 | #ifdef HAVE_REMOTE_LCD |
62 | void headphones_int(void); | 57 | void headphones_int(void); |
63 | bool remote_button_hold(void); | ||
64 | 58 | ||
65 | /* Remote control's buttons */ | 59 | /* Remote control's buttons */ |
66 | #define BUTTON_RC_PLAY 0x00010000 | 60 | #define BUTTON_RC_PLAY 0x00010000 |
@@ -77,8 +71,6 @@ bool remote_button_hold(void); | |||
77 | 71 | ||
78 | #define HAS_REMOTE_BUTTON_HOLD | 72 | #define HAS_REMOTE_BUTTON_HOLD |
79 | #define RC_POWEROFF_BUTTON BUTTON_RC_PLAY | 73 | #define RC_POWEROFF_BUTTON BUTTON_RC_PLAY |
80 | #else | ||
81 | #define BUTTON_REMOTE 0 | ||
82 | #endif /* HAVE_REMOTE_LCD */ | 74 | #endif /* HAVE_REMOTE_LCD */ |
83 | 75 | ||
84 | #endif /* _BUTTON_TARGET_H_ */ | 76 | #endif /* _BUTTON_TARGET_H_ */ |
diff --git a/firmware/target/arm/pbell/vibe500/button-target.h b/firmware/target/arm/pbell/vibe500/button-target.h index fa29c275c0..93c8da42bd 100644 --- a/firmware/target/arm/pbell/vibe500/button-target.h +++ b/firmware/target/arm/pbell/vibe500/button-target.h | |||
@@ -21,7 +21,6 @@ | |||
21 | #ifndef _BUTTON_TARGET_H_ | 21 | #ifndef _BUTTON_TARGET_H_ |
22 | #define _BUTTON_TARGET_H_ | 22 | #define _BUTTON_TARGET_H_ |
23 | 23 | ||
24 | #include <stdbool.h> | ||
25 | #include "config.h" | 24 | #include "config.h" |
26 | 25 | ||
27 | #define MEP_BUTTON_HEADER 0x19 | 26 | #define MEP_BUTTON_HEADER 0x19 |
@@ -31,10 +30,6 @@ | |||
31 | 30 | ||
32 | #define HAS_BUTTON_HOLD | 31 | #define HAS_BUTTON_HOLD |
33 | 32 | ||
34 | bool button_hold(void); | ||
35 | void button_init_device(void); | ||
36 | int button_read_device(void); | ||
37 | |||
38 | #ifndef BOOTLOADER | 33 | #ifndef BOOTLOADER |
39 | void button_int(void); | 34 | void button_int(void); |
40 | #endif | 35 | #endif |
@@ -57,8 +52,6 @@ void button_int(void); | |||
57 | 52 | ||
58 | #define BUTTON_MAIN 0x00000fff | 53 | #define BUTTON_MAIN 0x00000fff |
59 | 54 | ||
60 | #define BUTTON_REMOTE 0 | ||
61 | |||
62 | #define POWEROFF_BUTTON BUTTON_POWER | 55 | #define POWEROFF_BUTTON BUTTON_POWER |
63 | #define POWEROFF_COUNT 10 | 56 | #define POWEROFF_COUNT 10 |
64 | 57 | ||
diff --git a/firmware/target/arm/philips/hdd1630/button-target.h b/firmware/target/arm/philips/hdd1630/button-target.h index b7fc21aca2..28364c6b53 100644 --- a/firmware/target/arm/philips/hdd1630/button-target.h +++ b/firmware/target/arm/philips/hdd1630/button-target.h | |||
@@ -22,7 +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 | #include <stdbool.h> | ||
26 | #include "config.h" | 25 | #include "config.h" |
27 | 26 | ||
28 | #define MEP_BUTTON_HEADER 0x19 | 27 | #define MEP_BUTTON_HEADER 0x19 |
@@ -31,10 +30,6 @@ | |||
31 | 30 | ||
32 | #define HAS_BUTTON_HOLD | 31 | #define HAS_BUTTON_HOLD |
33 | 32 | ||
34 | bool button_hold(void); | ||
35 | void button_init_device(void); | ||
36 | int button_read_device(void); | ||
37 | |||
38 | #ifndef BOOTLOADER | 33 | #ifndef BOOTLOADER |
39 | void button_int(void); | 34 | void button_int(void); |
40 | #endif | 35 | #endif |
@@ -54,9 +49,6 @@ void button_int(void); | |||
54 | 49 | ||
55 | #define BUTTON_MAIN 0x00000fff | 50 | #define BUTTON_MAIN 0x00000fff |
56 | 51 | ||
57 | /* No Remote control */ | ||
58 | #define BUTTON_REMOTE 0 | ||
59 | |||
60 | #define POWEROFF_BUTTON BUTTON_POWER | 52 | #define POWEROFF_BUTTON BUTTON_POWER |
61 | #define POWEROFF_COUNT 10 | 53 | #define POWEROFF_COUNT 10 |
62 | 54 | ||
diff --git a/firmware/target/arm/philips/hdd6330/button-target.h b/firmware/target/arm/philips/hdd6330/button-target.h index 8d4ed5ef5f..f8eaa82b22 100644 --- a/firmware/target/arm/philips/hdd6330/button-target.h +++ b/firmware/target/arm/philips/hdd6330/button-target.h | |||
@@ -22,7 +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 | #include <stdbool.h> | ||
26 | #include "config.h" | 25 | #include "config.h" |
27 | 26 | ||
28 | #define MEP_BUTTON_HEADER 0x19 | 27 | #define MEP_BUTTON_HEADER 0x19 |
@@ -33,10 +32,6 @@ | |||
33 | 32 | ||
34 | #define HAS_BUTTON_HOLD | 33 | #define HAS_BUTTON_HOLD |
35 | 34 | ||
36 | bool button_hold(void); | ||
37 | void button_init_device(void); | ||
38 | int button_read_device(void); | ||
39 | |||
40 | #ifndef BOOTLOADER | 35 | #ifndef BOOTLOADER |
41 | void button_int(void); | 36 | void button_int(void); |
42 | #endif | 37 | #endif |
@@ -57,9 +52,6 @@ void button_int(void); | |||
57 | #define BUTTON_TAP 0x00001000 | 52 | #define BUTTON_TAP 0x00001000 |
58 | #define BUTTON_MAIN 0x00001fff | 53 | #define BUTTON_MAIN 0x00001fff |
59 | 54 | ||
60 | /* No Remote control */ | ||
61 | #define BUTTON_REMOTE 0 | ||
62 | |||
63 | #define POWEROFF_BUTTON BUTTON_POWER | 55 | #define POWEROFF_BUTTON BUTTON_POWER |
64 | #define POWEROFF_COUNT 10 | 56 | #define POWEROFF_COUNT 10 |
65 | 57 | ||
diff --git a/firmware/target/arm/philips/sa9200/button-target.h b/firmware/target/arm/philips/sa9200/button-target.h index 7d060157c6..1c86a75ce2 100644 --- a/firmware/target/arm/philips/sa9200/button-target.h +++ b/firmware/target/arm/philips/sa9200/button-target.h | |||
@@ -22,18 +22,12 @@ | |||
22 | #ifndef _BUTTON_TARGET_H_ | 22 | #ifndef _BUTTON_TARGET_H_ |
23 | #define _BUTTON_TARGET_H_ | 23 | #define _BUTTON_TARGET_H_ |
24 | 24 | ||
25 | #include <stdbool.h> | ||
26 | #include "config.h" | ||
27 | |||
28 | #define MEP_BUTTON_HEADER 0x1a | 25 | #define MEP_BUTTON_HEADER 0x1a |
29 | #define MEP_BUTTON_ID 0x09 | 26 | #define MEP_BUTTON_ID 0x09 |
30 | #define MEP_ABSOLUTE_HEADER 0x0b | 27 | #define MEP_ABSOLUTE_HEADER 0x0b |
31 | 28 | ||
32 | #define HAS_BUTTON_HOLD | 29 | #define HAS_BUTTON_HOLD |
33 | 30 | ||
34 | bool button_hold(void); | ||
35 | void button_init_device(void); | ||
36 | int button_read_device(void); | ||
37 | void button_int(void); | 31 | void button_int(void); |
38 | 32 | ||
39 | /* Main unit's buttons */ | 33 | /* Main unit's buttons */ |
@@ -51,9 +45,6 @@ void button_int(void); | |||
51 | 45 | ||
52 | #define BUTTON_MAIN 0x00000fff | 46 | #define BUTTON_MAIN 0x00000fff |
53 | 47 | ||
54 | /* No Remote control */ | ||
55 | #define BUTTON_REMOTE 0 | ||
56 | |||
57 | #define POWEROFF_BUTTON BUTTON_POWER | 48 | #define POWEROFF_BUTTON BUTTON_POWER |
58 | #define POWEROFF_COUNT 10 | 49 | #define POWEROFF_COUNT 10 |
59 | 50 | ||
diff --git a/firmware/target/arm/pnx0101/iriver-ifp7xx/button-target.h b/firmware/target/arm/pnx0101/iriver-ifp7xx/button-target.h index 0fabc65396..6932b8956f 100644 --- a/firmware/target/arm/pnx0101/iriver-ifp7xx/button-target.h +++ b/firmware/target/arm/pnx0101/iriver-ifp7xx/button-target.h | |||
@@ -24,15 +24,8 @@ | |||
24 | #ifndef _BUTTON_TARGET_H_ | 24 | #ifndef _BUTTON_TARGET_H_ |
25 | #define _BUTTON_TARGET_H_ | 25 | #define _BUTTON_TARGET_H_ |
26 | 26 | ||
27 | #include <stdbool.h> | ||
28 | #include "config.h" | ||
29 | |||
30 | #define HAS_BUTTON_HOLD | 27 | #define HAS_BUTTON_HOLD |
31 | 28 | ||
32 | bool button_hold(void); | ||
33 | void button_init_device(void); | ||
34 | int button_read_device(void); | ||
35 | |||
36 | /* iriver IFP7XX specific button codes */ | 29 | /* iriver IFP7XX specific button codes */ |
37 | 30 | ||
38 | #define BUTTON_PLAY 0x00000001 | 31 | #define BUTTON_PLAY 0x00000001 |
@@ -50,8 +43,6 @@ int button_read_device(void); | |||
50 | |BUTTON_LEFT|BUTTON_RIGHT|BUTTON_UP|BUTTON_DOWN\ | 43 | |BUTTON_LEFT|BUTTON_RIGHT|BUTTON_UP|BUTTON_DOWN\ |
51 | |BUTTON_MODE|BUTTON_EQ) | 44 | |BUTTON_MODE|BUTTON_EQ) |
52 | 45 | ||
53 | #define BUTTON_REMOTE 0 | ||
54 | |||
55 | #define POWEROFF_BUTTON BUTTON_PLAY | 46 | #define POWEROFF_BUTTON BUTTON_PLAY |
56 | #define POWEROFF_COUNT 40 | 47 | #define POWEROFF_COUNT 40 |
57 | 48 | ||
diff --git a/firmware/target/arm/rk27xx/hm60x/button-target.h b/firmware/target/arm/rk27xx/hm60x/button-target.h index 0209e0637d..9165a99f75 100644 --- a/firmware/target/arm/rk27xx/hm60x/button-target.h +++ b/firmware/target/arm/rk27xx/hm60x/button-target.h | |||
@@ -21,23 +21,12 @@ | |||
21 | #ifndef _BUTTON_TARGET_H_ | 21 | #ifndef _BUTTON_TARGET_H_ |
22 | #define _BUTTON_TARGET_H_ | 22 | #define _BUTTON_TARGET_H_ |
23 | 23 | ||
24 | #include <stdbool.h> | ||
25 | #include "config.h" | ||
26 | |||
27 | void button_init_device(void); | ||
28 | int button_read_device(void); | ||
29 | |||
30 | |||
31 | #define BUTTON_UP 0x00000001 | 24 | #define BUTTON_UP 0x00000001 |
32 | #define BUTTON_DOWN 0x00000004 | 25 | #define BUTTON_DOWN 0x00000004 |
33 | #define BUTTON_LEFT 0x00000008 | 26 | #define BUTTON_LEFT 0x00000008 |
34 | #define BUTTON_RIGHT 0x00000010 | 27 | #define BUTTON_RIGHT 0x00000010 |
35 | #define BUTTON_PLAY 0x00000020 | 28 | #define BUTTON_PLAY 0x00000020 |
36 | 29 | ||
37 | |||
38 | #define BUTTON_REMOTE 0 | ||
39 | |||
40 | |||
41 | #define POWEROFF_BUTTON 0x02 | 30 | #define POWEROFF_BUTTON 0x02 |
42 | #define POWEROFF_COUNT 30 | 31 | #define POWEROFF_COUNT 30 |
43 | 32 | ||
diff --git a/firmware/target/arm/rk27xx/hm801/button-target.h b/firmware/target/arm/rk27xx/hm801/button-target.h index 4af054b07c..4449266217 100644 --- a/firmware/target/arm/rk27xx/hm801/button-target.h +++ b/firmware/target/arm/rk27xx/hm801/button-target.h | |||
@@ -21,13 +21,6 @@ | |||
21 | #ifndef _BUTTON_TARGET_H_ | 21 | #ifndef _BUTTON_TARGET_H_ |
22 | #define _BUTTON_TARGET_H_ | 22 | #define _BUTTON_TARGET_H_ |
23 | 23 | ||
24 | #include <stdbool.h> | ||
25 | #include "config.h" | ||
26 | |||
27 | void button_init_device(void); | ||
28 | int button_read_device(void); | ||
29 | |||
30 | |||
31 | #define BUTTON_UP 0x00000001 | 24 | #define BUTTON_UP 0x00000001 |
32 | #define BUTTON_DOWN 0x00000004 | 25 | #define BUTTON_DOWN 0x00000004 |
33 | #define BUTTON_LEFT 0x00000008 | 26 | #define BUTTON_LEFT 0x00000008 |
@@ -37,10 +30,6 @@ int button_read_device(void); | |||
37 | #define BUTTON_PREV 0x00000080 | 30 | #define BUTTON_PREV 0x00000080 |
38 | #define BUTTON_PLAY 0x00000100 | 31 | #define BUTTON_PLAY 0x00000100 |
39 | 32 | ||
40 | |||
41 | #define BUTTON_REMOTE 0 | ||
42 | |||
43 | |||
44 | #define POWEROFF_BUTTON 0x02 | 33 | #define POWEROFF_BUTTON 0x02 |
45 | #define POWEROFF_COUNT 30 | 34 | #define POWEROFF_COUNT 30 |
46 | 35 | ||
diff --git a/firmware/target/arm/rk27xx/rk27generic/button-target.h b/firmware/target/arm/rk27xx/rk27generic/button-target.h index cc14dfc32b..55169b06f6 100644 --- a/firmware/target/arm/rk27xx/rk27generic/button-target.h +++ b/firmware/target/arm/rk27xx/rk27generic/button-target.h | |||
@@ -21,12 +21,6 @@ | |||
21 | #ifndef _BUTTON_TARGET_H_ | 21 | #ifndef _BUTTON_TARGET_H_ |
22 | #define _BUTTON_TARGET_H_ | 22 | #define _BUTTON_TARGET_H_ |
23 | 23 | ||
24 | #include <stdbool.h> | ||
25 | #include "config.h" | ||
26 | |||
27 | void button_init_device(void); | ||
28 | int button_read_device(void); | ||
29 | |||
30 | /* Main unit's buttons */ | 24 | /* Main unit's buttons */ |
31 | /* values assigned corespond to GPIOs numbers */ | 25 | /* values assigned corespond to GPIOs numbers */ |
32 | #define BUTTON_PLAY 0x00000002 | 26 | #define BUTTON_PLAY 0x00000002 |
@@ -40,8 +34,6 @@ int button_read_device(void); | |||
40 | #define BUTTON_RIGHT BUTTON_FF | 34 | #define BUTTON_RIGHT BUTTON_FF |
41 | #define BUTTON_ON BUTTON_PLAY | 35 | #define BUTTON_ON BUTTON_PLAY |
42 | 36 | ||
43 | #define BUTTON_REMOTE 0 | ||
44 | |||
45 | #define BUTTON_MAIN (BUTTON_PLAY|BUTTON_REW|BUTTON_FF|\ | 37 | #define BUTTON_MAIN (BUTTON_PLAY|BUTTON_REW|BUTTON_FF|\ |
46 | BUTTON_VOL|BUTTON_M) | 38 | BUTTON_VOL|BUTTON_M) |
47 | 39 | ||
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/button-target.h b/firmware/target/arm/s3c2440/gigabeat-fx/button-target.h index e43ad27764..6852e733ef 100644 --- a/firmware/target/arm/s3c2440/gigabeat-fx/button-target.h +++ b/firmware/target/arm/s3c2440/gigabeat-fx/button-target.h | |||
@@ -21,14 +21,8 @@ | |||
21 | #ifndef _BUTTON_TARGET_H_ | 21 | #ifndef _BUTTON_TARGET_H_ |
22 | #define _BUTTON_TARGET_H_ | 22 | #define _BUTTON_TARGET_H_ |
23 | 23 | ||
24 | #include <stdbool.h> | ||
25 | #include "config.h" | ||
26 | |||
27 | #define HAS_BUTTON_HOLD | 24 | #define HAS_BUTTON_HOLD |
28 | 25 | ||
29 | bool button_hold(void); | ||
30 | void button_init_device(void); | ||
31 | int button_read_device(void); | ||
32 | void touchpad_set_sensitivity(int level); | 26 | void touchpad_set_sensitivity(int level); |
33 | 27 | ||
34 | /* Toshiba Gigabeat specific button codes */ | 28 | /* Toshiba Gigabeat specific button codes */ |
diff --git a/firmware/target/arm/s3c2440/mini2440/button-target.h b/firmware/target/arm/s3c2440/mini2440/button-target.h index 66419b464a..685af7270f 100644 --- a/firmware/target/arm/s3c2440/mini2440/button-target.h +++ b/firmware/target/arm/s3c2440/mini2440/button-target.h | |||
@@ -21,13 +21,6 @@ | |||
21 | #ifndef _BUTTON_TARGET_H_ | 21 | #ifndef _BUTTON_TARGET_H_ |
22 | #define _BUTTON_TARGET_H_ | 22 | #define _BUTTON_TARGET_H_ |
23 | 23 | ||
24 | #include <stdbool.h> | ||
25 | #include "config.h" | ||
26 | |||
27 | |||
28 | bool button_hold(void); | ||
29 | void button_init_device(void); | ||
30 | int button_read_device(int*); | ||
31 | void touchpad_set_sensitivity(int level); | 24 | void touchpad_set_sensitivity(int level); |
32 | 25 | ||
33 | /* Mini2440 specific button codes */ | 26 | /* Mini2440 specific button codes */ |
@@ -76,8 +69,6 @@ void touchpad_set_sensitivity(int level); | |||
76 | BUTTON_UP |BUTTON_DOWN|BUTTON_SELECT | \ | 69 | BUTTON_UP |BUTTON_DOWN|BUTTON_SELECT | \ |
77 | BUTTON_A |BUTTON_POWER ) | 70 | BUTTON_A |BUTTON_POWER ) |
78 | 71 | ||
79 | #define BUTTON_REMOTE 0 | ||
80 | |||
81 | #define POWEROFF_BUTTON BUTTON_MENU | 72 | #define POWEROFF_BUTTON BUTTON_MENU |
82 | #define POWEROFF_COUNT 10 | 73 | #define POWEROFF_COUNT 10 |
83 | 74 | ||
diff --git a/firmware/target/arm/s5l8700/ipodnano2g/button-target.h b/firmware/target/arm/s5l8700/ipodnano2g/button-target.h index 67bdc72955..82f600d302 100644 --- a/firmware/target/arm/s5l8700/ipodnano2g/button-target.h +++ b/firmware/target/arm/s5l8700/ipodnano2g/button-target.h | |||
@@ -21,15 +21,10 @@ | |||
21 | #ifndef _BUTTON_TARGET_H_ | 21 | #ifndef _BUTTON_TARGET_H_ |
22 | #define _BUTTON_TARGET_H_ | 22 | #define _BUTTON_TARGET_H_ |
23 | 23 | ||
24 | #include <stdbool.h> | ||
25 | #include "config.h" | 24 | #include "config.h" |
26 | 25 | ||
27 | #define HAS_BUTTON_HOLD | 26 | #define HAS_BUTTON_HOLD |
28 | 27 | ||
29 | bool button_hold(void); | ||
30 | void button_init_device(void); | ||
31 | int button_read_device(void); | ||
32 | |||
33 | void ipod_mini_button_int(void); | 28 | void ipod_mini_button_int(void); |
34 | void ipod_3g_button_int(void); | 29 | void ipod_3g_button_int(void); |
35 | void ipod_4g_button_int(void); | 30 | void ipod_4g_button_int(void); |
@@ -63,8 +58,6 @@ void ipod_4g_button_int(void); | |||
63 | #define BUTTON_REMOTE (BUTTON_RC_PLAY|BUTTON_RC_STOP\ | 58 | #define BUTTON_REMOTE (BUTTON_RC_PLAY|BUTTON_RC_STOP\ |
64 | |BUTTON_RC_LEFT|BUTTON_RC_RIGHT\ | 59 | |BUTTON_RC_LEFT|BUTTON_RC_RIGHT\ |
65 | |BUTTON_RC_VOL_UP|BUTTON_RC_VOL_DOWN) | 60 | |BUTTON_RC_VOL_UP|BUTTON_RC_VOL_DOWN) |
66 | #else | ||
67 | #define BUTTON_REMOTE 0 | ||
68 | #endif | 61 | #endif |
69 | 62 | ||
70 | /* This is for later | 63 | /* This is for later |
diff --git a/firmware/target/arm/s5l8700/meizu-m3/button-target.h b/firmware/target/arm/s5l8700/meizu-m3/button-target.h index 8aaca17a54..93f102c410 100644 --- a/firmware/target/arm/s5l8700/meizu-m3/button-target.h +++ b/firmware/target/arm/s5l8700/meizu-m3/button-target.h | |||
@@ -21,14 +21,8 @@ | |||
21 | #ifndef _BUTTON_TARGET_H_ | 21 | #ifndef _BUTTON_TARGET_H_ |
22 | #define _BUTTON_TARGET_H_ | 22 | #define _BUTTON_TARGET_H_ |
23 | 23 | ||
24 | #include <stdbool.h> | ||
25 | |||
26 | #define HAS_BUTTON_HOLD | 24 | #define HAS_BUTTON_HOLD |
27 | 25 | ||
28 | bool button_hold(void); | ||
29 | void button_init_device(void); | ||
30 | int button_read_device(void); | ||
31 | |||
32 | /* Meizu M3 specific button codes */ | 26 | /* Meizu M3 specific button codes */ |
33 | #define BUTTON_PREVNEXT 0x00000001 | 27 | #define BUTTON_PREVNEXT 0x00000001 |
34 | #define BUTTON_MENU 0x00000002 | 28 | #define BUTTON_MENU 0x00000002 |
@@ -40,8 +34,6 @@ int button_read_device(void); | |||
40 | 34 | ||
41 | #define BUTTON_MAIN (BUTTON_PREVNEXT|BUTTON_MENU|BUTTON_PLAY) | 35 | #define BUTTON_MAIN (BUTTON_PREVNEXT|BUTTON_MENU|BUTTON_PLAY) |
42 | 36 | ||
43 | #define BUTTON_REMOTE 0 | ||
44 | |||
45 | #define POWEROFF_BUTTON BUTTON_PLAY | 37 | #define POWEROFF_BUTTON BUTTON_PLAY |
46 | #define POWEROFF_COUNT 10 | 38 | #define POWEROFF_COUNT 10 |
47 | 39 | ||
diff --git a/firmware/target/arm/s5l8700/meizu-m6sl/button-target.h b/firmware/target/arm/s5l8700/meizu-m6sl/button-target.h index 7fab9c4d64..022a0b61f1 100644 --- a/firmware/target/arm/s5l8700/meizu-m6sl/button-target.h +++ b/firmware/target/arm/s5l8700/meizu-m6sl/button-target.h | |||
@@ -21,15 +21,8 @@ | |||
21 | #ifndef _BUTTON_TARGET_H_ | 21 | #ifndef _BUTTON_TARGET_H_ |
22 | #define _BUTTON_TARGET_H_ | 22 | #define _BUTTON_TARGET_H_ |
23 | 23 | ||
24 | #include <stdbool.h> | ||
25 | #include "config.h" | ||
26 | |||
27 | #define HAS_BUTTON_HOLD | 24 | #define HAS_BUTTON_HOLD |
28 | 25 | ||
29 | bool button_hold(void); | ||
30 | void button_init_device(void); | ||
31 | int button_read_device(void); | ||
32 | |||
33 | /* Toshiba Gigabeat specific button codes */ | 26 | /* Toshiba Gigabeat specific button codes */ |
34 | 27 | ||
35 | #define BUTTON_LEFT 0x00000001 | 28 | #define BUTTON_LEFT 0x00000001 |
@@ -46,8 +39,6 @@ int button_read_device(void); | |||
46 | #define BUTTON_MAIN (BUTTON_MENU|BUTTON_LEFT|BUTTON_RIGHT\ | 39 | #define BUTTON_MAIN (BUTTON_MENU|BUTTON_LEFT|BUTTON_RIGHT\ |
47 | |BUTTON_UP|BUTTON_DOWN|BUTTON_SELECT|BUTTON_PLAY) | 40 | |BUTTON_UP|BUTTON_DOWN|BUTTON_SELECT|BUTTON_PLAY) |
48 | 41 | ||
49 | #define BUTTON_REMOTE 0 | ||
50 | |||
51 | #define POWEROFF_BUTTON BUTTON_PLAY | 42 | #define POWEROFF_BUTTON BUTTON_PLAY |
52 | #define POWEROFF_COUNT 10 | 43 | #define POWEROFF_COUNT 10 |
53 | 44 | ||
diff --git a/firmware/target/arm/s5l8700/meizu-m6sp/button-target.h b/firmware/target/arm/s5l8700/meizu-m6sp/button-target.h index db6445fe30..58d19d177c 100644 --- a/firmware/target/arm/s5l8700/meizu-m6sp/button-target.h +++ b/firmware/target/arm/s5l8700/meizu-m6sp/button-target.h | |||
@@ -21,15 +21,8 @@ | |||
21 | #ifndef _BUTTON_TARGET_H_ | 21 | #ifndef _BUTTON_TARGET_H_ |
22 | #define _BUTTON_TARGET_H_ | 22 | #define _BUTTON_TARGET_H_ |
23 | 23 | ||
24 | #include <stdbool.h> | ||
25 | #include "config.h" | ||
26 | |||
27 | #define HAS_BUTTON_HOLD | 24 | #define HAS_BUTTON_HOLD |
28 | 25 | ||
29 | bool button_hold(void); | ||
30 | void button_init_device(void); | ||
31 | int button_read_device(void); | ||
32 | |||
33 | /* Meizu M6 specific button codes */ | 26 | /* Meizu M6 specific button codes */ |
34 | 27 | ||
35 | #define BUTTON_LEFT 0x00000001 | 28 | #define BUTTON_LEFT 0x00000001 |
@@ -43,8 +36,6 @@ int button_read_device(void); | |||
43 | #define BUTTON_MAIN (BUTTON_LEFT|BUTTON_RIGHT|BUTTON_PLAY|BUTTON_MENU\ | 36 | #define BUTTON_MAIN (BUTTON_LEFT|BUTTON_RIGHT|BUTTON_PLAY|BUTTON_MENU\ |
44 | |BUTTON_SELECT|BUTTON_ENTER) | 37 | |BUTTON_SELECT|BUTTON_ENTER) |
45 | 38 | ||
46 | #define BUTTON_REMOTE 0 | ||
47 | |||
48 | #define POWEROFF_BUTTON BUTTON_PLAY | 39 | #define POWEROFF_BUTTON BUTTON_PLAY |
49 | #define POWEROFF_COUNT 10 | 40 | #define POWEROFF_COUNT 10 |
50 | 41 | ||
diff --git a/firmware/target/arm/s5l8700/yps3/button-target.h b/firmware/target/arm/s5l8700/yps3/button-target.h index 86e8488857..4b3ffa4a76 100644 --- a/firmware/target/arm/s5l8700/yps3/button-target.h +++ b/firmware/target/arm/s5l8700/yps3/button-target.h | |||
@@ -21,14 +21,8 @@ | |||
21 | #ifndef _BUTTON_TARGET_H_ | 21 | #ifndef _BUTTON_TARGET_H_ |
22 | #define _BUTTON_TARGET_H_ | 22 | #define _BUTTON_TARGET_H_ |
23 | 23 | ||
24 | #include <stdbool.h> | ||
25 | |||
26 | #define HAS_BUTTON_HOLD | 24 | #define HAS_BUTTON_HOLD |
27 | 25 | ||
28 | bool button_hold(void); | ||
29 | void button_init_device(void); | ||
30 | int button_read_device(void); | ||
31 | |||
32 | #define BUTTON_BACK 0x00000001 | 26 | #define BUTTON_BACK 0x00000001 |
33 | #define BUTTON_MENU 0x00000002 | 27 | #define BUTTON_MENU 0x00000002 |
34 | #define BUTTON_UP 0x00000004 | 28 | #define BUTTON_UP 0x00000004 |
@@ -41,10 +35,7 @@ int button_read_device(void); | |||
41 | #define BUTTON_MAIN (BUTTON_BACK|BUTTON_MENU|BUTTON_UP|BUTTON_DOWN|BUTTON_LEFT|\ | 35 | #define BUTTON_MAIN (BUTTON_BACK|BUTTON_MENU|BUTTON_UP|BUTTON_DOWN|BUTTON_LEFT|\ |
42 | BUTTON_RIGHT|BUTTON_SELECT) | 36 | BUTTON_RIGHT|BUTTON_SELECT) |
43 | 37 | ||
44 | #define BUTTON_REMOTE 0 | ||
45 | |||
46 | #define POWEROFF_BUTTON BUTTON_POWER | 38 | #define POWEROFF_BUTTON BUTTON_POWER |
47 | #define POWEROFF_COUNT 10 | 39 | #define POWEROFF_COUNT 10 |
48 | 40 | ||
49 | #endif /* _BUTTON_TARGET_H_ */ | 41 | #endif /* _BUTTON_TARGET_H_ */ |
50 | |||
diff --git a/firmware/target/arm/s5l8702/ipod6g/button-target.h b/firmware/target/arm/s5l8702/ipod6g/button-target.h index 0bd89d1d2a..ed17fc4baa 100644 --- a/firmware/target/arm/s5l8702/ipod6g/button-target.h +++ b/firmware/target/arm/s5l8702/ipod6g/button-target.h | |||
@@ -21,15 +21,10 @@ | |||
21 | #ifndef _BUTTON_TARGET_H_ | 21 | #ifndef _BUTTON_TARGET_H_ |
22 | #define _BUTTON_TARGET_H_ | 22 | #define _BUTTON_TARGET_H_ |
23 | 23 | ||
24 | #include <stdbool.h> | ||
25 | #include "config.h" | 24 | #include "config.h" |
26 | 25 | ||
27 | #define HAS_BUTTON_HOLD | 26 | #define HAS_BUTTON_HOLD |
28 | 27 | ||
29 | bool button_hold(void); | ||
30 | void button_init_device(void); | ||
31 | int button_read_device(void); | ||
32 | |||
33 | void ipod_mini_button_int(void); | 28 | void ipod_mini_button_int(void); |
34 | void ipod_3g_button_int(void); | 29 | void ipod_3g_button_int(void); |
35 | void ipod_4g_button_int(void); | 30 | void ipod_4g_button_int(void); |
@@ -63,8 +58,6 @@ void ipod_4g_button_int(void); | |||
63 | #define BUTTON_REMOTE (BUTTON_RC_PLAY|BUTTON_RC_STOP\ | 58 | #define BUTTON_REMOTE (BUTTON_RC_PLAY|BUTTON_RC_STOP\ |
64 | |BUTTON_RC_LEFT|BUTTON_RC_RIGHT\ | 59 | |BUTTON_RC_LEFT|BUTTON_RC_RIGHT\ |
65 | |BUTTON_RC_VOL_UP|BUTTON_RC_VOL_DOWN) | 60 | |BUTTON_RC_VOL_UP|BUTTON_RC_VOL_DOWN) |
66 | #else | ||
67 | #define BUTTON_REMOTE 0 | ||
68 | #endif | 61 | #endif |
69 | 62 | ||
70 | /* This is for later | 63 | /* This is for later |
diff --git a/firmware/target/arm/samsung/button-target.h b/firmware/target/arm/samsung/button-target.h index 035010a9c8..61561dc86d 100644 --- a/firmware/target/arm/samsung/button-target.h +++ b/firmware/target/arm/samsung/button-target.h | |||
@@ -22,15 +22,8 @@ | |||
22 | #ifndef _BUTTON_TARGET_H_ | 22 | #ifndef _BUTTON_TARGET_H_ |
23 | #define _BUTTON_TARGET_H_ | 23 | #define _BUTTON_TARGET_H_ |
24 | 24 | ||
25 | #include <stdbool.h> | ||
26 | #include "config.h" | ||
27 | |||
28 | #define HAS_BUTTON_HOLD | 25 | #define HAS_BUTTON_HOLD |
29 | 26 | ||
30 | bool button_hold(void); | ||
31 | void button_init_device(void); | ||
32 | int button_read_device(void); | ||
33 | |||
34 | /* Button codes for Samsung YH-820, 920, 925 */ | 27 | /* Button codes for Samsung YH-820, 920, 925 */ |
35 | 28 | ||
36 | /* Main unit's buttons */ | 29 | /* Main unit's buttons */ |
@@ -46,9 +39,6 @@ int button_read_device(void); | |||
46 | 39 | ||
47 | #define BUTTON_MAIN 0x000000ff | 40 | #define BUTTON_MAIN 0x000000ff |
48 | 41 | ||
49 | /* No Remote control */ | ||
50 | #define BUTTON_REMOTE 0 | ||
51 | |||
52 | #define POWEROFF_BUTTON BUTTON_PLAY | 42 | #define POWEROFF_BUTTON BUTTON_PLAY |
53 | #define POWEROFF_COUNT 15 | 43 | #define POWEROFF_COUNT 15 |
54 | 44 | ||
diff --git a/firmware/target/arm/sandisk/sansa-c200/button-target.h b/firmware/target/arm/sandisk/sansa-c200/button-target.h index cc668c4015..1b352975e5 100644 --- a/firmware/target/arm/sandisk/sansa-c200/button-target.h +++ b/firmware/target/arm/sandisk/sansa-c200/button-target.h | |||
@@ -22,15 +22,8 @@ | |||
22 | #ifndef _BUTTON_TARGET_H_ | 22 | #ifndef _BUTTON_TARGET_H_ |
23 | #define _BUTTON_TARGET_H_ | 23 | #define _BUTTON_TARGET_H_ |
24 | 24 | ||
25 | #include <stdbool.h> | ||
26 | #include "config.h" | ||
27 | |||
28 | #define HAS_BUTTON_HOLD | 25 | #define HAS_BUTTON_HOLD |
29 | 26 | ||
30 | bool button_hold(void); | ||
31 | void button_init_device(void); | ||
32 | int button_read_device(void); | ||
33 | |||
34 | /* Sandisk Sansa c200 button codes */ | 27 | /* Sandisk Sansa c200 button codes */ |
35 | 28 | ||
36 | /* Main unit's buttons */ | 29 | /* Main unit's buttons */ |
@@ -46,9 +39,6 @@ int button_read_device(void); | |||
46 | 39 | ||
47 | #define BUTTON_MAIN 0x00000fff | 40 | #define BUTTON_MAIN 0x00000fff |
48 | 41 | ||
49 | /* No Remote control */ | ||
50 | #define BUTTON_REMOTE 0 | ||
51 | |||
52 | #define POWEROFF_BUTTON BUTTON_POWER | 42 | #define POWEROFF_BUTTON BUTTON_POWER |
53 | #define POWEROFF_COUNT 10 | 43 | #define POWEROFF_COUNT 10 |
54 | 44 | ||
diff --git a/firmware/target/arm/sandisk/sansa-e200/button-target.h b/firmware/target/arm/sandisk/sansa-e200/button-target.h index b392851d50..162254746b 100644 --- a/firmware/target/arm/sandisk/sansa-e200/button-target.h +++ b/firmware/target/arm/sandisk/sansa-e200/button-target.h | |||
@@ -22,14 +22,8 @@ | |||
22 | #ifndef _BUTTON_TARGET_H_ | 22 | #ifndef _BUTTON_TARGET_H_ |
23 | #define _BUTTON_TARGET_H_ | 23 | #define _BUTTON_TARGET_H_ |
24 | 24 | ||
25 | #include <stdbool.h> | ||
26 | #include "config.h" | ||
27 | |||
28 | #define HAS_BUTTON_HOLD | 25 | #define HAS_BUTTON_HOLD |
29 | 26 | ||
30 | bool button_hold(void); | ||
31 | void button_init_device(void); | ||
32 | int button_read_device(void); | ||
33 | void clickwheel_int(void); | 27 | void clickwheel_int(void); |
34 | void button_int(void); | 28 | void button_int(void); |
35 | 29 | ||
@@ -49,9 +43,6 @@ void button_int(void); | |||
49 | 43 | ||
50 | #define BUTTON_MAIN 0x00000fff | 44 | #define BUTTON_MAIN 0x00000fff |
51 | 45 | ||
52 | /* No Remote control */ | ||
53 | #define BUTTON_REMOTE 0 | ||
54 | |||
55 | #define POWEROFF_BUTTON BUTTON_POWER | 46 | #define POWEROFF_BUTTON BUTTON_POWER |
56 | #define POWEROFF_COUNT 10 | 47 | #define POWEROFF_COUNT 10 |
57 | 48 | ||
diff --git a/firmware/target/arm/sandisk/sansa-view/button-target.h b/firmware/target/arm/sandisk/sansa-view/button-target.h index 18931da700..6b49f9053b 100644 --- a/firmware/target/arm/sandisk/sansa-view/button-target.h +++ b/firmware/target/arm/sandisk/sansa-view/button-target.h | |||
@@ -22,14 +22,8 @@ | |||
22 | #ifndef _BUTTON_TARGET_H_ | 22 | #ifndef _BUTTON_TARGET_H_ |
23 | #define _BUTTON_TARGET_H_ | 23 | #define _BUTTON_TARGET_H_ |
24 | 24 | ||
25 | #include <stdbool.h> | ||
26 | #include "config.h" | ||
27 | |||
28 | #define HAS_BUTTON_HOLD | 25 | #define HAS_BUTTON_HOLD |
29 | 26 | ||
30 | void button_init_device(void); | ||
31 | bool button_hold(void); | ||
32 | int button_read_device(void); | ||
33 | /* Sandisk Sansa View button codes */ | 27 | /* Sandisk Sansa View button codes */ |
34 | 28 | ||
35 | /* Main unit's buttons */ | 29 | /* Main unit's buttons */ |
@@ -53,9 +47,6 @@ int button_read_device(void); | |||
53 | |BUTTON_SCROLL_BACK|BUTTON_SCROLL_FWD \ | 47 | |BUTTON_SCROLL_BACK|BUTTON_SCROLL_FWD \ |
54 | |BUTTON_HOLD) | 48 | |BUTTON_HOLD) |
55 | 49 | ||
56 | /* No Remote control */ | ||
57 | #define BUTTON_REMOTE 0 | ||
58 | |||
59 | #define POWEROFF_BUTTON BUTTON_POWER | 50 | #define POWEROFF_BUTTON BUTTON_POWER |
60 | #define POWEROFF_COUNT 10 | 51 | #define POWEROFF_COUNT 10 |
61 | 52 | ||
diff --git a/firmware/target/arm/tatung/tpj1022/button-target.h b/firmware/target/arm/tatung/tpj1022/button-target.h index 979cf88936..1143c1b1da 100644 --- a/firmware/target/arm/tatung/tpj1022/button-target.h +++ b/firmware/target/arm/tatung/tpj1022/button-target.h | |||
@@ -24,11 +24,6 @@ | |||
24 | 24 | ||
25 | #define HAS_BUTTON_HOLD | 25 | #define HAS_BUTTON_HOLD |
26 | 26 | ||
27 | #define button_init_device() | ||
28 | |||
29 | bool button_hold(void); | ||
30 | int button_read_device(void); | ||
31 | |||
32 | /* Main unit's buttons */ | 27 | /* Main unit's buttons */ |
33 | 28 | ||
34 | #define BUTTON_VOL_DOWN 0x00000001 | 29 | #define BUTTON_VOL_DOWN 0x00000001 |
@@ -50,9 +45,6 @@ int button_read_device(void); | |||
50 | 45 | ||
51 | #define BUTTON_MAIN 0x00000FFF | 46 | #define BUTTON_MAIN 0x00000FFF |
52 | 47 | ||
53 | /* No Remote control */ | ||
54 | #define BUTTON_REMOTE 0 | ||
55 | |||
56 | #define POWEROFF_BUTTON BUTTON_POWER | 48 | #define POWEROFF_BUTTON BUTTON_POWER |
57 | #define POWEROFF_COUNT 10 | 49 | #define POWEROFF_COUNT 10 |
58 | 50 | ||
diff --git a/firmware/target/arm/tcc77x/c100/button-target.h b/firmware/target/arm/tcc77x/c100/button-target.h index 73c04b6ed6..0e8b7e8f1c 100644 --- a/firmware/target/arm/tcc77x/c100/button-target.h +++ b/firmware/target/arm/tcc77x/c100/button-target.h | |||
@@ -22,15 +22,8 @@ | |||
22 | #ifndef _BUTTON_TARGET_H_ | 22 | #ifndef _BUTTON_TARGET_H_ |
23 | #define _BUTTON_TARGET_H_ | 23 | #define _BUTTON_TARGET_H_ |
24 | 24 | ||
25 | #include <stdbool.h> | ||
26 | #include "config.h" | ||
27 | |||
28 | #define HAS_BUTTON_HOLD | 25 | #define HAS_BUTTON_HOLD |
29 | 26 | ||
30 | void button_init_device(void); | ||
31 | int button_read_device(void); | ||
32 | bool button_hold(void); | ||
33 | |||
34 | /* Main unit's buttons */ | 27 | /* Main unit's buttons */ |
35 | #define BUTTON_POWER 0x00000001 | 28 | #define BUTTON_POWER 0x00000001 |
36 | #define BUTTON_VOLUP 0x00000002 | 29 | #define BUTTON_VOLUP 0x00000002 |
@@ -45,8 +38,6 @@ bool button_hold(void); | |||
45 | |BUTTON_UP|BUTTON_DOWN|BUTTON_LEFT\ | 38 | |BUTTON_UP|BUTTON_DOWN|BUTTON_LEFT\ |
46 | |BUTTON_RIGHT|BUTTON_SELECT) | 39 | |BUTTON_RIGHT|BUTTON_SELECT) |
47 | 40 | ||
48 | #define BUTTON_REMOTE 0 | ||
49 | |||
50 | /* Software power-off */ | 41 | /* Software power-off */ |
51 | #define POWEROFF_BUTTON BUTTON_POWER | 42 | #define POWEROFF_BUTTON BUTTON_POWER |
52 | #define POWEROFF_COUNT 40 | 43 | #define POWEROFF_COUNT 40 |
diff --git a/firmware/target/arm/tcc77x/iaudio7/button-target.h b/firmware/target/arm/tcc77x/iaudio7/button-target.h index fafaf4a303..9d232d9ae8 100644 --- a/firmware/target/arm/tcc77x/iaudio7/button-target.h +++ b/firmware/target/arm/tcc77x/iaudio7/button-target.h | |||
@@ -21,15 +21,8 @@ | |||
21 | #ifndef _IAUDIO7_BUTTON_TARGET_H_ | 21 | #ifndef _IAUDIO7_BUTTON_TARGET_H_ |
22 | #define _IAUDIO7_BUTTON_TARGET_H_ | 22 | #define _IAUDIO7_BUTTON_TARGET_H_ |
23 | 23 | ||
24 | #include <stdbool.h> | ||
25 | #include "config.h" | ||
26 | |||
27 | #define HAS_BUTTON_HOLD | 24 | #define HAS_BUTTON_HOLD |
28 | 25 | ||
29 | bool button_hold(void); | ||
30 | void button_init_device(void); | ||
31 | int button_read_device(void); | ||
32 | |||
33 | /* Main unit's buttons */ | 26 | /* Main unit's buttons */ |
34 | #define BUTTON_POWER 0x00000001 | 27 | #define BUTTON_POWER 0x00000001 |
35 | #define BUTTON_VOLUP 0x00000002 | 28 | #define BUTTON_VOLUP 0x00000002 |
@@ -47,9 +40,6 @@ int button_read_device(void); | |||
47 | BUTTON_MENU|BUTTON_LEFT|BUTTON_RIGHT| \ | 40 | BUTTON_MENU|BUTTON_LEFT|BUTTON_RIGHT| \ |
48 | BUTTON_PLAY|BUTTON_STOP) | 41 | BUTTON_PLAY|BUTTON_STOP) |
49 | 42 | ||
50 | /* No remote */ | ||
51 | #define BUTTON_REMOTE 0 | ||
52 | |||
53 | /* Software power-off */ | 43 | /* Software power-off */ |
54 | #define POWEROFF_BUTTON BUTTON_POWER | 44 | #define POWEROFF_BUTTON BUTTON_POWER |
55 | #define POWEROFF_COUNT 10 | 45 | #define POWEROFF_COUNT 10 |
diff --git a/firmware/target/arm/tcc77x/logikdax/button-target.h b/firmware/target/arm/tcc77x/logikdax/button-target.h index 4146745cdc..505fe438ed 100644 --- a/firmware/target/arm/tcc77x/logikdax/button-target.h +++ b/firmware/target/arm/tcc77x/logikdax/button-target.h | |||
@@ -22,12 +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 | #include <stdbool.h> | ||
26 | #include "config.h" | ||
27 | |||
28 | void button_init_device(void); | ||
29 | int button_read_device(void); | ||
30 | |||
31 | /* Main unit's buttons */ | 25 | /* Main unit's buttons */ |
32 | #define BUTTON_POWERPLAY 0x00000001 | 26 | #define BUTTON_POWERPLAY 0x00000001 |
33 | #define BUTTON_MODE 0x00000002 | 27 | #define BUTTON_MODE 0x00000002 |
@@ -44,8 +38,6 @@ int button_read_device(void); | |||
44 | |BUTTON_REC|BUTTON_PRESET|BUTTON_LEFT\ | 38 | |BUTTON_REC|BUTTON_PRESET|BUTTON_LEFT\ |
45 | |BUTTON_RIGHT|BUTTON_UP|BUTTON_DOWN|BUTTON_SELECT) | 39 | |BUTTON_RIGHT|BUTTON_UP|BUTTON_DOWN|BUTTON_SELECT) |
46 | 40 | ||
47 | #define BUTTON_REMOTE 0 | ||
48 | |||
49 | /* Software power-off */ | 41 | /* Software power-off */ |
50 | #define POWEROFF_BUTTON BUTTON_POWERPLAY | 42 | #define POWEROFF_BUTTON BUTTON_POWERPLAY |
51 | #define POWEROFF_COUNT 40 | 43 | #define POWEROFF_COUNT 40 |
diff --git a/firmware/target/arm/tcc77x/m200/button-target.h b/firmware/target/arm/tcc77x/m200/button-target.h index acf80b2ed7..b96df22edc 100644 --- a/firmware/target/arm/tcc77x/m200/button-target.h +++ b/firmware/target/arm/tcc77x/m200/button-target.h | |||
@@ -22,15 +22,8 @@ | |||
22 | #ifndef _BUTTON_TARGET_H_ | 22 | #ifndef _BUTTON_TARGET_H_ |
23 | #define _BUTTON_TARGET_H_ | 23 | #define _BUTTON_TARGET_H_ |
24 | 24 | ||
25 | #include <stdbool.h> | ||
26 | #include "config.h" | ||
27 | |||
28 | #define HAS_BUTTON_HOLD | 25 | #define HAS_BUTTON_HOLD |
29 | 26 | ||
30 | void button_init_device(void); | ||
31 | int button_read_device(void); | ||
32 | bool button_hold(void); | ||
33 | |||
34 | /* Main unit's buttons */ | 27 | /* Main unit's buttons */ |
35 | #define BUTTON_MENU 0x00000001 | 28 | #define BUTTON_MENU 0x00000001 |
36 | #define BUTTON_VOLUP 0x00000002 | 29 | #define BUTTON_VOLUP 0x00000002 |
@@ -45,8 +38,6 @@ bool button_hold(void); | |||
45 | |BUTTON_PLAYPAUSE|BUTTON_REPEATAB|BUTTON_LEFT\ | 38 | |BUTTON_PLAYPAUSE|BUTTON_REPEATAB|BUTTON_LEFT\ |
46 | |BUTTON_RIGHT|BUTTON_SELECT) | 39 | |BUTTON_RIGHT|BUTTON_SELECT) |
47 | 40 | ||
48 | #define BUTTON_REMOTE 0 | ||
49 | |||
50 | /* Software power-off */ | 41 | /* Software power-off */ |
51 | #define POWEROFF_BUTTON BUTTON_MENU | 42 | #define POWEROFF_BUTTON BUTTON_MENU |
52 | #define POWEROFF_COUNT 40 | 43 | #define POWEROFF_COUNT 40 |
diff --git a/firmware/target/arm/tcc780x/cowond2/button-target.h b/firmware/target/arm/tcc780x/cowond2/button-target.h index 7d3736fe67..cca1021957 100644 --- a/firmware/target/arm/tcc780x/cowond2/button-target.h +++ b/firmware/target/arm/tcc780x/cowond2/button-target.h | |||
@@ -22,15 +22,8 @@ | |||
22 | #ifndef _BUTTON_TARGET_H_ | 22 | #ifndef _BUTTON_TARGET_H_ |
23 | #define _BUTTON_TARGET_H_ | 23 | #define _BUTTON_TARGET_H_ |
24 | 24 | ||
25 | #include <stdbool.h> | ||
26 | #include "config.h" | ||
27 | |||
28 | #define HAS_BUTTON_HOLD | 25 | #define HAS_BUTTON_HOLD |
29 | 26 | ||
30 | bool button_hold(void); | ||
31 | void button_init_device(void); | ||
32 | int button_read_device(int *data); | ||
33 | |||
34 | /* Main unit's buttons */ | 27 | /* Main unit's buttons */ |
35 | #define BUTTON_POWER 0x00000001 | 28 | #define BUTTON_POWER 0x00000001 |
36 | #define BUTTON_PLUS 0x00000002 | 29 | #define BUTTON_PLUS 0x00000002 |
@@ -56,9 +49,6 @@ int button_read_device(int *data); | |||
56 | 49 | ||
57 | #define BUTTON_MAIN 0x1FFF | 50 | #define BUTTON_MAIN 0x1FFF |
58 | 51 | ||
59 | /* No remote */ | ||
60 | #define BUTTON_REMOTE 0 | ||
61 | |||
62 | /* Software power-off */ | 52 | /* Software power-off */ |
63 | #define POWEROFF_BUTTON BUTTON_POWER | 53 | #define POWEROFF_BUTTON BUTTON_POWER |
64 | #define POWEROFF_COUNT 10 | 54 | #define POWEROFF_COUNT 10 |
diff --git a/firmware/target/arm/tms320dm320/creative-zvm/button-target.h b/firmware/target/arm/tms320dm320/creative-zvm/button-target.h index 173d98bf30..50a182a210 100644 --- a/firmware/target/arm/tms320dm320/creative-zvm/button-target.h +++ b/firmware/target/arm/tms320dm320/creative-zvm/button-target.h | |||
@@ -47,8 +47,6 @@ | |||
47 | #define BUTTON_VOL_DOWN (1 << 14) | 47 | #define BUTTON_VOL_DOWN (1 << 14) |
48 | #endif | 48 | #endif |
49 | 49 | ||
50 | #define BUTTON_REMOTE 0 | ||
51 | |||
52 | #ifndef CREATIVE_ZV | 50 | #ifndef CREATIVE_ZV |
53 | #define BUTTON_MAIN ( BUTTON_BACK | BUTTON_MENU | BUTTON_LEFT | BUTTON_RIGHT \ | 51 | #define BUTTON_MAIN ( BUTTON_BACK | BUTTON_MENU | BUTTON_LEFT | BUTTON_RIGHT \ |
54 | | BUTTON_UP | BUTTON_DOWN | BUTTON_SELECT | BUTTON_POWER \ | 52 | | BUTTON_UP | BUTTON_DOWN | BUTTON_SELECT | BUTTON_POWER \ |
@@ -65,12 +63,6 @@ | |||
65 | 63 | ||
66 | #define HAS_BUTTON_HOLD | 64 | #define HAS_BUTTON_HOLD |
67 | 65 | ||
68 | void button_init_device(void); | ||
69 | int button_read_device(void); | ||
70 | bool headphones_inserted(void); | ||
71 | bool button_hold(void); | ||
72 | bool button_usb_connected(void); | 66 | bool button_usb_connected(void); |
73 | 67 | ||
74 | int get_debug_info(int choice); | ||
75 | |||
76 | #endif /* _BUTTON_TARGET_H_ */ | 68 | #endif /* _BUTTON_TARGET_H_ */ |
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/button-target.h b/firmware/target/arm/tms320dm320/mrobe-500/button-target.h index cd746dbb5b..7349387041 100644 --- a/firmware/target/arm/tms320dm320/mrobe-500/button-target.h +++ b/firmware/target/arm/tms320dm320/mrobe-500/button-target.h | |||
@@ -22,14 +22,10 @@ | |||
22 | #ifndef _BUTTON_TARGET_H_ | 22 | #ifndef _BUTTON_TARGET_H_ |
23 | #define _BUTTON_TARGET_H_ | 23 | #define _BUTTON_TARGET_H_ |
24 | 24 | ||
25 | #include "config.h" | 25 | #include <stdbool.h> |
26 | 26 | ||
27 | #define HAS_BUTTON_HOLD | 27 | #define HAS_BUTTON_HOLD |
28 | 28 | ||
29 | bool button_hold(void); | ||
30 | void button_init_device(void); | ||
31 | int button_read_device(int *data); | ||
32 | |||
33 | /* This is called from the tsc2100 interupt handler in adc-mr500.c */ | 29 | /* This is called from the tsc2100 interupt handler in adc-mr500.c */ |
34 | void touch_read_coord(void); | 30 | void touch_read_coord(void); |
35 | 31 | ||
diff --git a/firmware/target/arm/tms320dm320/sansa-connect/button-target.h b/firmware/target/arm/tms320dm320/sansa-connect/button-target.h index 2eb571ae68..5dddfc68d3 100644 --- a/firmware/target/arm/tms320dm320/sansa-connect/button-target.h +++ b/firmware/target/arm/tms320dm320/sansa-connect/button-target.h | |||
@@ -22,10 +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 | #include "config.h" | ||
26 | |||
27 | #define BUTTON_REMOTE 0 | ||
28 | |||
29 | /* these definitions match the avr hid reply */ | 25 | /* these definitions match the avr hid reply */ |
30 | #define BUTTON_LEFT (1 << 2) | 26 | #define BUTTON_LEFT (1 << 2) |
31 | #define BUTTON_UP (1 << 3) | 27 | #define BUTTON_UP (1 << 3) |
@@ -43,8 +39,6 @@ | |||
43 | #define BUTTON_SCROLL_FWD (1 << 7) | 39 | #define BUTTON_SCROLL_FWD (1 << 7) |
44 | #define BUTTON_SCROLL_BACK (1 << 8) | 40 | #define BUTTON_SCROLL_BACK (1 << 8) |
45 | 41 | ||
46 | |||
47 | #define BUTTON_REMOTE 0 | ||
48 | #define BUTTON_MAIN (BUTTON_LEFT | BUTTON_UP | BUTTON_RIGHT | BUTTON_DOWN |\ | 42 | #define BUTTON_MAIN (BUTTON_LEFT | BUTTON_UP | BUTTON_RIGHT | BUTTON_DOWN |\ |
49 | BUTTON_SELECT | BUTTON_VOL_UP | BUTTON_VOL_DOWN |\ | 43 | BUTTON_SELECT | BUTTON_VOL_UP | BUTTON_VOL_DOWN |\ |
50 | BUTTON_NEXT | BUTTON_PREV | BUTTON_POWER |\ | 44 | BUTTON_NEXT | BUTTON_PREV | BUTTON_POWER |\ |
@@ -55,10 +49,4 @@ | |||
55 | 49 | ||
56 | #define HAS_BUTTON_HOLD | 50 | #define HAS_BUTTON_HOLD |
57 | 51 | ||
58 | void button_init_device(void); | ||
59 | int button_read_device(void); | ||
60 | bool button_hold(void); | ||
61 | |||
62 | int get_debug_info(int choice); | ||
63 | |||
64 | #endif /* _BUTTON_TARGET_H_ */ | 52 | #endif /* _BUTTON_TARGET_H_ */ |
diff --git a/firmware/target/coldfire/iaudio/button-target.h b/firmware/target/coldfire/iaudio/button-target.h index 0259ea2134..655a172404 100644 --- a/firmware/target/coldfire/iaudio/button-target.h +++ b/firmware/target/coldfire/iaudio/button-target.h | |||
@@ -21,16 +21,9 @@ | |||
21 | #ifndef _BUTTON_TARGET_H_ | 21 | #ifndef _BUTTON_TARGET_H_ |
22 | #define _BUTTON_TARGET_H_ | 22 | #define _BUTTON_TARGET_H_ |
23 | 23 | ||
24 | #include <stdbool.h> | ||
25 | #include "config.h" | ||
26 | |||
27 | #define HAS_BUTTON_HOLD | 24 | #define HAS_BUTTON_HOLD |
28 | #define HAS_REMOTE_BUTTON_HOLD | 25 | #define HAS_REMOTE_BUTTON_HOLD |
29 | 26 | ||
30 | bool button_hold(void); | ||
31 | bool remote_button_hold(void); | ||
32 | void button_init_device(void); | ||
33 | int button_read_device(void); | ||
34 | void button_enable_scan(bool enable); | 27 | void button_enable_scan(bool enable); |
35 | bool button_scan_enabled(void); | 28 | bool button_scan_enabled(void); |
36 | 29 | ||
diff --git a/firmware/target/coldfire/iaudio/m3/button-target.h b/firmware/target/coldfire/iaudio/m3/button-target.h index 66457fe07c..8409cf6075 100644 --- a/firmware/target/coldfire/iaudio/m3/button-target.h +++ b/firmware/target/coldfire/iaudio/m3/button-target.h | |||
@@ -22,17 +22,9 @@ | |||
22 | #ifndef _BUTTON_TARGET_H_ | 22 | #ifndef _BUTTON_TARGET_H_ |
23 | #define _BUTTON_TARGET_H_ | 23 | #define _BUTTON_TARGET_H_ |
24 | 24 | ||
25 | #include <stdbool.h> | ||
26 | #include "config.h" | ||
27 | |||
28 | #define HAS_BUTTON_HOLD | 25 | #define HAS_BUTTON_HOLD |
29 | #define HAS_REMOTE_BUTTON_HOLD | 26 | #define HAS_REMOTE_BUTTON_HOLD |
30 | 27 | ||
31 | bool button_hold(void); | ||
32 | bool remote_button_hold(void); | ||
33 | void button_init_device(void); | ||
34 | int button_read_device(void); | ||
35 | |||
36 | /* iaudio M3 specific button codes */ | 28 | /* iaudio M3 specific button codes */ |
37 | 29 | ||
38 | /* Main unit's buttons */ | 30 | /* Main unit's buttons */ |
diff --git a/firmware/target/coldfire/iriver/button-target.h b/firmware/target/coldfire/iriver/button-target.h index 4c15630e34..a677d042b3 100644 --- a/firmware/target/coldfire/iriver/button-target.h +++ b/firmware/target/coldfire/iriver/button-target.h | |||
@@ -24,17 +24,12 @@ | |||
24 | #ifndef _BUTTON_TARGET_H_ | 24 | #ifndef _BUTTON_TARGET_H_ |
25 | #define _BUTTON_TARGET_H_ | 25 | #define _BUTTON_TARGET_H_ |
26 | 26 | ||
27 | #include <stdbool.h> | ||
28 | #include "config.h" | 27 | #include "config.h" |
28 | #include <stdbool.h> | ||
29 | 29 | ||
30 | #define HAS_BUTTON_HOLD | 30 | #define HAS_BUTTON_HOLD |
31 | #define HAS_REMOTE_BUTTON_HOLD | 31 | #define HAS_REMOTE_BUTTON_HOLD |
32 | 32 | ||
33 | bool button_hold(void); | ||
34 | bool remote_button_hold(void); | ||
35 | bool remote_button_hold_only(void); | ||
36 | void button_init_device(void); | ||
37 | int button_read_device(void); | ||
38 | #ifdef IRIVER_H300_SERIES | 33 | #ifdef IRIVER_H300_SERIES |
39 | void button_enable_scan(bool enable); | 34 | void button_enable_scan(bool enable); |
40 | bool button_scan_enabled(void); | 35 | bool button_scan_enabled(void); |
diff --git a/firmware/target/coldfire/iriver/h100/button-h100.c b/firmware/target/coldfire/iriver/h100/button-h100.c index c32b979a00..dbaefdcf2a 100644 --- a/firmware/target/coldfire/iriver/h100/button-h100.c +++ b/firmware/target/coldfire/iriver/h100/button-h100.c | |||
@@ -39,7 +39,7 @@ bool button_hold(void) | |||
39 | return (GPIO1_READ & 0x00000002)?true:false; | 39 | return (GPIO1_READ & 0x00000002)?true:false; |
40 | } | 40 | } |
41 | 41 | ||
42 | bool remote_button_hold_only(void) | 42 | static bool remote_button_hold_only(void) |
43 | { | 43 | { |
44 | if(remote_type() == REMOTETYPE_H300_NONLCD) | 44 | if(remote_type() == REMOTETYPE_H300_NONLCD) |
45 | return adc_scan(ADC_REMOTE)<0x0d; /* hold should be 0x00 */ | 45 | return adc_scan(ADC_REMOTE)<0x0d; /* hold should be 0x00 */ |
diff --git a/firmware/target/coldfire/iriver/h300/button-h300.c b/firmware/target/coldfire/iriver/h300/button-h300.c index 43f5250191..74c14fb144 100644 --- a/firmware/target/coldfire/iriver/h300/button-h300.c +++ b/firmware/target/coldfire/iriver/h300/button-h300.c | |||
@@ -55,7 +55,7 @@ bool button_hold(void) | |||
55 | return (GPIO1_READ & 0x00000002)?true:false; | 55 | return (GPIO1_READ & 0x00000002)?true:false; |
56 | } | 56 | } |
57 | 57 | ||
58 | bool remote_button_hold_only(void) | 58 | static bool remote_button_hold_only(void) |
59 | { | 59 | { |
60 | if(remote_type() == REMOTETYPE_H300_NONLCD) | 60 | if(remote_type() == REMOTETYPE_H300_NONLCD) |
61 | return adc_scan(ADC_REMOTE)<0x0d; /* hold should be 0x00 */ | 61 | return adc_scan(ADC_REMOTE)<0x0d; /* hold should be 0x00 */ |
diff --git a/firmware/target/coldfire/mpio/hd200/button-target.h b/firmware/target/coldfire/mpio/hd200/button-target.h index b7c31f8c59..3370935a45 100644 --- a/firmware/target/coldfire/mpio/hd200/button-target.h +++ b/firmware/target/coldfire/mpio/hd200/button-target.h | |||
@@ -21,17 +21,9 @@ | |||
21 | #ifndef _BUTTON_TARGET_H_ | 21 | #ifndef _BUTTON_TARGET_H_ |
22 | #define _BUTTON_TARGET_H_ | 22 | #define _BUTTON_TARGET_H_ |
23 | 23 | ||
24 | #include <stdbool.h> | ||
25 | #include "config.h" | ||
26 | |||
27 | #define HAS_BUTTON_HOLD | 24 | #define HAS_BUTTON_HOLD |
28 | #define HAS_REMOTE_BUTTON_HOLD | 25 | #define HAS_REMOTE_BUTTON_HOLD |
29 | 26 | ||
30 | bool button_hold(void); | ||
31 | bool remote_button_hold(void); | ||
32 | void button_init_device(void); | ||
33 | int button_read_device(void); | ||
34 | |||
35 | /* HD200 specific button codes */ | 27 | /* HD200 specific button codes */ |
36 | /* Main unit's buttons - flags as in original firmware*/ | 28 | /* Main unit's buttons - flags as in original firmware*/ |
37 | #define BUTTON_PLAY 0x00000001 | 29 | #define BUTTON_PLAY 0x00000001 |
diff --git a/firmware/target/coldfire/mpio/hd300/button-target.h b/firmware/target/coldfire/mpio/hd300/button-target.h index 5cb2ae8bf2..7f902b0ecf 100644 --- a/firmware/target/coldfire/mpio/hd300/button-target.h +++ b/firmware/target/coldfire/mpio/hd300/button-target.h | |||
@@ -21,15 +21,7 @@ | |||
21 | #ifndef _BUTTON_TARGET_H_ | 21 | #ifndef _BUTTON_TARGET_H_ |
22 | #define _BUTTON_TARGET_H_ | 22 | #define _BUTTON_TARGET_H_ |
23 | 23 | ||
24 | #include <stdbool.h> | ||
25 | #include "config.h" | ||
26 | |||
27 | #define HAS_BUTTON_HOLD | 24 | #define HAS_BUTTON_HOLD |
28 | #define BUTTON_REMOTE 0 | ||
29 | |||
30 | bool button_hold(void); | ||
31 | void button_init_device(void); | ||
32 | int button_read_device(void); | ||
33 | 25 | ||
34 | /* HD300 specific button codes */ | 26 | /* HD300 specific button codes */ |
35 | #define BUTTON_PLAY 0x00000001 | 27 | #define BUTTON_PLAY 0x00000001 |
diff --git a/firmware/target/hosted/android/app/button-target.h b/firmware/target/hosted/android/app/button-target.h index b532c94f47..326d65872d 100644 --- a/firmware/target/hosted/android/app/button-target.h +++ b/firmware/target/hosted/android/app/button-target.h | |||
@@ -23,11 +23,7 @@ | |||
23 | #define _BUTTON_TARGET_H_ | 23 | #define _BUTTON_TARGET_H_ |
24 | 24 | ||
25 | #include <stdbool.h> | 25 | #include <stdbool.h> |
26 | #include "config.h" | ||
27 | 26 | ||
28 | #undef button_init_device | ||
29 | void button_init_device(void); | ||
30 | int button_read_device(int *data); | ||
31 | unsigned multimedia_to_button(int keyboard_key); | 27 | unsigned multimedia_to_button(int keyboard_key); |
32 | unsigned dpad_to_button(int keyboard_key); | 28 | unsigned dpad_to_button(int keyboard_key); |
33 | void android_ignore_back_button(bool yes); | 29 | void android_ignore_back_button(bool yes); |
@@ -61,8 +57,5 @@ void android_ignore_back_button(bool yes); | |||
61 | #define BUTTON_BOTTOMRIGHT 0x00100000 | 57 | #define BUTTON_BOTTOMRIGHT 0x00100000 |
62 | 58 | ||
63 | #define BUTTON_FORCE_REDRAW 0x00200000 | 59 | #define BUTTON_FORCE_REDRAW 0x00200000 |
64 | |||
65 | /* No remote */ | ||
66 | #define BUTTON_REMOTE 0 | ||
67 | 60 | ||
68 | #endif /* _BUTTON_TARGET_H_ */ | 61 | #endif /* _BUTTON_TARGET_H_ */ |
diff --git a/firmware/target/hosted/sdl/app/button-target.h b/firmware/target/hosted/sdl/app/button-target.h index d4396fd0d5..26d0fedcc5 100644 --- a/firmware/target/hosted/sdl/app/button-target.h +++ b/firmware/target/hosted/sdl/app/button-target.h | |||
@@ -22,21 +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 | #include <stdbool.h> | ||
26 | #include "config.h" | ||
27 | /* | ||
28 | |||
29 | #define HAS_BUTTON_HOLD | ||
30 | |||
31 | bool button_hold(void); | ||
32 | */ | ||
33 | void button_init_device(void); | ||
34 | #ifdef HAVE_BUTTON_DATA | ||
35 | int button_read_device(int *data); | ||
36 | #else | ||
37 | int button_read_device(void); | ||
38 | #endif | ||
39 | |||
40 | /* Main unit's buttons */ | 25 | /* Main unit's buttons */ |
41 | #define BUTTON_UP 0x00000001 | 26 | #define BUTTON_UP 0x00000001 |
42 | #define BUTTON_DOWN 0x00000002 | 27 | #define BUTTON_DOWN 0x00000002 |
@@ -61,9 +46,6 @@ int button_read_device(void); | |||
61 | 46 | ||
62 | #define BUTTON_MAIN 0x1FFF | 47 | #define BUTTON_MAIN 0x1FFF |
63 | 48 | ||
64 | /* No remote */ | ||
65 | #define BUTTON_REMOTE 0 | ||
66 | |||
67 | /* Software power-off */ | 49 | /* Software power-off */ |
68 | #define POWEROFF_BUTTON BUTTON_POWER | 50 | #define POWEROFF_BUTTON BUTTON_POWER |
69 | #define POWEROFF_COUNT 10 | 51 | #define POWEROFF_COUNT 10 |
diff --git a/firmware/target/hosted/ypr0/button-target.h b/firmware/target/hosted/ypr0/button-target.h index beddc66c67..d7b95de785 100644 --- a/firmware/target/hosted/ypr0/button-target.h +++ b/firmware/target/hosted/ypr0/button-target.h | |||
@@ -22,14 +22,7 @@ | |||
22 | #ifndef _BUTTON_TARGET_H_ | 22 | #ifndef _BUTTON_TARGET_H_ |
23 | #define _BUTTON_TARGET_H_ | 23 | #define _BUTTON_TARGET_H_ |
24 | 24 | ||
25 | #include <stdbool.h> | ||
26 | #include "config.h" | ||
27 | |||
28 | bool headphones_inserted(void); | ||
29 | |||
30 | void button_init_device(void); | ||
31 | void button_close_device(void); | 25 | void button_close_device(void); |
32 | int button_read_device(void); | ||
33 | 26 | ||
34 | /* Logical buttons key codes */ | 27 | /* Logical buttons key codes */ |
35 | #define BUTTON_UP 0x00000001 | 28 | #define BUTTON_UP 0x00000001 |
@@ -44,9 +37,6 @@ int button_read_device(void); | |||
44 | 37 | ||
45 | #define BUTTON_MAIN 0x1FF /* all buttons */ | 38 | #define BUTTON_MAIN 0x1FF /* all buttons */ |
46 | 39 | ||
47 | /* No remote */ | ||
48 | #define BUTTON_REMOTE 0 | ||
49 | |||
50 | /* Software power-off */ | 40 | /* Software power-off */ |
51 | #define POWEROFF_BUTTON BUTTON_POWER | 41 | #define POWEROFF_BUTTON BUTTON_POWER |
52 | /* About 3 seconds */ | 42 | /* About 3 seconds */ |
diff --git a/firmware/target/mips/ingenic_jz47xx/onda_vx747/button-target.h b/firmware/target/mips/ingenic_jz47xx/onda_vx747/button-target.h index 47982a0ba9..994b9b09fa 100644 --- a/firmware/target/mips/ingenic_jz47xx/onda_vx747/button-target.h +++ b/firmware/target/mips/ingenic_jz47xx/onda_vx747/button-target.h | |||
@@ -27,9 +27,6 @@ | |||
27 | #define HAS_BUTTON_HOLD | 27 | #define HAS_BUTTON_HOLD |
28 | #endif | 28 | #endif |
29 | 29 | ||
30 | bool button_hold(void); | ||
31 | void button_init_device(void); | ||
32 | int button_read_device(int *data); | ||
33 | void button_set_touch_available(void); | 30 | void button_set_touch_available(void); |
34 | 31 | ||
35 | /* Main unit's buttons */ | 32 | /* Main unit's buttons */ |
@@ -72,9 +69,6 @@ void button_set_touch_available(void); | |||
72 | BUTTON_BOTTOMRIGHT) | 69 | BUTTON_BOTTOMRIGHT) |
73 | #endif | 70 | #endif |
74 | 71 | ||
75 | /* No remote */ | ||
76 | #define BUTTON_REMOTE 0 | ||
77 | |||
78 | /* Software power-off */ | 72 | /* Software power-off */ |
79 | #define POWEROFF_BUTTON BUTTON_POWER | 73 | #define POWEROFF_BUTTON BUTTON_POWER |
80 | #define POWEROFF_COUNT 10 | 74 | #define POWEROFF_COUNT 10 |
diff --git a/firmware/target/mips/ingenic_jz47xx/onda_vx767/button-target.h b/firmware/target/mips/ingenic_jz47xx/onda_vx767/button-target.h index 8c0393b9f6..04b46f85c7 100644 --- a/firmware/target/mips/ingenic_jz47xx/onda_vx767/button-target.h +++ b/firmware/target/mips/ingenic_jz47xx/onda_vx767/button-target.h | |||
@@ -21,15 +21,8 @@ | |||
21 | #ifndef BUTTON_TARGET_H | 21 | #ifndef BUTTON_TARGET_H |
22 | #define BUTTON_TARGET_H | 22 | #define BUTTON_TARGET_H |
23 | 23 | ||
24 | #include <stdbool.h> | ||
25 | #include "config.h" | ||
26 | |||
27 | #define HAS_BUTTON_HOLD | 24 | #define HAS_BUTTON_HOLD |
28 | 25 | ||
29 | bool button_hold(void); | ||
30 | void button_init_device(void); | ||
31 | int button_read_device(void); | ||
32 | |||
33 | /* Main unit's buttons */ | 26 | /* Main unit's buttons */ |
34 | #define BUTTON_SELECT 0x00000001 | 27 | #define BUTTON_SELECT 0x00000001 |
35 | #define BUTTON_VOL_UP 0x00000002 | 28 | #define BUTTON_VOL_UP 0x00000002 |
@@ -48,9 +41,6 @@ int button_read_device(void); | |||
48 | #define BUTTON_MAIN (BUTTON_SELECT | BUTTON_VOL_UP | BUTTON_VOL_DOWN | BUTTON_MENU \ | 41 | #define BUTTON_MAIN (BUTTON_SELECT | BUTTON_VOL_UP | BUTTON_VOL_DOWN | BUTTON_MENU \ |
49 | BUTTON_MENU | BUTTON_BACK | BUTTON_REWIND | BUTTON_FAST_FWD) | 42 | BUTTON_MENU | BUTTON_BACK | BUTTON_REWIND | BUTTON_FAST_FWD) |
50 | 43 | ||
51 | /* No remote */ | ||
52 | #define BUTTON_REMOTE 0 | ||
53 | |||
54 | #define BUTTON_POWER 0 /* HACK */ | 44 | #define BUTTON_POWER 0 /* HACK */ |
55 | 45 | ||
56 | /* Software power-off */ | 46 | /* Software power-off */ |
diff --git a/firmware/target/sh/archos/fm_v2/button-target.h b/firmware/target/sh/archos/fm_v2/button-target.h index 5330324141..47eb48c32d 100644 --- a/firmware/target/sh/archos/fm_v2/button-target.h +++ b/firmware/target/sh/archos/fm_v2/button-target.h | |||
@@ -22,12 +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 | #include <stdbool.h> | ||
26 | #include "config.h" | ||
27 | |||
28 | void button_init_device(void); | ||
29 | int button_read_device(void); | ||
30 | |||
31 | /* Main unit's buttons */ | 25 | /* Main unit's buttons */ |
32 | #define BUTTON_ON 0x00000001 | 26 | #define BUTTON_ON 0x00000001 |
33 | #define BUTTON_OFF 0x00000002 | 27 | #define BUTTON_OFF 0x00000002 |
@@ -46,8 +40,6 @@ int button_read_device(void); | |||
46 | #define BUTTON_MAIN (BUTTON_ON|BUTTON_OFF|BUTTON_LEFT|BUTTON_RIGHT\ | 40 | #define BUTTON_MAIN (BUTTON_ON|BUTTON_OFF|BUTTON_LEFT|BUTTON_RIGHT\ |
47 | |BUTTON_UP|BUTTON_DOWN|BUTTON_PLAY\ | 41 | |BUTTON_UP|BUTTON_DOWN|BUTTON_PLAY\ |
48 | |BUTTON_F1|BUTTON_F2|BUTTON_F3) | 42 | |BUTTON_F1|BUTTON_F2|BUTTON_F3) |
49 | |||
50 | #define BUTTON_REMOTE 0 | ||
51 | 43 | ||
52 | #define POWEROFF_BUTTON BUTTON_OFF | 44 | #define POWEROFF_BUTTON BUTTON_OFF |
53 | #define POWEROFF_COUNT 10 | 45 | #define POWEROFF_COUNT 10 |
diff --git a/firmware/target/sh/archos/ondio/button-target.h b/firmware/target/sh/archos/ondio/button-target.h index cf605b19bd..b23d157b6d 100644 --- a/firmware/target/sh/archos/ondio/button-target.h +++ b/firmware/target/sh/archos/ondio/button-target.h | |||
@@ -22,11 +22,7 @@ | |||
22 | #ifndef _BUTTON_TARGET_H_ | 22 | #ifndef _BUTTON_TARGET_H_ |
23 | #define _BUTTON_TARGET_H_ | 23 | #define _BUTTON_TARGET_H_ |
24 | 24 | ||
25 | #include <stdbool.h> | ||
26 | #include "config.h" | ||
27 | |||
28 | #define button_init_device() | 25 | #define button_init_device() |
29 | int button_read_device(void); | ||
30 | 26 | ||
31 | #define BUTTON_OFF 0x00000001 | 27 | #define BUTTON_OFF 0x00000001 |
32 | #define BUTTON_MENU 0x00000002 | 28 | #define BUTTON_MENU 0x00000002 |
@@ -39,8 +35,6 @@ int button_read_device(void); | |||
39 | #define BUTTON_MAIN (BUTTON_OFF|BUTTON_MENU|BUTTON_LEFT|BUTTON_RIGHT\ | 35 | #define BUTTON_MAIN (BUTTON_OFF|BUTTON_MENU|BUTTON_LEFT|BUTTON_RIGHT\ |
40 | |BUTTON_UP|BUTTON_DOWN) | 36 | |BUTTON_UP|BUTTON_DOWN) |
41 | 37 | ||
42 | #define BUTTON_REMOTE 0 | ||
43 | |||
44 | #define POWEROFF_BUTTON BUTTON_OFF | 38 | #define POWEROFF_BUTTON BUTTON_OFF |
45 | #define POWEROFF_COUNT 10 | 39 | #define POWEROFF_COUNT 10 |
46 | 40 | ||
diff --git a/firmware/target/sh/archos/player/button-target.h b/firmware/target/sh/archos/player/button-target.h index 11722ce1d0..dd85d731be 100644 --- a/firmware/target/sh/archos/player/button-target.h +++ b/firmware/target/sh/archos/player/button-target.h | |||
@@ -22,14 +22,8 @@ | |||
22 | #ifndef _BUTTON_TARGET_H_ | 22 | #ifndef _BUTTON_TARGET_H_ |
23 | #define _BUTTON_TARGET_H_ | 23 | #define _BUTTON_TARGET_H_ |
24 | 24 | ||
25 | #include <stdbool.h> | ||
26 | #include "config.h" | ||
27 | |||
28 | #define HAS_SERIAL_REMOTE | 25 | #define HAS_SERIAL_REMOTE |
29 | 26 | ||
30 | void button_init_device(void); | ||
31 | int button_read_device(void); | ||
32 | |||
33 | /* Main unit's buttons */ | 27 | /* Main unit's buttons */ |
34 | #define BUTTON_ON 0x00000001 | 28 | #define BUTTON_ON 0x00000001 |
35 | #define BUTTON_STOP 0x00000002 | 29 | #define BUTTON_STOP 0x00000002 |
diff --git a/firmware/target/sh/archos/recorder/button-target.h b/firmware/target/sh/archos/recorder/button-target.h index bcaf3f0049..f387fafe10 100644 --- a/firmware/target/sh/archos/recorder/button-target.h +++ b/firmware/target/sh/archos/recorder/button-target.h | |||
@@ -22,14 +22,8 @@ | |||
22 | #ifndef _BUTTON_TARGET_H_ | 22 | #ifndef _BUTTON_TARGET_H_ |
23 | #define _BUTTON_TARGET_H_ | 23 | #define _BUTTON_TARGET_H_ |
24 | 24 | ||
25 | #include <stdbool.h> | ||
26 | #include "config.h" | ||
27 | |||
28 | #define HAS_SERIAL_REMOTE | 25 | #define HAS_SERIAL_REMOTE |
29 | 26 | ||
30 | void button_init_device(void); | ||
31 | int button_read_device(void); | ||
32 | |||
33 | /* Main unit's buttons */ | 27 | /* Main unit's buttons */ |
34 | #define BUTTON_ON 0x00000001 | 28 | #define BUTTON_ON 0x00000001 |
35 | #define BUTTON_OFF 0x00000002 | 29 | #define BUTTON_OFF 0x00000002 |