Changeset cd4ae1e in mainline for uspace/app/vuhid/virthid.h

Timestamp:

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

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/fix-logger-deadlock, 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/vuhid/virthid.h (moved) (moved from uspace/app/virtusbhub/main.c ) (1 diff)

uspace/app/vuhid/virthid.h

@@ -27 +27 @@
  */
 
-/** @addtogroup usbvirthub
+/** @addtogroup usbvirthid
  * @{
  */
-/**
- * @file
- * @brief Virtual USB hub.
+/** @file
+ *
  */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <str_error.h>
-#include <bool.h>
+#ifndef VUHID_VIRTHID_H_
+#define VUHID_VIRTHID_H_
 
 #include <usb/usb.h>
-#include <usb/descriptor.h>
-#include <usb/classes/hub.h>
 #include <usbvirt/device.h>
-#include <usbvirt/hub.h>
 
-#include "vhc_hub/virthub.h"
+#define VUHID_ENDPOINT_MAX USB11_ENDPOINT_MAX
+#define VUHID_INTERFACE_MAX 8
 
-#define NAME "vuh"
+typedef struct vuhid_interface vuhid_interface_t;
 
-static usbvirt_device_t hub_device;
+struct vuhid_interface {
+        const char *name;
+        const char *id;
+        int usb_subclass;
+        int usb_protocol;
 
-#define VERBOSE_SLEEP(sec, msg, ...) \
-        do { \
-                char _status[HUB_PORT_COUNT + 2]; \
-                printf(NAME ": doing nothing for %zu seconds...\n", \
-                    (size_t) (sec)); \
-                fibril_sleep((sec)); \
-                virthub_get_status(&hub_device, _status, HUB_PORT_COUNT + 1); \
-                printf(NAME ": " msg " [%s]\n" #__VA_ARGS__, _status); \
-        } while (0)
+        uint8_t *report_descriptor;
+        size_t report_descriptor_size;
 
-static void fibril_sleep(size_t sec)
-{
-        while (sec-- > 0) {
-                async_usleep(1000*1000);
-        }
-}
+        size_t in_data_size;
+        size_t out_data_size;
 
-static int dev1 = 1;
+        int (*on_data_in)(vuhid_interface_t *, void *, size_t, size_t *);
+        int (*on_data_out)(vuhid_interface_t *, void *, size_t);
+        void (*live)(vuhid_interface_t *);
 
-int main(int argc, char * argv[])
-{
-        int rc;
+        int set_protocol;
 
-        printf(NAME ": virtual USB hub.\n");
+        void *interface_data;
+};
 
-        rc = virthub_init(&hub_device);
-        if (rc != EOK) {
-                printf(NAME ": Unable to start communication with VHCD (%s).\n",
-                    str_error(rc));
-                return rc;
-        }
-        
-        while (true) {
-                VERBOSE_SLEEP(8, "will pretend device plug-in...");
-                virthub_connect_device(&hub_device, &dev1);
+typedef struct {
+        vuhid_interface_t *in_endpoints_mapping[VUHID_ENDPOINT_MAX];
+        size_t in_endpoint_first_free;
+        vuhid_interface_t *out_endpoints_mapping[VUHID_ENDPOINT_MAX];
+        size_t out_endpoint_first_free;
+        vuhid_interface_t *interface_mapping[VUHID_INTERFACE_MAX];
+} vuhid_data_t;
 
-                VERBOSE_SLEEP(8, "will pretend device un-plug...");
-                virthub_disconnect_device(&hub_device, &dev1);
-        }
+typedef struct {
+        uint8_t length;
+        uint8_t type;
+        uint16_t hid_spec_release;
+        uint8_t country_code;
+        uint8_t descriptor_count;
+        uint8_t descriptor1_type;
+        uint16_t descriptor1_length;
+} __attribute__ ((packed)) hid_descriptor_t;
 
-        usbvirt_disconnect(&hub_device);
-        
-        return 0;
-}
+int add_interface_by_id(vuhid_interface_t **, const char *, usbvirt_device_t *);
 
-
-/** @}
+#endif
+/**
+ * @}
  */