Changeset 26f6094 in mainline for uspace/drv/usbhid/usbhid.c

Timestamp:

2011-05-06T09:25:44Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

d0c060b

Parents:

9e929a0 (diff), 310c4df (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 with usb/development

File:

• uspace/drv/usbhid/usbhid.c (modified) (3 diffs)

uspace/drv/usbhid/usbhid.c

@@ -136 +136 @@
         
         // set the init callback
-        hid_dev->subdrivers[0].init = NULL;
+        hid_dev->subdrivers[0].init = usb_generic_hid_init;
         
         // set the polling callback
@@ -490 +490 @@
         usb_hid_dev_t *hid_dev = (usb_hid_dev_t *)arg;
         
+        int allocated = (hid_dev->input_report != NULL);
+        
+        if (!allocated
+            || hid_dev->input_report_size < buffer_size) {
+                uint8_t *input_old = hid_dev->input_report;
+                uint8_t *input_new = (uint8_t *)malloc(buffer_size);
+                
+                if (input_new == NULL) {
+                        usb_log_error("Failed to allocate space for input "
+                            "buffer. This event may not be reported\n");
+                        memset(hid_dev->input_report, 0, 
+                            hid_dev->input_report_size);
+                } else {
+                        memcpy(input_new, input_old, 
+                            hid_dev->input_report_size);
+                        hid_dev->input_report = input_new;
+                        if (allocated) {
+                                free(input_old);
+                        }
+                }
+        }
+        
+        /*! @todo This should probably be atomic. */
+        memcpy(hid_dev->input_report, buffer, buffer_size);
+        hid_dev->input_report_size = buffer_size;
+        
         bool cont = false;
         
@@ -528 +554 @@
 /*----------------------------------------------------------------------------*/
 
-const char *usb_hid_get_function_name(const usb_hid_dev_t *hid_dev)
-{
-        switch (hid_dev->poll_pipe_index) {
-        case USB_HID_KBD_POLL_EP_NO:
-                return HID_KBD_FUN_NAME;
-                break;
-        case USB_HID_MOUSE_POLL_EP_NO:
-                return HID_MOUSE_FUN_NAME;
-                break;
-        default:
-                return HID_GENERIC_FUN_NAME;
-        }
-}
-
-/*----------------------------------------------------------------------------*/
-
-const char *usb_hid_get_class_name(const usb_hid_dev_t *hid_dev)
-{
-        // this means that only boot protocol keyboards will be connected
-        // to the console; there is probably no better way to do this
-        
-        switch (hid_dev->poll_pipe_index) {
-        case USB_HID_KBD_POLL_EP_NO:
-                return HID_KBD_CLASS_NAME;
-                break;
-        case USB_HID_MOUSE_POLL_EP_NO:
-                return HID_MOUSE_CLASS_NAME;
-                break;
-        default:
-                return HID_GENERIC_CLASS_NAME;
-        }
-}
+//const char *usb_hid_get_function_name(const usb_hid_dev_t *hid_dev)
+//{
+//      switch (hid_dev->poll_pipe_index) {
+//      case USB_HID_KBD_POLL_EP_NO:
+//              return HID_KBD_FUN_NAME;
+//              break;
+//      case USB_HID_MOUSE_POLL_EP_NO:
+//              return HID_MOUSE_FUN_NAME;
+//              break;
+//      default:
+//              return HID_GENERIC_FUN_NAME;
+//      }
+//}
+
+/*----------------------------------------------------------------------------*/
+
+//const char *usb_hid_get_class_name(const usb_hid_dev_t *hid_dev)
+//{
+//      // this means that only boot protocol keyboards will be connected
+//      // to the console; there is probably no better way to do this
+        
+//      switch (hid_dev->poll_pipe_index) {
+//      case USB_HID_KBD_POLL_EP_NO:
+//              return HID_KBD_CLASS_NAME;
+//              break;
+//      case USB_HID_MOUSE_POLL_EP_NO:
+//              return HID_MOUSE_CLASS_NAME;
+//              break;
+//      default:
+//              return HID_GENERIC_CLASS_NAME;
+//      }
+//}
 
 /*----------------------------------------------------------------------------*/