Changeset cd4ae1e in mainline for uspace/app/virtusbkbd/virtusbkbd.c

Timestamp:

2011-04-28T13:14:14Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

54d71e1, a146aa33

Parents:

74f00b6 (diff), c82135a8 (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:

Better virtual USB HID; USB-virt rewritten

The new virtual USB HID is easily extensible with new interfaces that
might provide different report descriptors.

The virtual host controller was completely rewritten together
with the libusbvirt.

The documentation is missing and the code would deserver some refactoring.
That will appear later.

File:

• uspace/app/virtusbkbd/virtusbkbd.c (modified) (9 diffs)

uspace/app/virtusbkbd/virtusbkbd.c

@@ -48 +48 @@
 #include <usb/descriptor.h>
 #include <usb/classes/hid.h>
+#include <usb/debug.h>
 #include <usbvirt/device.h>
-#include <usbvirt/hub.h>
 
 #include "kbdconfig.h"
@@ -67 +67 @@
 
 kb_status_t status;
-
-static int on_incoming_data(struct usbvirt_device *dev,
-    usb_endpoint_t endpoint, void *buffer, size_t size)
-{
-        printf("%s: ignoring incomming data to endpoint %d\n", NAME, endpoint);
-        
-        return EOK;
-}
-
 
 /** Compares current and last status of pressed keys.
@@ -100 +91 @@
 }
 
-static int on_request_for_data(struct usbvirt_device *dev,
-    usb_endpoint_t endpoint, void *buffer, size_t size, size_t *actual_size)
+static int on_request_for_data(usbvirt_device_t *dev,
+    usb_endpoint_t endpoint, usb_transfer_type_t transfer_type,
+    void *buffer, size_t size, size_t *actual_size)
 {
         static uint8_t last_data[2 + KB_MAX_KEYS_AT_ONCE];
@@ -122 +114 @@
         if (keypress_check_with_last_request(data, last_data,
             2 + KB_MAX_KEYS_AT_ONCE)) {
-                *actual_size = 0;
-                return EOK;
+                return ENAK;
         }
 
@@ -131 +122 @@
 }
 
-static usbvirt_control_transfer_handler_t endpoint_zero_handlers[] = {
-        {
-                .request_type = USBVIRT_MAKE_CONTROL_REQUEST_TYPE(
-                    USB_DIRECTION_IN,
-                    USBVIRT_REQUEST_TYPE_STANDARD,
-                    USBVIRT_REQUEST_RECIPIENT_DEVICE),
+static usbvirt_control_request_handler_t endpoint_zero_handlers[] = {
+        {
+                .req_direction = USB_DIRECTION_IN,
+                .req_type = USB_REQUEST_TYPE_STANDARD,
+                .req_recipient = USB_REQUEST_RECIPIENT_INTERFACE,
                 .request = USB_DEVREQ_GET_DESCRIPTOR,
                 .name = "GetDescriptor",
-                .callback = stdreq_on_get_descriptor
+                .callback = req_get_descriptor
         },
         {
-                .request_type = USBVIRT_MAKE_CONTROL_REQUEST_TYPE(
-                    USB_DIRECTION_IN,
-                    USBVIRT_REQUEST_TYPE_CLASS,
-                    USBVIRT_REQUEST_RECIPIENT_DEVICE),
-                .request = USB_DEVREQ_GET_DESCRIPTOR,
-                .name = "GetDescriptor",
-                .callback = stdreq_on_get_descriptor
-        },
-        USBVIRT_CONTROL_TRANSFER_HANDLER_LAST
+                .callback = NULL
+        }
 };
 
@@ -157 +140 @@
  */
 static usbvirt_device_ops_t keyboard_ops = {
-        .control_transfer_handlers = endpoint_zero_handlers,
-        .on_data = on_incoming_data,
-        .on_data_request = on_request_for_data
+        .control = endpoint_zero_handlers,
+        .data_in[1] = on_request_for_data
 };
 
@@ -197 +179 @@
         .ops = &keyboard_ops,
         .descriptors = &descriptors,
-        .lib_debug_level = 3,
-        .lib_debug_enabled_tags = USBVIRT_DEBUGTAG_ALL,
         .name = "keyboard"
 };
@@ -262 +242 @@
         
         
-        int rc = usbvirt_connect(&keyboard_dev);
+        int rc = usbvirt_device_plug(&keyboard_dev, "/virt/usbhc/hc");
         if (rc != EOK) {
                 printf("%s: Unable to start communication with VHCD (%s).\n",
@@ -278 +258 @@
         printf("%s: Terminating...\n", NAME);
         
-        usbvirt_disconnect(&keyboard_dev);
+        //usbvirt_disconnect(&keyboard_dev);
         
         return 0;