api: Use hashtable function for API_env_enum

[u-boot] / api / api_storage.c

diff --git a/api/api_storage.c b/api/api_storage.c
index ec92ae48d1c21fcc5ffae88bc42d9167171fa9ed..bd4314472130c1e1fdb616aef177464b4a58df0a 100644 (file)
--- a/api/api_storage.c
+++ b/api/api_storage.c
@@ -37,11 +37,11 @@ struct stor_spec {
        int             max_dev;
        int             enum_started;
        int             enum_ended;
-       int             type;           /* "external" type: DT_STOR_{IDE,USB,etc} */
+       int             type;   /* "external" type: DT_STOR_{IDE,USB,etc} */
        char            *name;
 };
 
-static struct stor_spec specs[ENUM_MAX] = { { 0, 0, 0, 0, "" }, };
+static struct stor_spec specs[ENUM_MAX] = { { 0, 0, 0, 0, NULL }, };
 
 
 void dev_stor_init(void)
@@ -67,7 +67,7 @@ void dev_stor_init(void)
        specs[ENUM_SATA].type = DEV_TYP_STOR | DT_STOR_SATA;
        specs[ENUM_SATA].name = "sata";
 #endif
-#if defined(CONFIG_CMD_SCSI)
+#if defined(CONFIG_SCSI)
        specs[ENUM_SCSI].max_dev = CONFIG_SYS_SCSI_MAX_DEVICE;
        specs[ENUM_SCSI].enum_started = 0;
        specs[ENUM_SCSI].enum_ended = 0;
@@ -103,25 +103,34 @@ static int dev_stor_get(int type, int first, int *more, struct device_info *di)
 
        int i;
 
