Changes in uspace/drv/usbhid/usbhid.c [f8e549b:36f737a] in mainline

File:

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

uspace/drv/usbhid/usbhid.c

@@ -63 +63 @@
 static const int USB_HID_MAX_SUBDRIVERS = 10;
 
-static fibril_local bool report_received;
-
 /*----------------------------------------------------------------------------*/
 
@@ -138 +136 @@
         
         // set the init callback
-        hid_dev->subdrivers[0].init = usb_generic_hid_init;
+        hid_dev->subdrivers[0].init = NULL;
         
         // set the polling callback
@@ -414 +412 @@
         }
         
-        if (fallback) {
+        // TODO: remove the mouse hack
+        if (hid_dev->poll_pipe_index == USB_HID_MOUSE_POLL_EP_NO ||
+            fallback) {
                 // fall back to boot protocol
                 switch (hid_dev->poll_pipe_index) {
@@ -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);
-                        }
-                        usb_hid_new_report();
-                }
-        }
-        
-        /*! @todo This should probably be atomic. */
-        memcpy(hid_dev->input_report, buffer, buffer_size);
-        hid_dev->input_report_size = buffer_size;
-        
         bool cont = false;
         
@@ -555 +528 @@
 /*----------------------------------------------------------------------------*/
 
-//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;
-//      }
-//}
-
-/*----------------------------------------------------------------------------*/
-
-void usb_hid_new_report(void)
-{
-        report_received = false;
-}
-
-/*----------------------------------------------------------------------------*/
-
-void usb_hid_report_received(void)
-{
-        report_received = true;
-}
-
-/*----------------------------------------------------------------------------*/
-
-bool usb_hid_report_ready(void)
-{
-        return !report_received;
+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;
+        }
 }