Changeset 41ef5b9 in mainline for uspace/app/usbinfo/dev.c

Timestamp:

2011-03-21T17:16:10Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

4d0c40b

Parents:

fd9f6e4c (diff), 434ef65 (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 from usb/development

File:

• uspace/app/usbinfo/dev.c (modified) (5 diffs)

uspace/app/usbinfo/dev.c

@@ -59 +59 @@
         }
 
-        rc = usb_endpoint_pipe_initialize_default_control(&dev->ctrl_pipe,
+        rc = usb_pipe_initialize_default_control(&dev->ctrl_pipe,
             &dev->wire);
         if (rc != EOK) {
@@ -68 +68 @@
         }
 
-        rc = usb_endpoint_pipe_probe_default_control(&dev->ctrl_pipe);
+        rc = usb_pipe_probe_default_control(&dev->ctrl_pipe);
         if (rc != EOK) {
                 fprintf(stderr,
@@ -76 +76 @@
         }
 
-        rc = usb_endpoint_pipe_start_session(&dev->ctrl_pipe);
+        rc = usb_pipe_start_session(&dev->ctrl_pipe);
         if (rc != EOK) {
                 fprintf(stderr,
@@ -107 +107 @@
 
 leave:
-        if (usb_endpoint_pipe_is_session_started(&dev->ctrl_pipe)) {
-                usb_endpoint_pipe_end_session(&dev->ctrl_pipe);
+        if (usb_pipe_is_session_started(&dev->ctrl_pipe)) {
+                usb_pipe_end_session(&dev->ctrl_pipe);
         }
 
@@ -118 +118 @@
 void destroy_device(usbinfo_device_t *dev)
 {
-        usb_endpoint_pipe_end_session(&dev->ctrl_pipe);
+        usb_pipe_end_session(&dev->ctrl_pipe);
         free(dev);
 }