summaryrefslogtreecommitdiff
path: root/api/api_storage.c
diff options
context:
space:
mode:
Diffstat (limited to 'api/api_storage.c')
-rw-r--r--api/api_storage.c41
1 files changed, 20 insertions, 21 deletions
diff --git a/api/api_storage.c b/api/api_storage.c
index b5aaba1091e..bd431447213 100644
--- a/api/api_storage.c
+++ b/api/api_storage.c
@@ -37,7 +37,7 @@ 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;
};
@@ -116,8 +116,10 @@ static int dev_stor_get(int type, int first, int *more, struct device_info *di)
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;
@@ -125,8 +127,10 @@ static int dev_stor_get(int type, int first, int *more, struct device_info *di)
for (i = 0; i < specs[type].max_dev; i++)
if (di->cookie ==
(void *)blk_get_dev(specs[type].name, i)) {
- /* previous cookie found -- advance to the
- * next device, if possible */
+ /*
+ * previous cookie found -- advance to the
+ * next device, if possible
+ */
if (++i >= specs[type].max_dev) {
/* out of range, no more to enum */
@@ -141,8 +145,10 @@ static int dev_stor_get(int type, int first, int *more, struct device_info *di)
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;
@@ -171,9 +177,8 @@ static int dev_stor_get(int type, int first, int *more, struct device_info *di)
}
-/*
- * returns: ENUM_IDE, ENUM_USB etc. based on struct blk_desc
- */
+/* returns: ENUM_IDE, ENUM_USB etc. based on struct blk_desc */
+
static int dev_stor_type(struct blk_desc *dd)
{
int i, j;
@@ -187,9 +192,8 @@ static int dev_stor_type(struct blk_desc *dd)
}
-/*
- * 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;
@@ -220,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);
/*
@@ -231,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) {
@@ -243,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;
@@ -255,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
*/
@@ -282,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");
@@ -303,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;