Changeset 44b1674 in mainline for uspace/drv/usbmouse

Timestamp:

2011-04-18T21:48:55Z (15 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

9014dcd

Parents:

618f9ed (diff), 84a04dd (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 form usb/development

Location:

uspace/drv/usbmouse

Files:

• init.c (modified) (2 diffs)
• main.c (modified) (2 diffs)

uspace/drv/usbmouse/init.c

@@ -125 +125 @@
         }
         
-        /* Open the control pipe. */
-        rc = usb_pipe_start_session(&dev->ctrl_pipe);
-        if (rc != EOK) {
-                goto leave;
-        }
-        
         /* Set the boot protocol. */
         rc = usb_control_request_set(&dev->ctrl_pipe,
@@ -140 +134 @@
         }
         
-        /* Close the control pipe (ignore errors). */
-        usb_pipe_end_session(&dev->ctrl_pipe);
-
-
-        /* Everything allright. */
+        /* Everything all right. */
         dev->driver_data = mouse;
         mouse->mouse_fun->driver_data = mouse;

uspace/drv/usbmouse/main.c

@@ -54 +54 @@
         }
 
-        usb_log_debug("Polling pipe at endpoint %d.\n", dev->pipes[0].pipe->endpoint_no);
+        usb_log_debug("Polling pipe at endpoint %d.\n",
+            dev->pipes[0].pipe->endpoint_no);
 
         rc = usb_device_auto_poll(dev, 0,
@@ -66 +67 @@
         }
 
-        usb_log_info("controlling new mouse (handle %llu).\n",
+        usb_log_info("controlling new mouse (handle %" PRIun ").\n",
             dev->ddf_dev->handle);