Changeset 63e0bdd in mainline

Timestamp:

2011-02-26T14:57:55Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

38eaf41

Parents:

27833d8

Message:

Null devices need to be in some driver_devices list too,
otherwise devmap will crash when devmap_null_destroy() is called.

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;