diff options
| author | Frank Gevaerts <frank@gevaerts.be> | 2012-01-04 22:07:09 +0000 |
|---|---|---|
| committer | Frank Gevaerts <frank@gevaerts.be> | 2012-01-04 22:07:09 +0000 |
| commit | 57f8ae847c8cb123c0910ca068fead22a439d3de (patch) | |
| tree | 68e347665beac5ccf5fbe82f10497bf6fbedc17e /firmware/usb.c | |
| parent | 4fcffcbdf34fc7a619c0626f8478cf06cdf1a043 (diff) | |
| download | rockbox-57f8ae847c8cb123c0910ca068fead22a439d3de.tar.gz rockbox-57f8ae847c8cb123c0910ca068fead22a439d3de.tar.bz2 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/usb.c')
| -rw-r--r-- | firmware/usb.c | 6 |
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; /* We assume that the USB cable is extracted */ static int usb_state = USB_EXTRACTED; -static bool usb_host_present = false; -static int usb_num_acks_to_expect = 0; -static long usb_last_broadcast_tick = 0; #if (CONFIG_STORAGE & STORAGE_MMC) && defined(USB_FULL_INIT) && !defined(HAVE_USBSTACK) static int usb_mmc_countdown = 0; #endif @@ -84,6 +81,9 @@ static bool usb_hid = true; #endif #ifdef USB_FULL_INIT +static bool usb_host_present = false; +static int usb_num_acks_to_expect = 0; +static long usb_last_broadcast_tick = 0; #if defined(USB_FIREWIRE_HANDLING) \ || (defined(HAVE_USBSTACK) && !defined(USE_ROCKBOX_USB)) |