Changeset f5246b6 in mainline for uspace/drv

Timestamp:

2011-03-04T22:48:24Z (15 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

0e06a14

Parents:

3c775adb (diff), 03f7952 (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:

Development branch changes

Location:

uspace/drv

Files:

• usbhid/hiddev.c (modified) (1 diff)
• usbhid/hiddev.h (modified) (1 diff)
• usbhid/kbddev.c (modified) (2 diffs)
• usbhub/usbhub.c (modified) (5 diffs)
• usbmouse/main.c (modified) (1 diff)
• usbmouse/mouse.c (modified) (3 diffs)

uspace/drv/usbhid/hiddev.c

@@ -206 +206 @@
         assert(endpoint_mapping[0].interface != NULL);
         
+        /*
+         * Save polling interval
+         */
+        hid_dev->poll_interval = endpoint_mapping[0].descriptor->poll_interval;
+        assert(hid_dev->poll_interval > 0);
+        
         rc = usbhid_dev_get_report_descriptor(hid_dev,
             descriptors, descriptors_size,

uspace/drv/usbhid/hiddev.h

@@ -57 +57 @@
         usb_endpoint_pipe_t poll_pipe;
         
+        short poll_interval;
+        
         uint16_t iface;
         

uspace/drv/usbhid/kbddev.c

@@ -593 +593 @@
 
         while (true) {
-                async_usleep(1000 * 10);
-
                 sess_rc = usb_endpoint_pipe_start_session(
                     &kbd_dev->hid_dev->poll_pipe);
@@ -635 +633 @@
                 usb_log_debug("Calling usbhid_kbd_process_data()\n");
                 usbhid_kbd_process_data(kbd_dev, buffer, actual_size);
+                
+                async_usleep(kbd_dev->hid_dev->poll_interval);
         }
 

uspace/drv/usbhub/usbhub.c

@@ -233 +233 @@
         dprintf(USB_LOG_LEVEL_DEBUG, "starting control transaction");
         usb_endpoint_pipe_start_session(&result->endpoints.control);
+        opResult = usb_request_set_configuration(&result->endpoints.control, 1);
+        assert(opResult == EOK);
+
         opResult = usb_request_get_descriptor(&result->endpoints.control,
                         USB_REQUEST_TYPE_CLASS, USB_REQUEST_RECIPIENT_DEVICE,
@@ -243 +246 @@
                 dprintf(USB_LOG_LEVEL_ERROR, "failed when receiving hub descriptor, badcode = %d",opResult);
                 free(serialized_descriptor);
-                return result;
+                free(result);
+                return NULL;
         }
         dprintf(USB_LOG_LEVEL_DEBUG2, "deserializing descriptor");
@@ -249 +253 @@
         if(descriptor==NULL){
                 dprintf(USB_LOG_LEVEL_WARNING, "could not deserialize descriptor ");
-                result->port_count = 1;///\TODO this code is only for debug!!!
-                return result;
+                free(result);
+                return NULL;
         }
 
@@ -286 +290 @@
 
         usb_hub_info_t * hub_info = usb_create_hub_info(dev);
+        if(!hub_info){
+                return EINTR;
+        }
 
         int opResult;
@@ -294 +301 @@
         opResult = usb_hub_process_configuration_descriptors(hub_info);
         if(opResult != EOK){
-                dprintf(USB_LOG_LEVEL_ERROR,"could not get condiguration descriptors, %d",
+                dprintf(USB_LOG_LEVEL_ERROR,"could not get configuration descriptors, %d",
                                 opResult);
                 return opResult;

uspace/drv/usbmouse/main.c

@@ -74 +74 @@
 int main(int argc, char *argv[])
 {
-        usb_log_enable(USB_LOG_LEVEL_DEBUG, NAME);
+        usb_log_enable(USB_LOG_LEVEL_DEBUG2, NAME);
 
         return ddf_driver_main(&mouse_driver);

uspace/drv/usbmouse/mouse.c

@@ -37 +37 @@
 #include <usb/debug.h>
 #include <errno.h>
+#include <str_error.h>
 #include <ipc/mouse.h>
 
@@ -64 +65 @@
 
                 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 +139 @@
         }
 
+        /*
+         * 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;
 }