Changeset 96fde65 in mainline

Timestamp:

2011-10-12T18:03:22Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

7be3638

Parents:

4501e207

Message:

usbmast: don't use ddf_dev_t driver_data for soft-state.

That is reserved for usb_dev_t internal use.
Note this in the comment.

Location:

uspace

Files:

• drv/bus/usb/usbmast/main.c (modified) (2 diffs)
• lib/usbdev/include/usb/dev/driver.h (modified) (1 diff)

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

@@ -94 +94 @@
 
         /* Allocate softstate */
-        mdev = ddf_dev_data_alloc(dev->ddf_dev, sizeof(usbmast_dev_t));
+        dev->driver_data = mdev = malloc(sizeof(usbmast_dev_t));
         if (mdev == NULL) {
                 usb_log_error("Failed allocating softstate.\n");
@@ -103 +103 @@
         mdev->usb_dev = dev;
 
-        usb_log_info("Initializing mass storage `%s'.\n",
-            dev->ddf_dev->name);
+        usb_log_info("Initializing mass storage `%s'.\n", dev->ddf_dev->name);
         usb_log_debug(" Bulk in endpoint: %d [%zuB].\n",
             dev->pipes[BULK_IN_EP].pipe->endpoint_no,

uspace/lib/usbdev/include/usb/dev/driver.h

@@ -96 +96 @@
         usb_device_descriptors_t descriptors;
 
-        /** Generic DDF device backing this one. */
+        /** Generic DDF device backing this one. RO: DO NOT TOUCH!*/
         ddf_dev_t *ddf_dev;
         /** Custom driver data.