summaryrefslogtreecommitdiffstats
path: root/firmware/target/arm
diff options
context:
space:
mode:
authorFrank Gevaerts <frank@gevaerts.be>2008-03-01 16:33:54 +0000
committerFrank Gevaerts <frank@gevaerts.be>2008-03-01 16:33:54 +0000
commit7d81e7c8667b986a145d1a7041cf51b419e370a7 (patch)
tree41991bde42f59def29f62c76d09e612189b65d77 /firmware/target/arm
parentb792c5577c5f936a7393f912ead5b7197e3ac9e7 (diff)
downloadrockbox-7d81e7c8667b986a145d1a7041cf51b419e370a7.tar.gz
rockbox-7d81e7c8667b986a145d1a7041cf51b419e370a7.zip
remove the #ifdef CONFIG_CPU == PP5020 around DEV_INIT2 |= INIT_USB. It shouldn't be needed
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16465 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm')
-rw-r--r--firmware/target/arm/usb-fw-pp502x.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/firmware/target/arm/usb-fw-pp502x.c b/firmware/target/arm/usb-fw-pp502x.c
index e0558a1900..aa557cbbeb 100644
--- a/firmware/target/arm/usb-fw-pp502x.c
+++ b/firmware/target/arm/usb-fw-pp502x.c
@@ -44,9 +44,7 @@ void usb_init_device(void)
DEV_RS |= DEV_USB1;
DEV_RS &=~DEV_USB1;
-#if CONFIG_CPU == PP5020
DEV_INIT2 |= INIT_USB;
-#endif
while ((inl(0x70000028) & 0x80) == 0);
outl(inl(0x70000028) | 0x2, 0x70000028);
@@ -55,9 +53,7 @@ void usb_init_device(void)
/* disable USB-devices until USB is detected via GPIO */
DEV_EN &= ~DEV_USB0;
DEV_EN &= ~DEV_USB1;
-#if CONFIG_CPU == PP5020
DEV_INIT2 &= ~INIT_USB;
-#endif
#if defined(IPOD_COLOR) || defined(IPOD_4G) \
|| defined(IPOD_MINI) || defined(IPOD_MINI2G)
@@ -75,9 +71,7 @@ void usb_enable(bool on)
DEV_RS &=~DEV_USB0;
DEV_EN |= DEV_USB1;
DEV_RS &=~DEV_USB1;
-#if CONFIG_CPU == PP5020
DEV_INIT2 |= INIT_USB;
-#endif
usb_core_init();
}
else {
@@ -85,9 +79,7 @@ void usb_enable(bool on)
/* Disable USB devices */
DEV_EN &=~ DEV_USB0;
DEV_EN &=~ DEV_USB1;
-#if CONFIG_CPU == PP5020
DEV_INIT2 &=~ INIT_USB;
-#endif
}
}