Changes in / [dc4c19e:82e8861] in mainline

Location:

uspace/drv/usbhid

Files:

• Makefile (modified) (1 diff)
• generic/hiddev.c (modified) (1 diff)
• generic/hiddev.h (modified) (2 diffs)
• kbd/kbddev.c (modified) (1 diff)
• kbd/kbddev.h (modified) (6 diffs)
• mouse/mousedev.c (deleted)
• mouse/mousedev.h (deleted)
• usbhid.c (modified) (7 diffs)
• usbhid.ma (modified) (1 diff)

uspace/drv/usbhid/Makefile

@@ -44 +44 @@
         kbd/kbdrepeat.c \
         generic/hiddev.c \
-        mouse/mousedev.c \
         $(STOLEN_LAYOUT_SOURCES)
 

uspace/drv/usbhid/generic/hiddev.c

@@ -57 +57 @@
      size_t buffer_size, void *arg)
 {
-        usb_log_debug("usb_hid_polling_callback(%p, %p, %zu, %p)\n",
-            dev, buffer, buffer_size, arg);
+        usb_log_debug("usb_hid_polling_callback()\n");
         usb_debug_str_buffer(buffer, buffer_size, 0);
         return true;

uspace/drv/usbhid/generic/hiddev.h

@@ -34 +34 @@
  */
 
-#ifndef USB_HIDDDEV_H_
-#define USB_HIDDDEV_H_
+#ifndef USB_HIDD_H_
+#define USB_HIDD_H_
 
 #include <usb/devdrv.h>
@@ -47 +47 @@
      size_t buffer_size, void *arg);
 
-#endif // USB_HIDDDEV_H_
+#endif // USB_HIDD_H_
 
 /**

uspace/drv/usbhid/kbd/kbddev.c

@@ -238 +238 @@
  * @param icall Call data.
  */
