summaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
authorFrank Gevaerts <frank@gevaerts.be>2012-01-04 22:07:09 +0000
committerFrank Gevaerts <frank@gevaerts.be>2012-01-04 22:07:09 +0000
commit57f8ae847c8cb123c0910ca068fead22a439d3de (patch)
tree68e347665beac5ccf5fbe82f10497bf6fbedc17e /firmware
parent4fcffcbdf34fc7a619c0626f8478cf06cdf1a043 (diff)
downloadrockbox-57f8ae847c8cb123c0910ca068fead22a439d3de.tar.gz
rockbox-57f8ae847c8cb123c0910ca068fead22a439d3de.zip
Move some variable declarations to inside #ifdef USB_FULL_INIT, to avoid warnings for bootloaders that don't have the full USB state machine
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31583 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/usb.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/firmware/usb.c b/firmware/usb.c
index 436b840a13..c69db4039b 100644
--- a/firmware/usb.c
+++ b/firmware/usb.c
@@ -63,9 +63,6 @@ bool do_screendump_instead_of_usb = false;
63 63
64/* We assume that the USB cable is extracted */ 64/* We assume that the USB cable is extracted */
65static int usb_state = USB_EXTRACTED; 65static int usb_state = USB_EXTRACTED;
66static bool usb_host_present = false;
67static int usb_num_acks_to_expect = 0;
68static long usb_last_broadcast_tick = 0;
69#if (CONFIG_STORAGE & STORAGE_MMC) && defined(USB_FULL_INIT) && !defined(HAVE_USBSTACK) 66#if (CONFIG_STORAGE & STORAGE_MMC) && defined(USB_FULL_INIT) && !defined(HAVE_USBSTACK)
70static int usb_mmc_countdown = 0; 67static int usb_mmc_countdown = 0;
71#endif 68#endif
@@ -84,6 +81,9 @@ static bool usb_hid = true;
84#endif 81#endif
85 82
86#ifdef USB_FULL_INIT 83#ifdef USB_FULL_INIT
84static bool usb_host_present = false;
85static int usb_num_acks_to_expect = 0;
86static long usb_last_broadcast_tick = 0;
87 87
88#if defined(USB_FIREWIRE_HANDLING) \ 88#if defined(USB_FIREWIRE_HANDLING) \
89 || (defined(HAVE_USBSTACK) && !defined(USE_ROCKBOX_USB)) 89 || (defined(HAVE_USBSTACK) && !defined(USE_ROCKBOX_USB))