summaryrefslogtreecommitdiffstats
path: root/firmware/target/arm
diff options
context:
space:
mode:
Diffstat (limited to 'firmware/target/arm')
-rw-r--r--firmware/target/arm/as3525/sansa-clip/button-clip.c6
-rw-r--r--firmware/target/arm/as3525/sansa-clip/button-target.h8
2 files changed, 7 insertions, 7 deletions
diff --git a/firmware/target/arm/as3525/sansa-clip/button-clip.c b/firmware/target/arm/as3525/sansa-clip/button-clip.c
index faed075c65..65e72f51b6 100644
--- a/firmware/target/arm/as3525/sansa-clip/button-clip.c
+++ b/firmware/target/arm/as3525/sansa-clip/button-clip.c
@@ -50,10 +50,10 @@ int button_read_device(void)
/* C4B0 is unused */
if (GPIOB_PIN(1))
- result |= BUTTON_VOLUP;
+ result |= BUTTON_VOL_UP;
if (GPIOB_PIN(2))
- result |= BUTTON_PLAY;
+ result |= BUTTON_UP;
GPIOC_PIN(4) = 0x00;
@@ -76,7 +76,7 @@ int button_read_device(void)
result |= BUTTON_DOWN;
if (GPIOB_PIN(1))
- result |= BUTTON_VOLDOWN;
+ result |= BUTTON_VOL_DOWN;
if (GPIOB_PIN(2))
result |= BUTTON_HOME;
diff --git a/firmware/target/arm/as3525/sansa-clip/button-target.h b/firmware/target/arm/as3525/sansa-clip/button-target.h
index 1fb57ae9e9..d44ac58a71 100644
--- a/firmware/target/arm/as3525/sansa-clip/button-target.h
+++ b/firmware/target/arm/as3525/sansa-clip/button-target.h
@@ -34,10 +34,10 @@ bool button_hold(void);
/* Main unit's buttons */
#define BUTTON_HOME 0x00000001
-#define BUTTON_VOLUP 0x00000002
-#define BUTTON_VOLDOWN 0x00000004
+#define BUTTON_VOL_UP 0x00000002
+#define BUTTON_VOL_DOWN 0x00000004
-#define BUTTON_PLAY 0x00000008
+#define BUTTON_UP 0x00000008
#define BUTTON_DOWN 0x00000010
#define BUTTON_LEFT 0x00000020
#define BUTTON_RIGHT 0x00000040
@@ -48,7 +48,7 @@ bool button_hold(void);
#define BUTTON_HOLD 0x00000200
#define BUTTON_MAIN (BUTTON_HOME|BUTTON_VOLUP|BUTTON_VOLDOWN\
- |BUTTON_PLAY|BUTTON_DOWN|BUTTON_LEFT|BUTTON_RIGHT\
+ |BUTTON_UP|BUTTON_DOWN|BUTTON_LEFT|BUTTON_RIGHT\
|BUTTON_SELECT|BUTTON_POWER|BUTTON_HOLD)
#define BUTTON_REMOTE 0