Changeset 9445aad in mainline for uspace/srv/devmap/devmap.c

Timestamp:

2011-03-03T23:25:34Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

3c775adb, 9a422574

Parents:

bdc8ab1 (diff), 8f74140c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Development branch changes

File:

• uspace/srv/devmap/devmap.c (modified) (2 diffs)

uspace/srv/devmap/devmap.c

@@ -123 +123 @@
 static devmap_handle_t last_handle = 0;
 static devmap_device_t *null_devices[NULL_DEVICES];
+
+/*
+ * Dummy list for null devices. This is necessary so that null devices can
+ * be used just as any other devices, e.g. in devmap_device_unregister_core().
+ */
+static LIST_INITIALIZE(dummy_null_driver_devices);
 
 static devmap_handle_t devmap_create_handle(void)
@@ -953 +959 @@
         device->name = dev_name;
         
-        /* Insert device into list of all devices
-           and into null devices array */
+        /*
+         * Insert device into list of all devices and into null devices array.
+         * Insert device into a dummy list of null driver's devices so that it
+         * can be safely removed later.
+         */
         list_append(&device->devices, &devices_list);
+        list_append(&device->driver_devices, &dummy_null_driver_devices);
         null_devices[i] = device;