nihilazo
/
rockbox
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clipv2: fix buttons broken by me in r31235 

output pins were not correct
xor pin readout with initial value (reversed between the 2 clips)

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31255 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Rafaël Carré 2011-12-14 21:04:04 +00:00
parent b366d63f03
commit 273fbadb55
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
firmware/target/arm/as3525/button-clip.c
View File

@ -30,13 +30,13 @@
#if defined(SANSA_CLIP) #if defined(SANSA_CLIP)
# define OUT_PIN GPIOC_PIN # define OUT_PIN GPIOC_PIN
# define OUT_DIR GPIOC_DIR # define OUT_DIR GPIOC_DIR
# define OUT_INITIAL 0 # define INITIAL 0
# define IN_PIN GPIOB_PIN # define IN_PIN GPIOB_PIN
# define IN_DIR GPIOB_DIR # define IN_DIR GPIOB_DIR
#elif defined(SANSA_CLIPV2) #elif defined(SANSA_CLIPV2)
# define OUT_PIN GPIOD_PIN # define OUT_PIN GPIOD_PIN
# define OUT_DIR GPIOD_DIR # define OUT_DIR GPIOD_DIR
# define OUT_INITIAL 1 # define INITIAL 1
# define IN_PIN GPIOD_PIN # define IN_PIN GPIOD_PIN
# define IN_DIR GPIOD_DIR # define IN_DIR GPIOD_DIR
#endif #endif
@ -45,7 +45,7 @@ static const int rows[3] = {
#if defined(SANSA_CLIP) #if defined(SANSA_CLIP)
4, 5, 6 4, 5, 6
#elif defined(SANSA_CLIPV2) #elif defined(SANSA_CLIPV2)
5, 6, 4 3, 4, 5
#endif #endif
}; };
@ -55,7 +55,7 @@ void button_init_device(void)
IN_DIR &= ~((1<<2) | (1<<1) | (1<<0)); IN_DIR &= ~((1<<2) | (1<<1) | (1<<0));
for (int i = 0; i < 3; i++) { for (int i = 0; i < 3; i++) {
OUT_PIN(rows[i]) = OUT_INITIAL << rows[i]; OUT_PIN(rows[i]) = INITIAL << rows[i];
OUT_DIR |= 1 << rows[i]; OUT_DIR |= 1 << rows[i];
} }
@ -95,16 +95,16 @@ int button_read_device(void)
}; };
for (int i = 0; i<3; i++) for (int i = 0; i<3; i++)
if (IN_PIN(i)) if (IN_PIN(i) ^ (INITIAL << i))
buttons |= matrix[row][i]; buttons |= matrix[row][i];
else else
buttons &= ~matrix[row][i]; buttons &= ~matrix[row][i];
/* prepare next row */ /* prepare next row */
OUT_PIN(rows[row]) = 0 << rows[row]; OUT_PIN(rows[row]) = INITIAL << rows[row];
row++; row++;
row %= 3; row %= 3;
OUT_PIN(rows[row]) = 1 << rows[row]; OUT_PIN(rows[row]) = (!INITIAL) << rows[row];
return buttons; return buttons;
} }