-       block_dev_desc_t *dd;
+       struct blk_desc *dd;
+
+       /* Wasn't configured for this type, return 0 directly */
+       if (specs[type].name == NULL)
+               return 0;
 
        if (first) {
-               di->cookie = (void *)get_dev(specs[type].name, 0);
+               di->cookie = (void *)blk_get_dev(specs[type].name, 0);
                if (di->cookie == NULL)
                        return 0;
                else
                        found = 1;
 
-               /* provide hint if there are more devices in
-                * this group to enumerate */
+               /*
+                * provide hint if there are more devices in
+                * this group to enumerate
+                */
                if (1 < specs[type].max_dev)
                        *more = 1;
 
        } else {
                for (i = 0; i < specs[type].max_dev; i++)
-                       if (di->cookie == (void *)get_dev(specs[type].name, i)) {
-                               /* previous cookie found -- advance to the
-                                * next device, if possible */
+                       if (di->cookie ==
+                           (void *)blk_get_dev(specs[type].name, i)) {
+                               /*
+                                * previous cookie found -- advance to the
+                                * next device, if possible
+                                */
 
                                if (++i >= specs[type].max_dev) {
                                        /* out of range, no more to enum */
@@ -129,14 +138,17 @@ static int dev_stor_get(int type, int first, int *more, struct device_info *di)
                                        break;
                                }
 
-                               di->cookie = (void *)get_dev(specs[type].name, i);
+                               di->cookie = (void *)blk_get_dev(
+                                                       specs[type].name, i);
                                if (di->cookie == NULL)
                                        return 0;
                                else
                                        found = 1;
 
-                               /* provide hint if there are more devices in
-                                * this group to enumerate */
+                               /*
+                                * provide hint if there are more devices in
+                                * this group to enumerate
+                                */
                                if ((i + 1) < specs[type].max_dev)
                                        *more = 1;
 
@@ -148,7 +160,7 @@ static int dev_stor_get(int type, int first, int *more, struct device_info *di)
                di->type = specs[type].type;
 
                if (di->cookie != NULL) {
-                       dd = (block_dev_desc_t *)di->cookie;
+                       dd = (struct blk_desc *)di->cookie;
                        if (dd->type == DEV_TYPE_UNKNOWN) {
                                debugf("device instance exists, but is not active..");
                                found = 0;
@@ -165,25 +177,23 @@ static int dev_stor_get(int type, int first, int *more, struct device_info *di)
 }
 
 
-/*
- * returns:    ENUM_IDE, ENUM_USB etc. based on block_dev_desc_t
- */
-static int dev_stor_type(block_dev_desc_t *dd)
+/* returns: ENUM_IDE, ENUM_USB etc. based on struct blk_desc */
+
+static int dev_stor_type(struct blk_desc *dd)
 {
        int i, j;
 
        for (i = ENUM_IDE; i < ENUM_MAX; i++)
                for (j = 0; j < specs[i].max_dev; j++)
-                       if (dd == get_dev(specs[i].name, j))
+                       if (dd == blk_get_dev(specs[i].name, j))
                                return i;
 
        return ENUM_MAX;
 }
 
 
-/*
- * returns:    0/1 whether cookie points to some device in this group
- */
+/* returns: 0/1 whether cookie points to some device in this group */
+
 static int dev_is_stor(int type, struct device_info *di)
 {
        return (dev_stor_type(di->cookie) == type) ? 1 : 0;
@@ -214,7 +224,6 @@ static int dev_enum_stor(int type, struct device_info *di)
         */
 
        if (di->cookie == NULL) {
-
                debugf("group%d - enum restart\n", type);
 
                /*
@@ -225,7 +234,6 @@ static int dev_enum_stor(int type, struct device_info *di)
                specs[type].enum_started = 1;
 
        } else if (dev_is_stor(type, di)) {
-
                debugf("group%d - enum continued for the next device\n", type);
 
                if (specs[type].enum_ended) {
@@ -237,7 +245,6 @@ static int dev_enum_stor(int type, struct device_info *di)
                found = dev_stor_get(type, 0, &more, di);
 
        } else {
-
                if (specs[type].enum_ended) {
                        debugf("group %d - already enumerated, skipping\n", type);
                        return 0;
@@ -249,7 +256,7 @@ static int dev_enum_stor(int type, struct device_info *di)
                        /*
                         * 2b.  If enumerating devices in this group did not
                         * happen before, it means the cookie pointed to a
-                        * device frome some other group (another storage
+                        * device from some other group (another storage
                         * group, or network); in this case try to take the
                         * first available device from our group
                         */
@@ -276,7 +283,7 @@ static int dev_enum_stor(int type, struct device_info *di)
 
        if (found)
                debugf("device found, returning cookie 0x%08x\n",
-                       (u_int32_t)di->cookie);
+                      (u_int32_t)di->cookie);
        else
                debugf("no device found\n");
 
@@ -297,9 +304,7 @@ int dev_enum_storage(struct device_info *di)
 {
        int i;
 
-       /*
-        * check: ide, usb, scsi, mmc
-        */
+       /* check: ide, usb, scsi, mmc */
        for (i = ENUM_IDE; i < ENUM_MAX; i ++) {
                if (dev_enum_stor(i, di))
                        return 1;
@@ -308,12 +313,12 @@ int dev_enum_storage(struct device_info *di)
        return 0;
 }
 
-static int dev_stor_is_valid(int type, block_dev_desc_t *dd)
+static int dev_stor_is_valid(int type, struct blk_desc *dd)
 {
        int i;
 
        for (i = 0; i < specs[type].max_dev; i++)
-               if (dd == get_dev(specs[type].name, i))
+               if (dd == blk_get_dev(specs[type].name, i))
                        if (dd->type != DEV_TYPE_UNKNOWN)
                                return 1;
 
@@ -328,7 +333,7 @@ int dev_open_stor(void *cookie)
        if (type == ENUM_MAX)
                return API_ENODEV;
 
-       if (dev_stor_is_valid(type, (block_dev_desc_t *)cookie))
+       if (dev_stor_is_valid(type, (struct blk_desc *)cookie))
                return 0;
 
        return API_ENODEV;
@@ -345,23 +350,10 @@ int dev_close_stor(void *cookie)
 }
 
 
-static int dev_stor_index(block_dev_desc_t *dd)
-{
-       int i, type;
-
-       type = dev_stor_type(dd);
-       for (i = 0; i < specs[type].max_dev; i++)
-               if (dd == get_dev(specs[type].name, i))
-                       return i;
-
-       return (specs[type].max_dev);
-}
-
-
 lbasize_t dev_read_stor(void *cookie, void *buf, lbasize_t len, lbastart_t start)
 {
        int type;
-       block_dev_desc_t *dd = (block_dev_desc_t *)cookie;
+       struct blk_desc *dd = (struct blk_desc *)cookie;
 
        if ((type = dev_stor_type(dd)) == ENUM_MAX)
                return 0;
@@ -374,5 +366,5 @@ lbasize_t dev_read_stor(void *cookie, void *buf, lbasize_t len, lbastart_t start
                return 0;
        }
 
-       return (dd->block_read(dev_stor_index(dd), start, len, buf));
+       return dd->block_read(dd, start, len, buf);
 }