Changeset 5f6e25e in mainline for uspace/lib/drv/generic/driver.c

Timestamp:

2011-08-29T23:00:12Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

58cbb0c8

Parents:

c5be39b

Message:

Leave it up to DDF to free driver-specific data. This makes it possible
to ensure soft state is not freed during calls to driver entry points.

This requires some driver changes:

• minimum change is not to free() driver-data structures (ddf_fun_t.driver_data and ddf_dev_t.driver_data)
• ideally allocate using ddf_dev_data_alloc(), ddf_fun_data_alloc()

I tried fixing existing drivers accordingly (mostly the minimalistic
change variant), but could have missed something.

File:

• uspace/lib/drv/generic/driver.c (modified) (2 diffs)

uspace/lib/drv/generic/driver.c

@@ -642 +642 @@
 static void delete_device(ddf_dev_t *dev)
 {
+        if (dev->driver_data != NULL)
+                free(dev->driver_data);
         free(dev);
 }
@@ -652 +654 @@
 {
         clean_match_ids(&fun->match_ids);
+        if (fun->driver_data != NULL)
+                free(fun->driver_data);
         if (fun->name != NULL)
                 free(fun->name);