Skip to content
Snippets Groups Projects
Commit 13ca6305 authored by Rafal Jaworowski's avatar Rafal Jaworowski Committed by Wolfgang Denk
Browse files

API: Correct storage enumeration routine, other minor fixes in API storage area.

parent 05c7fe0f
No related branches found
No related tags found
No related merge requests found
/* /*
* (C) Copyright 2007 Semihalf * (C) Copyright 2007-2008 Semihalf
* *
* Written by: Rafal Jaworowski <raj@semihalf.com> * Written by: Rafal Jaworowski <raj@semihalf.com>
* *
...@@ -53,7 +53,7 @@ struct stor_spec { ...@@ -53,7 +53,7 @@ struct stor_spec {
int enum_started; int enum_started;
int enum_ended; int enum_ended;
int type; /* "external" type: DT_STOR_{IDE,USB,etc} */ int type; /* "external" type: DT_STOR_{IDE,USB,etc} */
char name[4]; char *name;
}; };
static struct stor_spec specs[ENUM_MAX] = { { 0, 0, 0, 0, "" }, }; static struct stor_spec specs[ENUM_MAX] = { { 0, 0, 0, 0, "" }, };
...@@ -108,7 +108,10 @@ static int dev_stor_get(int type, int first, int *more, struct device_info *di) ...@@ -108,7 +108,10 @@ static int dev_stor_get(int type, int first, int *more, struct device_info *di)
if (first) { if (first) {
di->cookie = (void *)get_dev(specs[type].name, 0); di->cookie = (void *)get_dev(specs[type].name, 0);
found = 1; if (di->cookie == NULL)
return 0;
else
found = 1;
} else { } else {
for (i = 0; i < specs[type].max_dev; i++) for (i = 0; i < specs[type].max_dev; i++)
...@@ -123,7 +126,10 @@ static int dev_stor_get(int type, int first, int *more, struct device_info *di) ...@@ -123,7 +126,10 @@ static int dev_stor_get(int type, int first, int *more, struct device_info *di)
} }
di->cookie = (void *)get_dev(specs[type].name, i); di->cookie = (void *)get_dev(specs[type].name, i);
found = 1; if (di->cookie == NULL)
return 0;
else
found = 1;
/* provide hint if there are more devices in /* provide hint if there are more devices in
* this group to enumerate */ * this group to enumerate */
...@@ -360,7 +366,7 @@ lbasize_t dev_read_stor(void *cookie, void *buf, lbasize_t len, lbastart_t start ...@@ -360,7 +366,7 @@ lbasize_t dev_read_stor(void *cookie, void *buf, lbasize_t len, lbastart_t start
return 0; return 0;
if ((dd->block_read) == NULL) { if ((dd->block_read) == NULL) {
debugf("no block_read() for device 0x%08x\n"); debugf("no block_read() for device 0x%08x\n", cookie);
return 0; return 0;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment