Changes in / [40dc422:bbc74af7] in mainline

Location:

uspace

Files:

• app/tester/Makefile (modified) (1 diff)
• app/tester/hw/misc/virtchar1.c (deleted)
• app/tester/hw/misc/virtchar1.def (deleted)
• app/tester/tester.c (modified) (1 diff)
• app/tester/tester.h (modified) (1 diff)
• drv/rootvirt/devices.def (modified) (1 diff)
• drv/test1/Makefile (modified) (1 diff)
• drv/test1/char.c (deleted)
• drv/test1/test1.c (modified) (3 diffs)
• drv/test1/test1.h (deleted)
• lib/c/generic/devmap.c (modified) (2 diffs)
• lib/c/include/devmap.h (modified) (1 diff)
• lib/c/include/ipc/devman.h (modified) (1 diff)
• srv/devman/devman.c (modified) (6 diffs)
• srv/devman/main.c (modified) (5 diffs)
• srv/devmap/devmap.c (modified) (4 diffs)

uspace/app/tester/Makefile

@@ -51 +51 @@
         loop/loop1.c \
         mm/malloc1.c \
-        hw/misc/virtchar1.c \
         hw/serial/serial1.c
 

uspace/app/tester/tester.c

@@ -65 +65 @@
 #include "mm/malloc1.def"
 #include "hw/serial/serial1.def"
-#include "hw/misc/virtchar1.def"
         {NULL, NULL, NULL, false}
 };

uspace/app/tester/tester.h

@@ -82 +82 @@
 extern const char *test_malloc1(void);
 extern const char *test_serial1(void);
-extern const char *test_virtchar1(void);
 
 extern test_t tests[];

uspace/drv/rootvirt/devices.def

@@ -17 +17 @@
         .match_id = "virtual&test2"
 },
-{
-        .name = "null",
-        .match_id = "virtual&test1"
-},
 #endif

uspace/drv/test1/Makefile

@@ -33 +33 @@
 
 SOURCES = \
-        char.c \
         test1.c
 

uspace/drv/test1/test1.c

@@ -34 +34 @@
 #include <errno.h>
 #include <str_error.h>
-#include "test1.h"
+#include <driver.h>
+
+#define NAME "test1"
 
 static int add_device(device_t *dev);
@@ -96 +98 @@
         add_device_to_class(dev, "virtual");
 
