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

some fixes for Ondio USB passthrough (but still doesn't work yet)

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5067 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jörg Hohensohn 2004-09-11 15:18:10 +00:00
parent 00be7469d6
commit c4e8bed5a7
2 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

21
firmware/drivers/ata_mmc.c
View file

@ -242,7 +242,17 @@ int ata_soft_reset(void)
void ata_enable(bool on) void ata_enable(bool on)
{ {
(void)on; PBCR1 &= ~0x0C00; /* use PB13 as GPIO, if not modified below */
if (on)
{
/* serial setup */
PBCR1 |= 0x0800; /* as SCK1 */
}
else
{
PBDR |= 0x2000; /* drive PB13 high */
PBIOR |= 0x2000; /* output PB13 */
}
} }
unsigned short* ata_get_identify(void) unsigned short* ata_get_identify(void)
@ -261,19 +271,14 @@ int ata_init(void)
/* Port setup */ /* Port setup */
PADR |= 0x1600; /* set all the selects high (=inactive) */ PADR |= 0x1600; /* set all the selects high (=inactive) */
PAIOR |= 0x1600; /* make outputs for them */ PAIOR |= 0x1600; /* make outputs for them */
PAIOR &= ~0x0008; /* input for card detect */
/* serial setup */
PBCR1 &= ~0x0CF0; /* use PB10, PB11, PB13 */
PBCR1 |= 0x08A0; /* as RxD1, TxD1, SCK1 */
if(adc_read(ADC_MMC_SWITCH) < 0x200) if(adc_read(ADC_MMC_SWITCH) < 0x200)
{ /* MMC inserted */ { /* MMC inserted */
PADR |= 0x0200; PADR &= ~0x1000; /* clear PA12 */
} }
else else
{ /* no MMC, use internal memory */ { /* no MMC, use internal memory */
PADR |= 0x0400; PADR |= 0x1000; /* set PA12 */
} }
sleeping = false; sleeping = false;

9
firmware/usb.c
View file

@ -72,11 +72,6 @@ static bool usb_monitor_enabled;
static void usb_enable(bool on) static void usb_enable(bool on)
{ {
#ifdef HAVE_LCD_BITMAP
if(read_hw_mask() & USB_ACTIVE_HIGH)
on = !on;
#endif
#ifdef USB_ENABLE_ONDIOSTYLE #ifdef USB_ENABLE_ONDIOSTYLE
if(on) if(on)
{ {
@ -88,6 +83,10 @@ static void usb_enable(bool on)
} }
or_b(0x20, &PAIORL); /* output for USB enable */ or_b(0x20, &PAIORL); /* output for USB enable */
#else /* standard HD Jukebox */ #else /* standard HD Jukebox */
#ifdef HAVE_LCD_BITMAP
if(read_hw_mask() & USB_ACTIVE_HIGH)
on = !on;
#endif
if(on) if(on)
{ {
and_b(~0x04, &PADRH); /* enable USB */ and_b(~0x04, &PADRH); /* enable USB */