Changeset 6f9e7fea in mainline

Timestamp:

2010-11-30T00:24:42Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

178673c

Parents:

0ca16307

Message:

Add root virtual device driver

The driver is meant as a simple way to add virtual devices to the
system (it only passes list of virtual devices to devman which then
decides what drivers to launch).

Files:

• boot/Makefile.common (modified) (1 diff)
• uspace/Makefile (modified) (1 diff)
• uspace/drv/root/root.c (modified) (3 diffs)
• uspace/drv/rootvirt/Makefile (added)
• uspace/drv/rootvirt/devices.def (added)
• uspace/drv/rootvirt/rootvirt.c (added)
• uspace/drv/rootvirt/rootvirt.ma (added)

boot/Makefile.common

@@ -109 +109 @@
         
 RD_DRVS = \
-        root
+        root \
+        rootvirt
 
 RD_DRV_CFG = 

uspace/Makefile

@@ -86 +86 @@
         srv/net/tl/tcp \
         srv/net/net \
-        drv/root
+        drv/root \
+        drv/rootvirt
 
 ## Networking

uspace/drv/root/root.c

@@ -57 +57 @@
 #define PLATFORM_DEVICE_MATCH_SCORE 100
 
+#define VIRTUAL_DEVICE_NAME "virt"
+#define VIRTUAL_DEVICE_MATCH_ID "rootvirt"
+#define VIRTUAL_DEVICE_MATCH_SCORE 100
+
 static int root_add_device(device_t *dev);
 
@@ -69 +73 @@
         .driver_ops = &root_ops
 };
+
+/** Create the device which represents the root of virtual device tree.
+ *
+ * @param parent Parent of the newly created device.
+ * @return Error code.
+ */
+static int add_virtual_root_child(device_t *parent)
+{
+        printf(NAME ": adding new child for virtual devices.\n");
+        printf(NAME ":   device node is `%s' (%d %s)\n", VIRTUAL_DEVICE_NAME,
+            VIRTUAL_DEVICE_MATCH_SCORE, VIRTUAL_DEVICE_MATCH_ID);
+
+        int res = child_device_register_wrapper(parent, VIRTUAL_DEVICE_NAME,
+            VIRTUAL_DEVICE_MATCH_ID, VIRTUAL_DEVICE_MATCH_SCORE);
+
+        return res;
+}
 
 /** Create the device which represents the root of HW device tree.
@@ -96 +117 @@
         printf(NAME ": root_add_device, device handle = %d\n", dev->handle);
         
+        /*
+         * Register virtual devices root.
+         * We ignore error occurrence because virtual devices shall not be
+         * vital for the system.
+         */
+        add_virtual_root_child(dev);
+
         /* Register root device's children. */
         int res = add_platform_child(dev);