diff options
| author | Peter D'Hoye <peter.dhoye@gmail.com> | 2007-08-28 21:32:28 +0000 |
|---|---|---|
| committer | Peter D'Hoye <peter.dhoye@gmail.com> | 2007-08-28 21:32:28 +0000 |
| commit | f2bf042edfef57e499b4d18694acca92d435d447 (patch) | |
| tree | 6316afa3feda40591657f14acebc464f3fe40e0d | |
| parent | 4474d6827c5f08bd0e9a9ba91fc8bf149df21d28 (diff) | |
Remove a warning when building the stack and add some comment in the ifdef hell
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14494 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | firmware/target/arm/usb-fw-pp502x.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/firmware/target/arm/usb-fw-pp502x.c b/firmware/target/arm/usb-fw-pp502x.c index e76c2509ad..76bd7281f5 100644 --- a/firmware/target/arm/usb-fw-pp502x.c +++ b/firmware/target/arm/usb-fw-pp502x.c @@ -91,7 +91,9 @@ void usb_init_device(void) void usb_enable(bool on) { -#ifndef HAVE_USBSTACK +#ifdef HAVE_USBSTACK + (void)on; +#else /* This device specific code will eventually give way to proper USB handling, which should be the same for all PP502x targets. */ if (on) @@ -102,7 +104,7 @@ void usb_enable(bool on) #if defined(IRIVER_H10) || defined (IRIVER_H10_5GB) if(button_status()==BUTTON_RIGHT) -#endif +#endif /* defined(IRIVER_H10) || defined (IRIVER_H10_5GB) */ { ata_sleepnow(); /* Immediately spindown the disk. */ sleep(HZ*2); @@ -112,14 +114,14 @@ void usb_enable(bool on) memcpy((void *)0x40017f00, "diskmode\0\0hotstuff\0\0\1", 21); #elif CONFIG_CPU == PP5022 memcpy((void *)0x4001ff00, "diskmode\0\0hotstuff\0\0\1", 21); -#endif -#endif +#endif /* CONFIG_CPU */ +#endif /* IPOD_ARCH */ system_reboot(); /* Reboot */ } -#endif +#endif /*defined(IPOD_ARCH) || defined(IRIVER_H10) || defined (IRIVER_H10_5GB)*/ } -#endif +#endif /* !HAVE_USBSTACK */ } bool usb_detect(void) |