Changes in / [c2772b8:a09128c] in mainline

Location:

uspace

Files:

• drv/usbhid/descdump.h (modified) (1 diff)
• drv/usbhid/descparser.h (modified) (1 diff)
• drv/usbhid/hid.h (deleted)
• drv/usbhid/main.c (modified) (1 diff)
• lib/usb/Makefile (modified) (1 diff)
• lib/usb/include/usb/classes/hid.h (modified) (2 diffs)
• lib/usb/include/usb/pipes.h (deleted)
• lib/usb/include/usb/usb.h (modified) (1 diff)
• lib/usb/src/pipes.c (deleted)

uspace/drv/usbhid/descdump.h

@@ -37 +37 @@
 #define USBHID_DESCDUMP_H_
 
-#include "hid.h"
+#include <usb/classes/hid.h>
 
 void dump_standard_configuration_descriptor(

uspace/drv/usbhid/descparser.h

@@ -37 +37 @@
 #define USBHID_DESCPARSER_H_
 
-#include "hid.h"
+#include <usb/classes/hid.h>
 
 int usbkbd_parse_descriptors(const uint8_t *data, size_t size,

uspace/drv/usbhid/main.c

@@ -49 +49 @@
 #include <usb/descriptor.h>
 #include <io/console.h>
-#include "hid.h"
 #include "descparser.h"
 #include "descdump.h"

uspace/lib/usb/Makefile

@@ -43 +43 @@
         src/hidparser.c \
         src/localdrv.c \
-        src/pipes.c \
         src/recognise.c \
         src/remotedrv.c \

uspace/lib/usb/include/usb/classes/hid.h

@@ -37 +37 @@
 
 #include <usb/usb.h>
+#include <driver.h>
 #include <usb/classes/hidparser.h>
 #include <usb/descriptor.h>
@@ -100 +101 @@
 } __attribute__ ((packed)) usb_standard_hid_descriptor_t;
 
+/**
+ *
+ */
+typedef struct {
+        usb_standard_interface_descriptor_t iface_desc;
+        usb_standard_endpoint_descriptor_t *endpoints;
+        usb_standard_hid_descriptor_t hid_desc;
+        uint8_t *report_desc;
+        //usb_standard_hid_class_descriptor_info_t *class_desc_info;
+        //uint8_t **class_descs;
+} usb_hid_iface_t;
+
+/**
+ *
+ */
+typedef struct {
+        usb_standard_configuration_descriptor_t config_descriptor;
+        usb_hid_iface_t *interfaces;
+} usb_hid_configuration_t;
+
+/**
+ * @brief USB/HID keyboard device type.
+ *
+ * Quite dummy right now.
+ */
+typedef struct {
+        device_t *device;
+        usb_hid_configuration_t *conf;
+        usb_address_t address;
+        usb_endpoint_t poll_endpoint;
+        usb_hid_report_parser_t *parser;
+} usb_hid_dev_kbd_t;
+
+// TODO: more configurations!
 
 #endif

uspace/lib/usb/include/usb/usb.h

@@ -52 +52 @@
 typedef enum {
         USB_DIRECTION_IN,
-        USB_DIRECTION_OUT,
-        USB_DIRECTION_BOTH
+        USB_DIRECTION_OUT
 } usb_direction_t;