Fix r29053 red and a leftover use of 'usb' variable as a bool rather than int in main-pp.c.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29054 a1c6a512-1295-4272-9138-f99709370657

firmware/target/arm/iriver/usb-target.h

@@ -25,5 +25,7 @@
 #define USB_TARGET_H
 
 bool usb_init_device(void);
+void usb_pin_init(void); /* Init the GPIO input only */
+bool usb_plugged(void); /* Returns instantaneous state - always */
 
 #endif

firmware/target/arm/tms320dm320/system-target.h

@@ -35,9 +35,10 @@ void dm320_set_io (char pin_num, bool input, bool invert, bool irq, bool irqany,
                     bool chat, char func_num );
 
 #if defined(CREATIVE_ZVx) && defined(BOOTLOADER)
+    /* hacky.. */
 #define SLEEP_KERNEL_HOOK(ticks) \
-    ({ \    /* hacky.. */
-    long _sleep_ticks = current_tick + ticks + 1; \
+    ({                                              \
+    long _sleep_ticks = current_tick + (ticks) + 1; \
     while (TIME_BEFORE(current_tick, _sleep_ticks)) \
         switch_thread(); \
     true; }) /* handled here */

firmware/target/arm/usb-fw-pp5002.c

@@ -75,4 +75,4 @@ int usb_detect(void)
 }
 
 /* No different for now */
-void usb_plugged(void) __attribute__((alias("usb_detect")));
+bool usb_plugged(void) __attribute__((alias("usb_detect")));