newer Fuzev2 doesn't seem to use B5 for button light

playing from µSD now works to some degree
database update or copy between the 2 drives lock up

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27496 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Rafaël Carré 2010-07-19 17:12:47 +00:00
parent 08c600ca07
commit c57ba97246
2 changed files with 25 additions and 11 deletions

View file

@ -59,14 +59,20 @@ void _backlight_off(void)
void _buttonlight_on(void)
{
GPIOB_DIR |= 1<<5;
GPIOB_PIN(5) = (1<<5);
buttonlight_is_on = 1;
if (fuzev2_variant == 0)
{
GPIOB_DIR |= 1<<5;
GPIOB_PIN(5) = (1<<5);
buttonlight_is_on = 1;
}
}
void _buttonlight_off(void)
{
GPIOB_PIN(5) = 0;
GPIOB_DIR &= ~(1<<5);
buttonlight_is_on = 0;
if (fuzev2_variant == 0)
{
GPIOB_PIN(5) = 0;
GPIOB_DIR &= ~(1<<5);
buttonlight_is_on = 0;
}
}

View file

@ -430,11 +430,14 @@ static bool send_cmd(const int drive, const int cmd, const int arg, const int fl
/*b31 */ | CMD_DONE_BIT;
#ifdef SANSA_FUZEV2
extern int buttonlight_is_on;
if(buttonlight_is_on)
_buttonlight_on();
else
_buttonlight_off();
if (fuzev2_variant == 0)
{
extern int buttonlight_is_on;
if(buttonlight_is_on)
_buttonlight_on();
else
_buttonlight_off();
}
#endif
wakeup_wait(&command_completion_signal, TIMEOUT_BLOCK);
@ -771,6 +774,11 @@ int sd_init(void)
wakeup_init(&transfer_completion_signal);
wakeup_init(&command_completion_signal);
#ifdef SANSA_FUZEV2
if (fuzev2_variant == 1)
GPIOB_DIR |= 1 << 5;
#endif
#ifdef HAVE_MULTIDRIVE
/* clear previous irq */
GPIOA_IC = EXT_SD_BITS;