diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/usbstack/usb_storage.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/firmware/usbstack/usb_storage.c b/firmware/usbstack/usb_storage.c index 714af9d535..81d90d01db 100644 --- a/firmware/usbstack/usb_storage.c +++ b/firmware/usbstack/usb_storage.c | |||
@@ -425,17 +425,20 @@ int usb_storage_get_config_descriptor(unsigned char *dest,int max_packet_size) | |||
425 | 425 | ||
426 | return (dest - orig_dest); | 426 | return (dest - orig_dest); |
427 | } | 427 | } |
428 | 428 | #if (CONFIG_CPU == IMX31L || defined(CPU_TCC780X) || \ | |
429 | static int usb_handle; | 429 | CONFIG_CPU == S5L8702 || CONFIG_CPU == S5L8701 || CONFIG_CPU == AS3525v2 || \ |
430 | defined(BOOTLOADER) || CONFIG_CPU == DM320) && !defined(CPU_PP502x) | ||
431 | #define USB_STATIC_ALLOC | ||
432 | #else | ||
433 | static int usb_handle = 0; | ||
434 | #endif | ||
430 | void usb_storage_init_connection(void) | 435 | void usb_storage_init_connection(void) |
431 | { | 436 | { |
432 | logf("ums: set config"); | 437 | logf("ums: set config"); |
433 | /* prime rx endpoint. We only need room for commands */ | 438 | /* prime rx endpoint. We only need room for commands */ |
434 | state = WAITING_FOR_COMMAND; | 439 | state = WAITING_FOR_COMMAND; |
435 | 440 | ||
436 | #if (CONFIG_CPU == IMX31L || defined(CPU_TCC780X) || \ | 441 | #ifdef USB_STATIC_ALLOC |
437 | CONFIG_CPU == S5L8702 || CONFIG_CPU == S5L8701 || CONFIG_CPU == AS3525v2 || \ | ||
438 | defined(BOOTLOADER) || CONFIG_CPU == DM320) && !defined(CPU_PP502x) | ||
439 | static unsigned char _cbw_buffer[MAX_CBW_SIZE] | 442 | static unsigned char _cbw_buffer[MAX_CBW_SIZE] |
440 | USB_DEVBSS_ATTR __attribute__((aligned(32))); | 443 | USB_DEVBSS_ATTR __attribute__((aligned(32))); |
441 | cbw_buffer = (void *)_cbw_buffer; | 444 | cbw_buffer = (void *)_cbw_buffer; |
@@ -480,7 +483,9 @@ void usb_storage_init_connection(void) | |||
480 | 483 | ||
481 | void usb_storage_disconnect(void) | 484 | void usb_storage_disconnect(void) |
482 | { | 485 | { |
486 | #ifndef USB_STATIC_ALLOC | ||
483 | usb_handle = core_free(usb_handle); | 487 | usb_handle = core_free(usb_handle); |
488 | #endif | ||
484 | } | 489 | } |
485 | 490 | ||
486 | /* called by usb_core_transfer_complete() */ | 491 | /* called by usb_core_transfer_complete() */ |