Changeset 8e9becf6 in mainline for uspace/drv/usbmouse/mouse.c

Timestamp:

2011-03-08T20:00:47Z (15 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

021351c

Parents:

0588062e (diff), d2fc1c2 (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 branch lelian/hidd

File:

• uspace/drv/usbmouse/mouse.c (modified) (3 diffs)

uspace/drv/usbmouse/mouse.c

@@ -37 +37 @@
 #include <usb/debug.h>
 #include <errno.h>
+#include <str_error.h>
 #include <ipc/mouse.h>
 
+/** Fibril function for polling the mouse device.
+ *
+ * This function shall not terminate unless the device breaks and fails
+ * to send data (e.g. stalls on data request).
+ *
+ * @param arg ddf_dev_t type representing the mouse device.
+ * @return EOK Always.
+ */
 int usb_mouse_polling_fibril(void *arg)
 {
@@ -64 +73 @@
 
                 size_t actual_size;
+                int rc;
 
-                /* FIXME: check for errors. */
-                usb_endpoint_pipe_start_session(&mouse->poll_pipe);
+                /*
+                 * Error checking note:
+                 * - failure when starting a session is considered
+                 *   temporary (e.g. out of phones, next try might succeed)
+                 * - failure of transfer considered fatal (probably the
+                 *   device was unplugged)
+                 * - session closing not checked (shall not fail anyway)
+                 */
 
-                usb_endpoint_pipe_read(&mouse->poll_pipe,
+                rc = usb_endpoint_pipe_start_session(&mouse->poll_pipe);
+                if (rc != EOK) {
+                        usb_log_warning("Failed to start session, will try again: %s.\n",
+                            str_error(rc));
+                        continue;
+                }
+
+                rc = usb_endpoint_pipe_read(&mouse->poll_pipe,
                     buffer, buffer_size, &actual_size);
 
                 usb_endpoint_pipe_end_session(&mouse->poll_pipe);
+
+                if (rc != EOK) {
+                        usb_log_error("Failed reading mouse input: %s.\n",
+                            str_error(rc));
+                        break;
+                }
+
+                usb_log_debug2("got buffer: %s.\n",
+                    usb_debug_str_buffer(buffer, buffer_size, 0));
 
                 uint8_t butt = buffer[0];
@@ -115 +147 @@
         }
 
+        /*
+         * Device was probably unplugged.
+         * Hang-up the phone to the console.
+         * FIXME: release allocated memory.
+         */
+        async_hangup(mouse->console_phone);
+        mouse->console_phone = -1;
+
+        usb_log_error("Mouse polling fibril terminated.\n");
+
         return EOK;
 }