Changeset 243cb86 in mainline for uspace/drv/usbkbd/main.c

Timestamp:

2010-12-12T10:50:19Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

8365533

Parents:

101ef25c (diff), ebb98c5 (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 from development + several changes to hid driver.

Changes to hid driver:

• copied some code to usbkbd_get_descriptors() function
• base structure for hid descriptor and report parser (files uspace/lib/usb/include/usb/classes/hidparser.h

and uspace/lib/usb/src/hidparser.c)

File:

• uspace/drv/usbkbd/main.c (modified) (6 diffs)

uspace/drv/usbkbd/main.c

@@ -32 +32 @@
 #include <fibril.h>
 #include <usb/classes/hid.h>
+#include <usb/classes/hidparser.h>
+#include <usb/devreq.h>
 
 #define BUFFER_SIZE 32
@@ -37 +39 @@
 
 static const usb_endpoint_t CONTROL_EP = 0;
+
+/*
+ * Callbacks for parser
+ */
+static void usbkbd_process_keycodes(const uint16_t *key_codes, size_t count,
+                                    void *arg)
+{
+
+}
+
+/*
+ * Kbd functions
+ */
+static int usbkbd_get_descriptors()
+{
+        // copy-pasted:
+        
+        /* Prepare the setup packet. */
+        usb_device_request_setup_packet_t setup_packet = {
+                .request_type = 128,
+                .request = USB_DEVREQ_GET_DESCRIPTOR,
+                .index = 0,
+                .length = sizeof(usb_standard_device_descriptor_t)
+        };
+        
+        setup_packet.value_high = USB_DESCTYPE_DEVICE;
+        setup_packet.value_low = 0;
+
+        /* Prepare local descriptor. */
+        size_t actually_transferred = 0;
+        usb_standard_device_descriptor_t descriptor_tmp;
+
+        /* Perform the control read transaction. */
+        int rc = usb_drv_psync_control_read(phone, target,
+            &setup_packet, sizeof(setup_packet),
+            &descriptor_tmp, sizeof(descriptor_tmp), &actually_transferred);
+
+        if (rc != EOK) {
+                return rc;
+        }
+        
+        // end of copy-paste
+}
 
 static usb_hid_dev_kbd_t *usbkbd_init_device(device_t *dev)
@@ -68 +113 @@
 
         // TODO: get descriptors
-
+        usbkbd_get_descriptors();
         // TODO: parse descriptors and save endpoints
 
@@ -75 +120 @@
 
 static void usbkbd_process_interrupt_in(usb_hid_dev_kbd_t *kbd_dev,
-                                        char *buffer, size_t actual_size)
+                                        uint8_t *buffer, size_t actual_size)
 {
         /*
@@ -81 +126 @@
          * now only take last 6 bytes and process, i.e. send to kbd
          */
+
+        usb_hid_report_in_callbacks_t *callbacks =
+            (usb_hid_report_in_callbacks_t *)malloc(
+                sizeof(usb_hid_report_in_callbacks_t));
+        callbacks->keyboard = usbkbd_process_keycodes;
+
+        usb_hid_parse_report(kbd_dev->parser, buffer, callbacks, NULL);
 }
 
@@ -87 +139 @@
         int rc;
         usb_handle_t handle;
-        char buffer[BUFFER_SIZE];
+        uint8_t buffer[BUFFER_SIZE];
         size_t actual_size;
         //usb_endpoint_t poll_endpoint = 1;