Changeset 62f4212 in mainline for uspace/drv/usbhid/hiddev.c

Timestamp:

2011-03-22T10:07:53Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

f8e4cb6

Parents:

18b3cfd (diff), b01995b (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:

Merged changes from development

File:

• uspace/drv/usbhid/hiddev.c (modified) (11 diffs)

uspace/drv/usbhid/hiddev.c

@@ -184 +184 @@
  *                     successfuly initialize the structure.
  *
- * @sa usb_endpoint_pipe_initialize_from_configuration(), 
+ * @sa usb_pipe_initialize_from_configuration(), 
  *     usbhid_dev_get_report_descriptor()
  */
@@ -192 +192 @@
         assert(hid_dev != NULL);
         
-        usb_log_info("Processing descriptors...\n");
+        usb_log_debug("Processing descriptors...\n");
         
         int rc;
@@ -218 +218 @@
         };
         
-        rc = usb_endpoint_pipe_initialize_from_configuration(
+        rc = usb_pipe_initialize_from_configuration(
             endpoint_mapping, 1, descriptors, descriptors_size,
             &hid_dev->wire);
@@ -359 +359 @@
  * @return Other value inherited from one of functions 
  *         usb_device_connection_initialize_from_device(),
- *         usb_endpoint_pipe_initialize_default_control(),
- *         usb_endpoint_pipe_start_session(), usb_endpoint_pipe_end_session(),
+ *         usb_pipe_initialize_default_control(),
+ *         usb_pipe_start_session(), usb_pipe_end_session(),
  *         usbhid_dev_process_descriptors().
  *
@@ -368 +368 @@
     usb_endpoint_description_t *poll_ep_desc)
 {
-        usb_log_info("Initializing HID device structure.\n");
+        usb_log_debug("Initializing HID device structure.\n");
         
         if (hid_dev == NULL) {
@@ -404 +404 @@
          * Initialize device pipes.
          */
-        rc = usb_endpoint_pipe_initialize_default_control(&hid_dev->ctrl_pipe,
+        rc = usb_pipe_initialize_default_control(&hid_dev->ctrl_pipe,
             &hid_dev->wire);
         if (rc != EOK) {
@@ -411 +411 @@
                 return rc;
         }
-        rc = usb_endpoint_pipe_probe_default_control(&hid_dev->ctrl_pipe);
+        rc = usb_pipe_probe_default_control(&hid_dev->ctrl_pipe);
         if (rc != EOK) {
                 usb_log_error("Probing default control pipe failed: %s.\n",
@@ -430 +430 @@
          * Get descriptors, parse descriptors and save endpoints.
          */
-        rc = usb_endpoint_pipe_start_session(&hid_dev->ctrl_pipe);
+        rc = usb_pipe_start_session(&hid_dev->ctrl_pipe);
         if (rc != EOK) {
                 usb_log_error("Failed to start session on the control pipe: %s"
@@ -440 +440 @@
         if (rc != EOK) {
                 /* TODO: end session?? */
-                usb_endpoint_pipe_end_session(&hid_dev->ctrl_pipe);
+                usb_pipe_end_session(&hid_dev->ctrl_pipe);
                 usb_log_error("Failed to process descriptors: %s.\n",
                     str_error(rc));
@@ -446 +446 @@
         }
         
-        rc = usb_endpoint_pipe_end_session(&hid_dev->ctrl_pipe);
+        rc = usb_pipe_end_session(&hid_dev->ctrl_pipe);
         if (rc != EOK) {
                 usb_log_warning("Failed to start session on the control pipe: "
@@ -454 +454 @@
         
         hid_dev->initialized = 1;
-        usb_log_info("HID device structure initialized.\n");
+        usb_log_debug("HID device structure initialized.\n");
         
         return EOK;