summaryrefslogtreecommitdiff
path: root/firmware/target/arm/as3525
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/target/arm/as3525')
-rw-r--r--firmware/target/arm/as3525/button-clip.c2
-rw-r--r--firmware/target/arm/as3525/button-e200v2-fuze.c2
-rw-r--r--firmware/target/arm/as3525/sansa-c200v2/button-c200v2.c1
-rw-r--r--firmware/target/arm/as3525/sansa-c200v2/button-target.h10
-rw-r--r--firmware/target/arm/as3525/sansa-clip/button-target.h9
-rw-r--r--firmware/target/arm/as3525/sansa-clipplus/button-clip.c2
-rw-r--r--firmware/target/arm/as3525/sansa-clipplus/button-target.h8
-rw-r--r--firmware/target/arm/as3525/sansa-clipv2/button-target.h9
-rw-r--r--firmware/target/arm/as3525/sansa-clipzip/button-clipzip.c2
-rw-r--r--firmware/target/arm/as3525/sansa-clipzip/button-target.h7
-rw-r--r--firmware/target/arm/as3525/sansa-e200v2/button-target.h9
-rw-r--r--firmware/target/arm/as3525/sansa-fuze/button-target.h9
-rw-r--r--firmware/target/arm/as3525/sansa-fuzev2/button-target.h9
-rw-r--r--firmware/target/arm/as3525/sansa-m200v4/button-target.h9
-rw-r--r--firmware/target/arm/as3525/system-as3525.c2
15 files changed, 5 insertions, 85 deletions
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
30bool button_hold(void);
31void button_init_device(void);
32int 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
30void button_init_device(void);
31int button_read_device(void);
32bool 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
28void button_init_device(void);
29int 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
30void button_init_device(void);
31int button_read_device(void);
32bool 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
27void button_init_device(void);
28int 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
30bool button_hold(void);
31void button_init_device(void);
32int button_read_device(void);
33unsigned short button_read_dbop(void); 27unsigned 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
30void button_init_device(void);
31bool button_hold(void);
32int button_read_device(void);
33unsigned short button_read_dbop(void); 27unsigned 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
30void button_init_device(void);
31bool button_hold(void);
32int 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
30void button_init_device(void);
31int button_read_device(void);
32bool 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
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-23 08:58:11 +0000