From 2f8a0081c64534da23fc0fa9cc685eb7454fd9c9 Mon Sep 17 00:00:00 2001 From: Frank Gevaerts Date: Sat, 1 Nov 2008 16:14:28 +0000 Subject: Apply FS#9500. This adds a storage_*() abstraction to replace ata_*(). To do that, it also introduces sd_*, nand_*, and mmc_*. This should be a good first step to allow multi-driver targets, like the Elio (ATA/SD), or the D2 (NAND/SD). git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18960 a1c6a512-1295-4272-9138-f99709370657 --- firmware/usbstack/usb_core.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'firmware/usbstack/usb_core.c') diff --git a/firmware/usbstack/usb_core.c b/firmware/usbstack/usb_core.c index fa0ff5ea04..7724049415 100644 --- a/firmware/usbstack/usb_core.c +++ b/firmware/usbstack/usb_core.c @@ -50,7 +50,7 @@ #include "as3514.h" #endif -#if !defined(HAVE_AS3514) && !defined(IPOD_ARCH) +#if !defined(HAVE_AS3514) && !defined(IPOD_ARCH) && (CONFIG_STORAGE & STORAGE_ATA) #include "ata.h" #endif @@ -281,7 +281,7 @@ static void set_serial_descriptor(void) } usb_string_iSerial.bLength=68; } -#else +#elif (CONFIG_STORAGE & STORAGE_ATA) /* If we don't know the device serial number, use the one * from the disk */ static void set_serial_descriptor(void) @@ -300,6 +300,8 @@ static void set_serial_descriptor(void) } usb_string_iSerial.bLength=84; } +#else +#error No set_serial_descriptor() implementation for this target #endif void usb_core_init(void) -- cgit v1.2.3