-        if (str_cmp(dev->name, "null") == 0) {
-                dev->ops = &char_device_ops;
-                add_device_to_class(dev, "virt-null");
-        } else if (dev->parent == NULL) {
+        if (dev->parent == NULL) {
                 register_child_verbose(dev, "cloning myself ;-)", "clone",
                     "virtual&test1", 10);
@@ -118 +117 @@
 }
 
+

uspace/lib/c/generic/devmap.c

@@ -127 +127 @@
 /** Register new device.
  *
- * The @p interface is used when forwarding connection to the driver.
- * If not 0, the first argument is the interface and the second argument
- * is the devmap handle of the device.
- * When the interface is zero (default), the first argument is directly
- * the handle (to ensure backward compatibility).
- *
- * @param fqdn Fully qualified device name.
- * @param[out] handle Handle to the created instance of device.
- * @param interface Interface when forwarding.
- *
- */
-int devmap_device_register_with_iface(const char *fqdn,
-    devmap_handle_t *handle, sysarg_t interface)
-{
-        int phone = devmap_get_phone(DEVMAP_DRIVER, IPC_FLAG_BLOCKING);
-        
-        if (phone < 0)
-                return phone;
-        
-        async_serialize_start();
-        
-        ipc_call_t answer;
-        aid_t req = async_send_2(phone, DEVMAP_DEVICE_REGISTER, interface, 0,
-            &answer);
-        
-        sysarg_t retval = async_data_write_start(phone, fqdn, str_size(fqdn));
-        if (retval != EOK) {
-                async_wait_for(req, NULL);
-                async_serialize_end();
-                return retval;
-        }
-        
-        async_wait_for(req, &retval);
-        
-        async_serialize_end();
-        
-        if (retval != EOK) {
-                if (handle != NULL)
-                        *handle = -1;
-                return retval;
-        }
-        
-        if (handle != NULL)
-                *handle = (devmap_handle_t) IPC_GET_ARG1(answer);
-        
-        return retval;
-}
-
-/** Register new device.
- *
+ * @param namespace Namespace name.
  * @param fqdn      Fully qualified device name.
  * @param handle    Output: Handle to the created instance of device.
@@ -183 +134 @@
 int devmap_device_register(const char *fqdn, devmap_handle_t *handle)
 {
-        return devmap_device_register_with_iface(fqdn, handle, 0);
-}
-
+        int phone = devmap_get_phone(DEVMAP_DRIVER, IPC_FLAG_BLOCKING);
+        
+        if (phone < 0)
+                return phone;
+        
+        async_serialize_start();
+        
+        ipc_call_t answer;
+        aid_t req = async_send_2(phone, DEVMAP_DEVICE_REGISTER, 0, 0,
+            &answer);
+        
+        sysarg_t retval = async_data_write_start(phone, fqdn, str_size(fqdn));
+        if (retval != EOK) {
+                async_wait_for(req, NULL);
+                async_serialize_end();
+                return retval;
+        }
+        
+        async_wait_for(req, &retval);
+        
+        async_serialize_end();
+        
+        if (retval != EOK) {
+                if (handle != NULL)
+                        *handle = -1;
+                return retval;
+        }
+        
+        if (handle != NULL)
+                *handle = (devmap_handle_t) IPC_GET_ARG1(answer);
+        
+        return retval;
+}
 
 int devmap_device_get_handle(const char *fqdn, devmap_handle_t *handle, unsigned int flags)

uspace/lib/c/include/devmap.h

@@ -45 +45 @@
 extern int devmap_driver_register(const char *, async_client_conn_t);
 extern int devmap_device_register(const char *, devmap_handle_t *);
-extern int devmap_device_register_with_iface(const char *, devmap_handle_t *, sysarg_t);
 
 extern int devmap_device_get_handle(const char *, devmap_handle_t *, unsigned int);

uspace/lib/c/include/ipc/devman.h

@@ -123 +123 @@
         DEVMAN_CLIENT,
         DEVMAN_CONNECT_TO_DEVICE,
-        DEVMAN_CONNECT_FROM_DEVMAP,
         DEVMAN_CONNECT_TO_PARENTS_DEVICE
 } devman_interface_t;

uspace/srv/devman/devman.c

@@ -62 +62 @@
 }
 
-static int devmap_devices_class_compare(unsigned long key[], hash_count_t keys,
-    link_t *item)
-{
-        dev_class_info_t *class_info
-            = hash_table_get_instance(item, dev_class_info_t, devmap_link);
-        assert(class_info != NULL);
-
-        return (class_info->devmap_handle == (devmap_handle_t) key[0]);
-}
-
 static void devices_remove_callback(link_t *item)
 {
@@ -85 +75 @@
         .hash = devices_hash,
         .compare = devmap_devices_compare,
-        .remove_callback = devices_remove_callback
-};
-
-static hash_table_operations_t devmap_devices_class_ops = {
-        .hash = devices_hash,
-        .compare = devmap_devices_class_compare,
         .remove_callback = devices_remove_callback
 };
@@ -686 +670 @@
         }
         
-        devmap_device_register_with_iface(devmap_pathname,
-            &node->devmap_handle, DEVMAN_CONNECT_FROM_DEVMAP);
+        devmap_device_register(devmap_pathname, &node->devmap_handle);
         
         tree_add_devmap_device(tree, node);
@@ -1059 +1042 @@
         
         info = (dev_class_info_t *) malloc(sizeof(dev_class_info_t));
-        if (info != NULL) {
+        if (info != NULL)
                 memset(info, 0, sizeof(dev_class_info_t));
-                list_initialize(&info->dev_classes);
-                list_initialize(&info->devmap_link);
-                list_initialize(&info->link);
-        }
         
         return info;
@@ -1188 +1167 @@
         fibril_rwlock_initialize(&class_list->rwlock);
         hash_table_create(&class_list->devmap_devices, DEVICE_BUCKETS, 1,
-            &devmap_devices_class_ops);
+            &devmap_devices_ops);
 }
 
@@ -1236 +1215 @@
         hash_table_insert(&class_list->devmap_devices, &key, &cli->devmap_link);
         fibril_rwlock_write_unlock(&class_list->rwlock);
-
-        assert(find_devmap_class_device(class_list, cli->devmap_handle) != NULL);
 }
 

uspace/srv/devman/main.c

@@ -281 +281 @@
          * handle.
          */
-        devmap_device_register_with_iface(devmap_pathname,
-            &cli->devmap_handle, DEVMAN_CONNECT_FROM_DEVMAP);
+        devmap_device_register(devmap_pathname, &cli->devmap_handle);
         
         /*
@@ -487 +486 @@
 static void devman_connection_devmapper(ipc_callid_t iid, ipc_call_t *icall)
 {
-        devmap_handle_t devmap_handle = IPC_GET_ARG2(*icall);
+        devmap_handle_t devmap_handle = IPC_GET_IMETHOD(*icall);
         node_t *dev;
 
@@ -504 +503 @@
         }
         
+        printf(NAME ": devman_connection_devmapper: forward connection to "
+            "device %s to driver %s.\n", dev->pathname, dev->drv->name);
         ipc_forward_fast(iid, dev->drv->phone, DRIVER_CLIENT, dev->handle, 0,
             IPC_FF_NONE);
-        printf(NAME ": devman_connection_devmapper: forwarded connection to "
-            "device %s to driver %s.\n", dev->pathname, dev->drv->name);
 }
 
@@ -513 +512 @@
 static void devman_connection(ipc_callid_t iid, ipc_call_t *icall)
 {
+        /*
+         * Silly hack to enable the device manager to register as a driver by
+         * the device mapper. If the ipc method is not IPC_M_CONNECT_ME_TO, this
+         * is not the forwarded connection from naming service, so it must be a
+         * connection from the devmapper which thinks this is a devmapper-style
+         * driver. So pretend this is a devmapper-style driver. (This does not
+         * work for device with handle == IPC_M_CONNECT_ME_TO, because devmapper
+         * passes device handle to the driver as an ipc method.)
+         */
+        if (IPC_GET_IMETHOD(*icall) != IPC_M_CONNECT_ME_TO)
+                devman_connection_devmapper(iid, icall);
+
+        /*
+         * ipc method is IPC_M_CONNECT_ME_TO, so this is forwarded connection
+         * from naming service by which we registered as device manager, so be
+         * device manager.
+         */
+        
         /* Select interface. */
         switch ((sysarg_t) (IPC_GET_ARG1(*icall))) {
@@ -525 +542 @@
                 devman_forward(iid, icall, false);
                 break;
-        case DEVMAN_CONNECT_FROM_DEVMAP:
-                /* Someone connected through devmap node. */
-                devman_connection_devmapper(iid, icall);
-                break;
         case DEVMAN_CONNECT_TO_PARENTS_DEVICE:
                 /* Connect client to selected device. */

uspace/srv/devmap/devmap.c

@@ -99 +99 @@
         /** Device driver handling this device */
         devmap_driver_t *driver;
-        /** Use this interface when forwarding to driver. */
-        sysarg_t forward_interface;
 } devmap_device_t;
 
@@ -519 +517 @@
         }
         
-        /* Set the interface, if any. */
-        device->forward_interface = IPC_GET_ARG1(*icall);
-
         /* Get fqdn */
         char *fqdn;
@@ -571 +566 @@
         /* Get unique device handle */
         device->handle = devmap_create_handle();
-
+        
         devmap_namespace_addref(namespace, device);
         device->driver = driver;
@@ -622 +617 @@
         }
         
-        if (dev->forward_interface == 0) {
-                ipc_forward_fast(callid, dev->driver->phone,
-                    dev->handle, 0, 0,
-                    IPC_FF_NONE);
-        } else {
-                ipc_forward_fast(callid, dev->driver->phone,
-                    dev->forward_interface, dev->handle, 0,
-                    IPC_FF_NONE);
-        }
+        ipc_forward_fast(callid, dev->driver->phone, dev->handle,
+            IPC_GET_ARG3(*call), 0, IPC_FF_NONE);
         
         fibril_mutex_unlock(&devices_list_mutex);