devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Remove inner loop from button scanning on Gigabeat S. Requires changing the button codes but it's not a "functional port" so no plugin API version increase is done though a full update will be needed since any using the values will be incompatible.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17432 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Sevakis 2008-05-09 21:19:58 +00:00
parent c85faed1ee
commit 6df1a86e99
2 changed files with 30 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

29
firmware/target/arm/imx31/gigabeat-s/button-imx31.c
View file

@ -38,18 +38,18 @@ static bool hold_button_old = false;
static __attribute__((interrupt("IRQ"))) void KPP_HANDLER(void) static __attribute__((interrupt("IRQ"))) void KPP_HANDLER(void)
{ {
static const int key_mtx[5][3] = static const struct key_mask_shift
{ {
{ BUTTON_LEFT, BUTTON_BACK, BUTTON_VOL_UP }, uint8_t mask;
{ BUTTON_UP, BUTTON_MENU, BUTTON_VOL_DOWN }, uint8_t shift;
{ BUTTON_DOWN, BUTTON_NONE, BUTTON_PREV }, } kms[3] =
{ BUTTON_RIGHT, BUTTON_NONE, BUTTON_PLAY }, {
{ BUTTON_SELECT, BUTTON_NONE, BUTTON_NEXT }, { 0x1f, 0 }, /* BUTTON_LEFT...BUTTON_SELECT */
{ 0x03, 5 }, /* BUTTON_BACK...BUTTON_MENU */
{ 0x1f, 7 }, /* BUTTON_VOL_UP...BUTTON_NEXT */
}; };
unsigned short reg_val; int col;
int col, row;
int i;
/* Power button is handled separately on PMIC */ /* Power button is handled separately on PMIC */
int button = int_btn & BUTTON_POWER; int button = int_btn & BUTTON_POWER;
@ -60,6 +60,8 @@ static __attribute__((interrupt("IRQ"))) void KPP_HANDLER(void)
for (col = 0; col < 3; col++) /* Col */ for (col = 0; col < 3; col++) /* Col */
{ {
int i;
/* 2. Write 1s to KPDR[10:8] setting column data to 1s */ /* 2. Write 1s to KPDR[10:8] setting column data to 1s */
KPP_KPDR |= (0x7 << 8); KPP_KPDR |= (0x7 << 8);
@ -80,7 +82,7 @@ static __attribute__((interrupt("IRQ"))) void KPP_HANDLER(void)
* 7. Repeat steps 2 - 6 for remaining columns. */ * 7. Repeat steps 2 - 6 for remaining columns. */
/* Col bit starts at 8th bit in KPDR */ /* Col bit starts at 8th bit in KPDR */
KPP_KPDR &= ~(1 << (8 + col)); KPP_KPDR &= ~(0x100 << col);
/* Delay added to avoid propagating the 0 from column to row /* Delay added to avoid propagating the 0 from column to row
* when scanning. */ * when scanning. */
@ -88,12 +90,7 @@ static __attribute__((interrupt("IRQ"))) void KPP_HANDLER(void)
asm volatile (""); asm volatile ("");
/* Read row input */ /* Read row input */
reg_val = KPP_KPDR; button |= (~KPP_KPDR & kms[col].mask) << kms[col].shift;
for (row = 0; row < 5; row++) /* sample row */
{
if (!(reg_val & (1 << row)))
button |= key_mtx[row][col];
}
} }
/* 8. Return all columns to 0 in preparation for standby mode. */ /* 8. Return all columns to 0 in preparation for standby mode. */

40
firmware/target/arm/imx31/gigabeat-s/button-target.h
View file

@ -31,32 +31,26 @@ void button_power_set_state(bool pressed);
void set_headphones_inserted(bool inserted); void set_headphones_inserted(bool inserted);
bool headphones_inserted(void); bool headphones_inserted(void);
/* Toshiba Gigabeat specific button codes */ /* Toshiba Gigabeat S-specific button codes */
#define BUTTON_BACK (1 << 0) /* These shifts are selected to optimize scanning of the keypad port */
#define BUTTON_MENU (1 << 1) #define BUTTON_LEFT (1 << 0)
#define BUTTON_UP (1 << 1)
#define BUTTON_LEFT (1 << 2) #define BUTTON_DOWN (1 << 2)
#define BUTTON_RIGHT (1 << 3) #define BUTTON_RIGHT (1 << 3)
#define BUTTON_UP (1 << 4) #define BUTTON_SELECT (1 << 4)
#define BUTTON_DOWN (1 << 5) #define BUTTON_BACK (1 << 5)
#define BUTTON_SELECT (1 << 6) #define BUTTON_MENU (1 << 6)
#define BUTTON_VOL_UP (1 << 7)
#define BUTTON_VOL_DOWN (1 << 8)
#define BUTTON_PREV (1 << 9)
#define BUTTON_PLAY (1 << 10)
#define BUTTON_NEXT (1 << 11)
#define BUTTON_POWER (1 << 12) /* Read from PMIC */
#define BUTTON_POWER (1 << 7) #define BUTTON_REMOTE 0
#define BUTTON_VOL_UP (1 << 8)
#define BUTTON_VOL_DOWN (1 << 9)
#define BUTTON_NEXT (1 << 10)
#define BUTTON_PREV (1 << 11)
#define BUTTON_PLAY (1 << 12)
#define BUTTON_MAIN (BUTTON_BACK|BUTTON_MENU|BUTTON_LEFT|BUTTON_RIGHT \ #define POWEROFF_BUTTON BUTTON_POWER
|BUTTON_UP|BUTTON_DOWN|BUTTON_SELECT|BUTTON_POWER \ #define POWEROFF_COUNT 10
|BUTTON_VOL_UP|BUTTON_VOL_DOWN|BUTTON_NEXT|BUTTON_PREV \
|BUTTON_PLAY)
#define BUTTON_REMOTE 0
#define POWEROFF_BUTTON BUTTON_POWER
#define POWEROFF_COUNT 10
#endif /* _BUTTON_TARGET_H_ */ #endif /* _BUTTON_TARGET_H_ */