Changeset 28eee11c in mainline for uspace/app

Timestamp:

2011-03-21T15:12:04Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

5287502

Parents:

5971dd3 (diff), 7102aa5 (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:

Function and types renaming

This merge does not involve any change in functionality.

Types and functions that were renamed (see individual commits for details):

• usb_endpoint_pipe_* ⇒ usb_pipe_*
• device_keeper_* ⇒ usb_device_keeper_*
  • some functions has more descriptive names now
• batch_* ⇒ usb_transfer_batch_ *

Also fixed some wrong Doxygen caused by migration from individual drivers.

Location:

uspace/app/usbinfo

Files:

• dev.c (modified) (5 diffs)
• usbinfo.h (modified) (1 diff)

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);
 }

uspace/app/usbinfo/usbinfo.h

@@ -44 +44 @@
 
 typedef struct {
-        usb_endpoint_pipe_t ctrl_pipe;
+        usb_pipe_t ctrl_pipe;
         usb_device_connection_t wire;
         usb_standard_device_descriptor_t device_descriptor;