-static void default_connection_handler(ddf_fun_t *fun,
+void default_connection_handler(ddf_fun_t *fun,
     ipc_callid_t icallid, ipc_call_t *icall)
 {

uspace/drv/usbhid/kbd/kbddev.h

@@ -65 +65 @@
  */
 typedef struct usb_kbd_t {
+        /** Structure holding generic USB device information. */
+        //usbhid_dev_t *hid_dev;
+        //usb_device_t *usb_dev;
+        
         /** Currently pressed keys (not translated to key codes). */
         uint8_t *keys;
@@ -87 +91 @@
         fibril_mutex_t *repeat_mtx;
         
+        /** Report descriptor. */
+        //uint8_t *report_desc;
+
+        /** Report descriptor size. */
+        //size_t report_desc_size;
+        
         uint8_t *output_buffer;
         
@@ -96 +106 @@
         
         int32_t *led_data;
+
+        /** HID Report parser. */
+        //usb_hid_report_parser_t *parser;
         
         /** State of the structure (for checking before use). 
@@ -108 +121 @@
 /*----------------------------------------------------------------------------*/
 
+//enum {
+//      USB_KBD_POLL_EP_NO = 0,
+//      USB_HID_POLL_EP_NO = 1,
+//      USB_KBD_POLL_EP_COUNT = 2
+//};
+
+//usb_endpoint_description_t *usb_kbd_endpoints[USB_KBD_POLL_EP_COUNT + 1];
+
+//ddf_dev_ops_t keyboard_ops;
+
 usb_endpoint_description_t usb_hid_kbd_poll_endpoint_description;
 
@@ -115 +138 @@
 /*----------------------------------------------------------------------------*/
 
+//usb_kbd_t *usb_kbd_new(void);
+
 int usb_kbd_init(struct usb_hid_dev_t *hid_dev);
 
 bool usb_kbd_polling_callback(usb_device_t *dev, uint8_t *buffer,
      size_t buffer_size, void *arg);
+
+//void usb_kbd_polling_ended_callback(usb_device_t *dev, bool reason, 
+//     void *arg);
 
 int usb_kbd_is_initialized(const usb_kbd_t *kbd_dev);
@@ -129 +157 @@
     int type, unsigned int key);
 
+
 void usb_kbd_deinit(struct usb_hid_dev_t *hid_dev);
 

uspace/drv/usbhid/usbhid.c

@@ -47 +47 @@
 #include "kbd/kbddev.h"
 #include "generic/hiddev.h"
-#include "mouse/mousedev.h"
-
-/*----------------------------------------------------------------------------*/
+
+/*----------------------------------------------------------------------------*/
+
+/** Mouse polling endpoint description for boot protocol class. */
+static usb_endpoint_description_t usb_hid_mouse_poll_endpoint_description = {
+        .transfer_type = USB_TRANSFER_INTERRUPT,
+        .direction = USB_DIRECTION_IN,
+        .interface_class = USB_CLASS_HID,
+        .interface_subclass = USB_HID_SUBCLASS_BOOT,
+        .interface_protocol = USB_HID_PROTOCOL_MOUSE,
+        .flags = 0
+};
 
 /* Array of endpoints expected on the device, NULL terminated. */
@@ -59 +68 @@
 };
 
+static const char *HID_MOUSE_FUN_NAME = "mouse";
+static const char *HID_MOUSE_CLASS_NAME = "mouse";
+
 /*----------------------------------------------------------------------------*/
 
@@ -84 +96 @@
 /*----------------------------------------------------------------------------*/
 
+static bool usb_dummy_polling_callback(usb_device_t *dev, uint8_t *buffer,
+     size_t buffer_size, void *arg)
+{
+        usb_log_debug("Dummy polling callback.\n");
+        return false;
+}
+
+/*----------------------------------------------------------------------------*/
+
 static int usb_hid_check_pipes(usb_hid_dev_t *hid_dev, usb_device_t *dev)
 {
@@ -104 +125 @@
                 
                 // set the polling callback
-                hid_dev->poll_callback = usb_mouse_polling_callback;
+                hid_dev->poll_callback = usb_dummy_polling_callback;
                 
         } else if (dev->pipes[USB_HID_GENERIC_POLL_EP_NO].present) {
@@ -140 +161 @@
             hid_dev->parser);
         
-        if (rc != EOK || hid_dev->device_type == USB_HID_PROTOCOL_MOUSE) {
+        if (rc != EOK) {
                 usb_log_warning("Could not process report descriptor.\n");
                 
                 if (hid_dev->device_type == USB_HID_PROTOCOL_KEYBOARD) {
                         usb_log_warning("Falling back to boot protocol.\n");
+                        
                         rc = usb_kbd_set_boot_protocol(hid_dev);
+                        
                 } else if (hid_dev->device_type == USB_HID_PROTOCOL_MOUSE) {
-                        usb_log_warning("Falling back to boot protocol.\n");
-                        rc = usb_mouse_set_boot_protocol(hid_dev);
+                        usb_log_warning("No boot protocol for mouse yet.\n");
+                        rc = ENOTSUP;
                 }
         }
@@ -199 +222 @@
                 break;
         case USB_HID_PROTOCOL_MOUSE:
-                rc = usb_mouse_init(hid_dev);
-                if (rc != EOK) {
-                        usb_log_warning("Failed to initialize Mouse structure."
-                            "\n");
-                }
                 break;
         default:
+//              usbhid_req_set_idle(&hid_dev->usb_dev->ctrl_pipe, 
+//                  hid_dev->usb_dev->interface_no, 0);
                 break;
         }
@@ -271 +291 @@
                 break;
         case USB_HID_PROTOCOL_MOUSE:
-                usb_mouse_deinit(*hid_dev);
                 break;
         default:

uspace/drv/usbhid/usbhid.ma

@@ -1 +1 @@
 100 usb&interface&class=HID&subclass=0x01&protocol=0x01
-1000 usb&interface&class=HID&subclass=0x01&protocol=0x02
+100 usb&interface&class=HID&subclass=0x01&protocol=0x02
 100 usb&interface&class=HID