Changeset f97f5cc2 in mainline

Timestamp:

2015-11-17T23:23:08Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4627314

Parents:

363a504

Message:

Enable partition support with all disk drivers.

Location:

uspace

Files:

• drv/block/ata_bd/ata_bd.c (modified) (1 diff)
• drv/block/ata_bd/main.c (modified) (1 diff)
• drv/block/ddisk/ddisk.c (modified) (1 diff)
• drv/bus/usb/usbmast/main.c (modified) (1 diff)
• srv/bd/file_bd/file_bd.c (modified) (2 diffs)
• srv/bd/sata_bd/sata_bd.c (modified) (3 diffs)
• srv/locsrv/locsrv.c (modified) (1 diff)

uspace/drv/block/ata_bd/ata_bd.c

@@ -74 +74 @@
 
 #define NAME       "ata_bd"
-#define NAMESPACE  "bd"
 
 /** Number of defined legacy controller base addresses. */

uspace/drv/block/ata_bd/main.c

@@ -198 +198 @@
         }
 
-        ddf_fun_add_to_category(fun, "bd");
         ddf_fun_add_to_category(fun, "disk");
 

uspace/drv/block/ddisk/ddisk.c

@@ -337 +337 @@
         }
 
-        ddf_fun_add_to_category(fun, "bd");
+        ddf_fun_add_to_category(fun, "disk");
         ddisk->fun = fun;
 

uspace/drv/bus/usb/usbmast/main.c

@@ -292 +292 @@
         }
 
+        ddf_fun_add_to_category(fun, "disk");
+
         free(fun_name);
         mdev->luns[lun] = fun;

uspace/srv/bd/file_bd/file_bd.c

@@ -90 +90 @@
         char *image_name;
         char *device_name;
+        category_id_t disk_cat;
 
         printf(NAME ": File-backed block device driver\n");
@@ -138 +139 @@
                 return rc;
         }
-        
+
+        rc = loc_category_get_id("disk", &disk_cat, IPC_FLAG_BLOCKING);
+        if (rc != EOK) {
+                printf("%s: Failed resolving category 'disk'.\n", NAME);
+                return rc;
+        }
+
+        rc = loc_service_add_to_cat(service_id, disk_cat);
+        if (rc != EOK) {
+                printf("%s: Failed adding %s to category.",
+                    NAME, device_name);
+                return rc;
+        }
+
         printf("%s: Accepting connections\n", NAME);
         task_retval(0);

uspace/srv/bd/sata_bd/sata_bd.c

@@ -246 +246 @@
 {
         int rc;
+        category_id_t disk_cat;
         
         async_set_fallback_port_handler(sata_bd_connection, NULL);
@@ -259 +260 @@
         }
 
-        for(int i=0; i < disk_count; i++) {
+        rc = loc_category_get_id("disk", &disk_cat, IPC_FLAG_BLOCKING);
+        if (rc != EOK) {
+                printf("%s: Failed resolving category 'disk'.\n", NAME);
+                return rc;
+        }
+
+        for(int i = 0; i < disk_count; i++) {
                 char name[1024];
                 snprintf(name, 1024, "%s/%s", NAMESPACE, disk[i].dev_name);
@@ -267 +274 @@
                         return rc;
                 }
-        }
-                
+
+                rc = loc_service_add_to_cat(disk[i].service_id, disk_cat);
+                if (rc != EOK) {
+                        printf("%s: Failed adding %s to category.",
+                            NAME, disk[i].dev_name);
+                        return rc;
+                }
+        }
+
         printf(NAME ": Accepting connections\n");
         task_retval(0);

uspace/srv/locsrv/locsrv.c

@@ -1314 +1314 @@
         categ_dir_init(&cdir);
 
-        cat = category_new("bd");
-        categ_dir_add_cat(&cdir, cat);
-
         cat = category_new("disk");
         categ_dir_add_cat(&cdir, cat);