Changeset 28eee11c in mainline for uspace/lib/usb/src/devdrv.c

Timestamp:

2011-03-21T15:12:04Z (14 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.

File:

• uspace/lib/usb/src/devdrv.c (modified) (7 diffs)

uspace/lib/usb/src/devdrv.c

@@ -126 +126 @@
 
         for (i = 0; i < pipe_count; i++) {
-                dev->pipes[i].pipe = malloc(sizeof(usb_endpoint_pipe_t));
+                dev->pipes[i].pipe = malloc(sizeof(usb_pipe_t));
                 if (dev->pipes[i].pipe == NULL) {
                         usb_log_oom(dev->ddf_dev);
@@ -147 +147 @@
         }
 
-        rc = usb_endpoint_pipe_initialize_from_configuration(dev->pipes,
+        rc = usb_pipe_initialize_from_configuration(dev->pipes,
            pipe_count, config_descriptor, config_descriptor_size, &dev->wire);
         if (rc != EOK) {
@@ -172 +172 @@
         for (i = 0; i < pipe_count; i++) {
                 if (dev->pipes[i].present) {
-                        rc = usb_endpoint_pipe_register(dev->pipes[i].pipe,
+                        rc = usb_pipe_register(dev->pipes[i].pipe,
                             dev->pipes[i].descriptor->poll_interval,
                             &hc_conn);
@@ -219 +219 @@
         }
 
-        rc = usb_endpoint_pipe_initialize_default_control(&dev->ctrl_pipe,
+        rc = usb_pipe_initialize_default_control(&dev->ctrl_pipe,
             &dev->wire);
         if (rc != EOK) {
@@ -228 +228 @@
         }
 
-        rc = usb_endpoint_pipe_probe_default_control(&dev->ctrl_pipe);
+        rc = usb_pipe_probe_default_control(&dev->ctrl_pipe);
         if (rc != EOK) {
                 usb_log_error(
@@ -240 +240 @@
          * default control pipe.
          */
-        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 an IPC session: %s.\n",
@@ -252 +252 @@
 
         /* No checking here. */
-        usb_endpoint_pipe_end_session(&dev->ctrl_pipe);
+        usb_pipe_end_session(&dev->ctrl_pipe);
 
         return rc;