diff options
| author | Frank Gevaerts <frank@gevaerts.be> | 2008-03-10 20:28:59 +0000 |
|---|---|---|
| committer | Frank Gevaerts <frank@gevaerts.be> | 2008-03-10 20:28:59 +0000 |
| commit | 326d0ab8c38290fffe532a7b3181d14af2bb363c (patch) | |
| tree | f575341bc72a47becdd553da6204b42952c56366 | |
| parent | 59b5dfbc7fd79849ff529cc589d9a7d18c2eb2b0 (diff) | |
| download | rockbox-326d0ab8c38290fffe532a7b3181d14af2bb363c.zip rockbox-326d0ab8c38290fffe532a7b3181d14af2bb363c.tar.gz rockbox-326d0ab8c38290fffe532a7b3181d14af2bb363c.tar.bz2 rockbox-326d0ab8c38290fffe532a7b3181d14af2bb363c.tar.xz | |
make usb_serial work again. Also know as "make sure arrays are allocated at their correct size"
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16615 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/debug_menu.c | 4 | ||||
| -rw-r--r-- | firmware/usbstack/usb_core.c | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/apps/debug_menu.c b/apps/debug_menu.c index 3788631..f93755a 100644 --- a/apps/debug_menu.c +++ b/apps/debug_menu.c @@ -2367,7 +2367,7 @@ static bool dbg_scrollwheel(void) } #endif -#if defined(HAVE_USBSTACK) && defined(ROCKBOX_HAS_LOGF) +#if defined(HAVE_USBSTACK) && defined(ROCKBOX_HAS_LOGF) && defined(USB_SERIAL) static bool logf_usb_serial(void) { bool serial_enabled = !usb_core_driver_enabled(USB_DRIVER_SERIAL); @@ -2457,7 +2457,7 @@ static const struct the_menu_item menuitems[] = { {"logf", logfdisplay }, {"logfdump", logfdump }, #endif -#if defined(HAVE_USBSTACK) && defined(ROCKBOX_HAS_LOGF) +#if defined(HAVE_USBSTACK) && defined(ROCKBOX_HAS_LOGF) && defined(USB_SERIAL) {"logf over usb",logf_usb_serial }, #endif #ifdef CPU_BOOST_LOGGING diff --git a/firmware/usbstack/usb_core.c b/firmware/usbstack/usb_core.c index ff54e42..e0aaa9b 100644 --- a/firmware/usbstack/usb_core.c +++ b/firmware/usbstack/usb_core.c @@ -183,10 +183,10 @@ static enum { DEFAULT, ADDRESS, CONFIGURED } usb_state; static int usb_core_num_interfaces; -int usb_charging_get_config_descriptor(unsigned char *dest,int max_packet_size, - int interface_number,int endpoint); +static int usb_charging_get_config_descriptor(unsigned char *dest,int max_packet_size, + int interface_number,int endpoint); -struct usb_class_driver drivers[] = +static struct usb_class_driver drivers[USB_NUM_DRIVERS] = { #ifdef USB_STORAGE [USB_DRIVER_MASS_STORAGE] = { @@ -325,7 +325,7 @@ void usb_core_init(void) logf("usb_core_init() finished"); } -int usb_charging_get_config_descriptor(unsigned char *dest,int max_packet_size, +static int usb_charging_get_config_descriptor(unsigned char *dest,int max_packet_size, int interface_number,int endpoint) { (void) max_packet_size; |