Changeset 2ac7af3 in mainline for uspace/drv/bus/usb/usbmast/main.c

Timestamp:

2011-10-14T19:40:28Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

df3caec5

Parents:

6d4d883 (diff), 3a5506a (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 mainline changes

File:

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

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

@@ -87 +87 @@
  * @return Error code.
  */
-static int usbmast_add_device(usb_device_t *dev)
+static int usbmast_device_add(usb_device_t *dev)
 {
         int rc;
@@ -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,
@@ -295 +294 @@
 /** USB mass storage driver ops. */
 static usb_driver_ops_t usbmast_driver_ops = {
-        .add_device = usbmast_add_device,
+        .device_add = usbmast_device_add,
 };