Changeset a23297c in mainline

Timestamp:

2011-10-04T12:19:35Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

cfa1a8a

Parents:

9c0c0e1 (diff), 3d79f5b (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:

Merge with mainline

File:

• uspace/drv/bus/usb/usbmast/main.c (modified) (3 diffs)

uspace/drv/bus/usb/usbmast/main.c

@@ -94 +94 @@
 
         /* Allocate softstate */
-        mdev = calloc(1, sizeof(usbmast_dev_t));
+        mdev = ddf_dev_data_alloc(dev->ddf_dev, sizeof(usbmast_dev_t));
         if (mdev == NULL) {
                 usb_log_error("Failed allocating softstate.\n");
@@ -159 +159 @@
 
         /* Allocate soft state */
-        mfun = ddf_dev_data_alloc(mdev->ddf_dev, sizeof(usbmast_fun_t));
+        mfun = ddf_fun_data_alloc(fun, sizeof(usbmast_fun_t));
         if (mfun == NULL) {
                 usb_log_error("Failed allocating softstate.\n");
@@ -171 +171 @@
         /* Set up a connection handler. */
         fun->conn_handler = usbmast_bd_connection;
-        fun->driver_data = mfun;
 
         usb_log_debug("Inquire...\n");