API: Teach the storage layer about SATA and MMC options.

Signed-off-by: Rafal Czubak <rcz@semihalf.com>
Acked-by: Rafal Jaworowski <raj@semihalf.com>

diff --git a/api/api_storage.c b/api/api_storage.c
index 874c538eb3b2d7e76708b168ba930aa79601ff3c..74391a59d083108ed4c19b6b34dd1e095f82489a 100644 (file)
--- a/api/api_storage.c
+++ b/api/api_storage.c
@@ -46,7 +46,8 @@
 #define ENUM_USB       1
 #define ENUM_SCSI      2
 #define ENUM_MMC       3
-#define ENUM_MAX       4
+#define ENUM_SATA      4
+#define ENUM_MAX       5
 
 struct stor_spec {
        int             max_dev;
@@ -68,12 +69,19 @@ void dev_stor_init(void)
        specs[ENUM_IDE].type = DEV_TYP_STOR | DT_STOR_IDE;
        specs[ENUM_IDE].name = "ide";
 #endif
-#if defined(CONFIG_CMD_USB)
-       specs[ENUM_USB].max_dev = USB_MAX_STOR_DEV;
-       specs[ENUM_USB].enum_started = 0;
-       specs[ENUM_USB].enum_ended = 0;
-       specs[ENUM_USB].type = DEV_TYP_STOR | DT_STOR_USB;
-       specs[ENUM_USB].name = "usb";
+#if defined(CONFIG_CMD_MMC)
+       specs[ENUM_MMC].max_dev = CFG_MMC_MAX_DEVICE;
+       specs[ENUM_MMC].enum_started = 0;
+       specs[ENUM_MMC].enum_ended = 0;
+       specs[ENUM_MMC].type = DEV_TYP_STOR | DT_STOR_MMC;
+       specs[ENUM_MMC].name = "mmc";
+#endif
+#if defined(CONFIG_CMD_SATA)
+       specs[ENUM_SATA].max_dev = CFG_SATA_MAX_DEVICE;
+       specs[ENUM_SATA].enum_started = 0;
+       specs[ENUM_SATA].enum_ended = 0;
+       specs[ENUM_SATA].type = DEV_TYP_STOR | DT_STOR_SATA;
+       specs[ENUM_SATA].name = "sata";
 #endif
 #if defined(CONFIG_CMD_SCSI)
        specs[ENUM_SCSI].max_dev = CFG_SCSI_MAX_DEVICE;
@@ -82,6 +90,13 @@ void dev_stor_init(void)
        specs[ENUM_SCSI].type = DEV_TYP_STOR | DT_STOR_SCSI;
        specs[ENUM_SCSI].name = "scsi";
 #endif
+#if defined(CONFIG_CMD_USB) && defined(CONFIG_USB_STORAGE)
+       specs[ENUM_USB].max_dev = USB_MAX_STOR_DEV;
+       specs[ENUM_USB].enum_started = 0;
+       specs[ENUM_USB].enum_ended = 0;
+       specs[ENUM_USB].type = DEV_TYP_STOR | DT_STOR_USB;
+       specs[ENUM_USB].name = "usb";
+#endif
 }
 
 /*

diff --git a/api_examples/demo.c b/api_examples/demo.c
index a8424482ee1251d41c1dd4a220306f7a152a99be..69ac318375a7c2afc6b94eed97f140c05ccce66c 100644 (file)
--- a/api_examples/demo.c
+++ b/api_examples/demo.c
@@ -226,20 +226,23 @@ void test_dump_si(struct sys_info *si)
        }
 }
 
-static char * test_stor_typ(int type)
+static char *test_stor_typ(int type)
 {
        if (type & DT_STOR_IDE)
                return "IDE";
 
+       if (type & DT_STOR_MMC)
+               return "MMC";
+
+       if (type & DT_STOR_SATA)
+               return "SATA";
+
        if (type & DT_STOR_SCSI)
                return "SCSI";
 
        if (type & DT_STOR_USB)
                return "USB";
 
-       if (type & DT_STOR_MMC);
-               return "MMC";
-
        return "Unknown";
 }
 

diff --git a/include/api_public.h b/include/api_public.h
index 9bc0501334a713760f4d5d3d30c2182c60a2fe66..5b0c09e3108a1a063c786b53a4df4f2e8b241799 100644 (file)
--- a/include/api_public.h
+++ b/include/api_public.h
@@ -126,6 +126,7 @@ typedef unsigned long lbastart_t;
 #define DT_STOR_SCSI   0x0020
 #define DT_STOR_USB    0x0040
 #define DT_STOR_MMC    0x0080
+#define DT_STOR_SATA   0x0100
 
 #define DEV_STA_CLOSED 0x0000          /* invalid, closed */
 #define DEV_STA_OPEN   0x0001          /* open i.e. active */