From 59ba8fea22dad7c998fe515dafeb15b0e91ddbc0 Mon Sep 17 00:00:00 2001 From: Marcin Bukat Date: Tue, 2 Nov 2010 10:44:34 +0000 Subject: MPIO HD200: rename button defines to adhere how they are labeled on the device. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28443 a1c6a512-1295-4272-9138-f99709370657 --- firmware/target/coldfire/mpio/button-target.h | 24 +++++++++++----------- firmware/target/coldfire/mpio/hd200/button-hd200.c | 12 +++++------ 2 files changed, 18 insertions(+), 18 deletions(-) (limited to 'firmware/target') diff --git a/firmware/target/coldfire/mpio/button-target.h b/firmware/target/coldfire/mpio/button-target.h index 6cfe758458..b7c31f8c59 100644 --- a/firmware/target/coldfire/mpio/button-target.h +++ b/firmware/target/coldfire/mpio/button-target.h @@ -36,30 +36,30 @@ int button_read_device(void); /* Main unit's buttons - flags as in original firmware*/ #define BUTTON_PLAY 0x00000001 -#define BUTTON_PREV 0x00000004 -#define BUTTON_NEXT 0x00000002 +#define BUTTON_REW 0x00000004 +#define BUTTON_FF 0x00000002 #define BUTTON_VOL_UP 0x00000008 #define BUTTON_VOL_DOWN 0x00000010 #define BUTTON_REC 0x00000020 -#define BUTTON_SELECT 0x00002000 +#define BUTTON_FUNC 0x00002000 #define BUTTON_RC_PLAY 0x00010000 -#define BUTTON_RC_PREV 0x00040000 -#define BUTTON_RC_NEXT 0x00020000 +#define BUTTON_RC_REW 0x00040000 +#define BUTTON_RC_FF 0x00020000 #define BUTTON_RC_VOL_UP 0x00080000 #define BUTTON_RC_VOL_DOWN 0x00100000 -#define BUTTON_RC_SELECT 0x20000000 +#define BUTTON_RC_FUNC 0x20000000 -#define BUTTON_LEFT BUTTON_PREV -#define BUTTON_RIGHT BUTTON_NEXT +#define BUTTON_LEFT BUTTON_REW +#define BUTTON_RIGHT BUTTON_FF #define BUTTON_ON BUTTON_PLAY -#define BUTTON_MAIN (BUTTON_PLAY|BUTTON_PREV|BUTTON_NEXT|BUTTON_VOL_UP|\ - BUTTON_VOL_DOWN|BUTTON_REC|BUTTON_SELECT) +#define BUTTON_MAIN (BUTTON_PLAY|BUTTON_REW|BUTTON_FF|BUTTON_VOL_UP|\ + BUTTON_VOL_DOWN|BUTTON_REC|BUTTON_FUNC) -#define BUTTON_REMOTE (BUTTON_RC_PLAY|BUTTON_RC_PREV|BUTTON_RC_NEXT|\ - BUTTON_RC_VOL_UP|BUTTON_RC_VOL_DOWN|BUTTON_RC_SELECT) +#define BUTTON_REMOTE (BUTTON_RC_PLAY|BUTTON_RC_REW|BUTTON_RC_FF|\ + BUTTON_RC_VOL_UP|BUTTON_RC_VOL_DOWN|BUTTON_RC_FUNC) #define POWEROFF_BUTTON BUTTON_PLAY #define RC_POWEROFF_BUTTON BUTTON_RC_PLAY diff --git a/firmware/target/coldfire/mpio/hd200/button-hd200.c b/firmware/target/coldfire/mpio/hd200/button-hd200.c index 65a996e7a5..93109ab209 100644 --- a/firmware/target/coldfire/mpio/hd200/button-hd200.c +++ b/firmware/target/coldfire/mpio/hd200/button-hd200.c @@ -113,15 +113,15 @@ int button_read_device(void) /* 1200 - 900 */ btn = BUTTON_VOL_UP; else /* 1600 - 1200 */ - btn = BUTTON_NEXT; + btn = BUTTON_FF; } else /* 1600 - 2250 */ { if (data < 1900) /* 1900 - 1600 */ - btn = BUTTON_PREV; + btn = BUTTON_REW; else /* 1900 - 2300 */ - btn = BUTTON_SELECT; + btn = BUTTON_FUNC; } } } @@ -148,7 +148,7 @@ int button_read_device(void) btn = BUTTON_RC_VOL_UP; } else /* 950 - 650 */ - btn = BUTTON_RC_NEXT; + btn = BUTTON_RC_FF; } else /* 2050 - 950 */ { @@ -156,10 +156,10 @@ int button_read_device(void) { if (data < 1350) /* 1350 - 900 */ - btn = BUTTON_RC_PREV; + btn = BUTTON_RC_REW; } else /* 2050 - 1900 */ - btn = BUTTON_RC_SELECT; + btn = BUTTON_RC_FUNC; } } } -- cgit