Changeset 9a2923d in mainline for uspace/drv/usbmid/main.c

Timestamp:

2011-03-25T17:29:10Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

d70765d, ea696998

Parents:

b8d453ec (diff), 889e8e3 (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:

USB MID fixes, devman in kconsole (#145, #150)

Ported USB MID driver to new USB framework.

Devman can be configured to run in kconsole for better log viewing.

File:

• uspace/drv/usbmid/main.c (modified) (4 diffs)

uspace/drv/usbmid/main.c

@@ -49 +49 @@
  * @return Error code.
  */
-static int usbmid_add_device(ddf_dev_t *gen_dev)
+static int usbmid_add_device(usb_device_t *dev)
 {
-        usbmid_device_t *dev = usbmid_device_create(gen_dev);
-        if (dev == NULL) {
-                return ENOMEM;
-        }
-
-        usb_log_info("Taking care of new MID: addr %d (HC %zu)\n",
-            dev->wire.address, dev->wire.hc_handle);
+        usb_log_info("Taking care of new MID `%s'.\n", dev->ddf_dev->name);
 
         int rc;
@@ -65 +59 @@
                 usb_log_error("Failed to start session on control pipe: %s.\n",
                     str_error(rc));
-                goto error_leave;
+                return rc;
         }
 
@@ -77 +71 @@
 
         if (!accept) {
-                rc = ENOTSUP;
-                goto error_leave;
+                return ENOTSUP;
         }
 
-        gen_dev->driver_data = dev;
-
         return EOK;
-
-
-error_leave:
-        free(dev);
-        return rc;
 }
 
 /** USB MID driver ops. */
-static driver_ops_t mid_driver_ops = {
+static usb_driver_ops_t mid_driver_ops = {
         .add_device = usbmid_add_device,
 };
 
 /** USB MID driver. */
-static driver_t mid_driver = {
+static usb_driver_t mid_driver = {
         .name = NAME,
-        .driver_ops = &mid_driver_ops
+        .ops = &mid_driver_ops,
+        .endpoints = NULL
 };
 
@@ -107 +94 @@
 
         usb_log_enable(USB_LOG_LEVEL_DEFAULT, NAME);
-        return ddf_driver_main(&mid_driver);
+
+        return usb_driver_main(&mid_driver);
 }