summaryrefslogtreecommitdiff
path: root/payloads/libpayload/include/usb
diff options
context:
space:
mode:
authorJulius Werner <jwerner@chromium.org>2014-05-02 16:35:50 -0700
committerMarc Jones <marc.jones@se-eng.com>2014-12-30 19:01:14 +0100
commite30e4e7efa8c56b134e85f235c8f315a6a2b583b (patch)
treec2b4eb3ba3b0f82189c79dd71a1ccadb48fc3316 /payloads/libpayload/include/usb
parent7124788b335b88c913b04802ddd84db0c438ccc0 (diff)
libpayload: usbmsc: Implement limited LUN support
I always thought the support for multiple logical SCSI units in the USB mass storage class was a dead feature. Turns out that it's actually used by SD card readers that provide multiple slots (e.g. one regular sized and one micro-SD). Implementing perfect support for that would require a major redesign of the whole MSC stack, since the one device -> one disk assumption is deeply embedded in our data structures. Instead, this patch implements a poor man's LUN support that will just cycle through all available LUNs (in multiple calls to usb_msc_poll()) until it finds a connected device. This should be reasonable enough to allow these card readers to be usable while only requiring superficial changes. Also removes the unused 'protocol' attribute of usb_msc_inst_t. BRANCH=rambi?,nyan BUG=chrome-os-partner:28437 TEST=Alternatively plug an SD or micro-SD card (or both) into my card reader, confirm that one of them is correctly detected at all times. Original-Change-Id: I3df4ca88afe2dcf7928b823aa2a73c2b0f599cf2 Original-Signed-off-by: Julius Werner <jwerner@chromium.org> Original-Reviewed-on: https://chromium-review.googlesource.com/198101 Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org> (cherry picked from commit 960534a20e4334772c29355bb0d310b3f41b31ee) Signed-off-by: Marc Jones <marc.jones@se-eng.com> Change-Id: I39909fc96e32c9a5d76651d91c2b5c16c89ace9e Reviewed-on: http://review.coreboot.org/7904 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Diffstat (limited to 'payloads/libpayload/include/usb')
-rw-r--r--payloads/libpayload/include/usb/usbmsc.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/payloads/libpayload/include/usb/usbmsc.h b/payloads/libpayload/include/usb/usbmsc.h
index 8930156619..f4562a56d5 100644
--- a/payloads/libpayload/include/usb/usbmsc.h
+++ b/payloads/libpayload/include/usb/usbmsc.h
@@ -32,11 +32,12 @@
typedef struct {
unsigned int blocksize;
unsigned int numblocks;
- unsigned int protocol;
endpoint_t *bulk_in;
endpoint_t *bulk_out;
- int usbdisk_created;
- int ready;
+ u8 usbdisk_created;
+ s8 ready;
+ u8 lun;
+ u8 num_luns;
void *data; /* For use by consumers of libpayload. */
} usbmsc_inst_t;