diff options
author | Frank Gevaerts <frank@gevaerts.be> | 2008-03-01 16:33:54 +0000 |
---|---|---|
committer | Frank Gevaerts <frank@gevaerts.be> | 2008-03-01 16:33:54 +0000 |
commit | 7d81e7c8667b986a145d1a7041cf51b419e370a7 (patch) | |
tree | 41991bde42f59def29f62c76d09e612189b65d77 /firmware | |
parent | b792c5577c5f936a7393f912ead5b7197e3ac9e7 (diff) | |
download | rockbox-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')
-rw-r--r-- | firmware/target/arm/usb-fw-pp502x.c | 8 |
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) | |||
44 | DEV_RS |= DEV_USB1; | 44 | DEV_RS |= DEV_USB1; |
45 | DEV_RS &=~DEV_USB1; | 45 | DEV_RS &=~DEV_USB1; |
46 | 46 | ||
47 | #if CONFIG_CPU == PP5020 | ||
48 | DEV_INIT2 |= INIT_USB; | 47 | DEV_INIT2 |= INIT_USB; |
49 | #endif | ||
50 | 48 | ||
51 | while ((inl(0x70000028) & 0x80) == 0); | 49 | while ((inl(0x70000028) & 0x80) == 0); |
52 | outl(inl(0x70000028) | 0x2, 0x70000028); | 50 | outl(inl(0x70000028) | 0x2, 0x70000028); |
@@ -55,9 +53,7 @@ void usb_init_device(void) | |||
55 | /* disable USB-devices until USB is detected via GPIO */ | 53 | /* disable USB-devices until USB is detected via GPIO */ |
56 | DEV_EN &= ~DEV_USB0; | 54 | DEV_EN &= ~DEV_USB0; |
57 | DEV_EN &= ~DEV_USB1; | 55 | DEV_EN &= ~DEV_USB1; |
58 | #if CONFIG_CPU == PP5020 | ||
59 | DEV_INIT2 &= ~INIT_USB; | 56 | DEV_INIT2 &= ~INIT_USB; |
60 | #endif | ||
61 | 57 | ||
62 | #if defined(IPOD_COLOR) || defined(IPOD_4G) \ | 58 | #if defined(IPOD_COLOR) || defined(IPOD_4G) \ |
63 | || defined(IPOD_MINI) || defined(IPOD_MINI2G) | 59 | || defined(IPOD_MINI) || defined(IPOD_MINI2G) |
@@ -75,9 +71,7 @@ void usb_enable(bool on) | |||
75 | DEV_RS &=~DEV_USB0; | 71 | DEV_RS &=~DEV_USB0; |
76 | DEV_EN |= DEV_USB1; | 72 | DEV_EN |= DEV_USB1; |
77 | DEV_RS &=~DEV_USB1; | 73 | DEV_RS &=~DEV_USB1; |
78 | #if CONFIG_CPU == PP5020 | ||
79 | DEV_INIT2 |= INIT_USB; | 74 | DEV_INIT2 |= INIT_USB; |
80 | #endif | ||
81 | usb_core_init(); | 75 | usb_core_init(); |
82 | } | 76 | } |
83 | else { | 77 | else { |
@@ -85,9 +79,7 @@ void usb_enable(bool on) | |||
85 | /* Disable USB devices */ | 79 | /* Disable USB devices */ |
86 | DEV_EN &=~ DEV_USB0; | 80 | DEV_EN &=~ DEV_USB0; |
87 | DEV_EN &=~ DEV_USB1; | 81 | DEV_EN &=~ DEV_USB1; |
88 | #if CONFIG_CPU == PP5020 | ||
89 | DEV_INIT2 &=~ INIT_USB; | 82 | DEV_INIT2 &=~ INIT_USB; |
90 | #endif | ||
91 | } | 83 | } |
92 | } | 84 | } |
93 | 85 | ||