Changeset e099f26 in mainline for uspace/drv/usbmid/main.c

Timestamp:

2011-03-21T20:22:50Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c56c5b5b

Parents:

4fb6d9ee (diff), 31b568e (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:

Development branch changes (including OHCI)

File:

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

uspace/drv/usbmid/main.c

@@ -61 +61 @@
         int rc;
 
-        rc = usb_endpoint_pipe_start_session(&dev->ctrl_pipe);
+        rc = usb_pipe_start_session(&dev->ctrl_pipe);
         if (rc != EOK) {
                 usb_log_error("Failed to start session on control pipe: %s.\n",
@@ -70 +70 @@
         bool accept = usbmid_explore_device(dev);
 
-        rc = usb_endpoint_pipe_end_session(&dev->ctrl_pipe);
+        rc = usb_pipe_end_session(&dev->ctrl_pipe);
         if (rc != EOK) {
                 usb_log_warning("Failed to end session on control pipe: %s.\n",
@@ -106 +106 @@
         printf(NAME ": USB multi interface device driver.\n");
 
-        usb_log_enable(USB_LOG_LEVEL_INFO, NAME);
+        usb_log_enable(USB_LOG_LEVEL_DEFAULT, NAME);
         return ddf_driver_main(&mid_driver);
 }