Changeset c5be39b in mainline

Timestamp:

2011-08-29T21:53:18Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5f6e25e

Parents:

bfe7867

Message:

Add interface for allocating driver-specific device and function data.

Location:

uspace

Files:

• drv/test/test1/test1.c (modified) (3 diffs)
• lib/drv/generic/driver.c (modified) (2 diffs)
• lib/drv/include/ddf/driver.h (modified) (1 diff)

uspace/drv/test/test1/test1.c

@@ -148 +148 @@
             dev->name, (int) dev->handle);
 
-        test1 = calloc(1, sizeof(test1_t));
+        test1 = ddf_dev_data_alloc(dev, sizeof(test1_t));
         if (test1 == NULL) {
-                ddf_msg(LVL_ERROR, "Failed allocating softstate.\n");
+                ddf_msg(LVL_ERROR, "Failed allocating soft state.\n");
                 return ENOMEM;
         }
@@ -159 +159 @@
                 return ENOMEM;
         }
+
+        test1->fun_a = fun_a;
 
         rc = ddf_fun_bind(fun_a);
@@ -187 +189 @@
         ddf_msg(LVL_DEBUG, "Device `%s' accepted.", dev->name);
 
-        test1->fun_a = fun_a;
-        dev->driver_data = test1;
         return EOK;
 }

uspace/lib/drv/generic/driver.c

@@ -699 +699 @@
 }
 
+/** Allocate driver-specific device data. */
+extern void *ddf_dev_data_alloc(ddf_dev_t *dev, size_t size)
+{
+        void *data;
+
+        assert(dev->driver_data == NULL);
+
+        data = calloc(1, size);
+        if (data == NULL)
+                return NULL;
+
+        dev->driver_data = data;
+        return data;
+}
+
 /** Create a DDF function node.
  *
@@ -744 +759 @@
 
         return fun;
+}
+
+/** Allocate driver-specific function data. */
+extern void *ddf_fun_data_alloc(ddf_fun_t *fun, size_t size)
+{
+        void *data;
+
+        assert(fun->bound == false);
+        assert(fun->driver_data == NULL);
+
+        data = calloc(1, size);
+        if (data == NULL)
+                return NULL;
+
+        fun->driver_data = data;
+        return data;
 }
 

uspace/lib/drv/include/ddf/driver.h

@@ -155 +155 @@
 extern int ddf_driver_main(driver_t *);
 
+extern void *ddf_dev_data_alloc(ddf_dev_t *, size_t);
 extern ddf_fun_t *ddf_fun_create(ddf_dev_t *, fun_type_t, const char *);
 extern void ddf_fun_destroy(ddf_fun_t *);
+extern void *ddf_fun_data_alloc(ddf_fun_t *, size_t);
 extern int ddf_fun_bind(ddf_fun_t *);
 extern int ddf_fun_unbind(ddf_fun_t *);