Changeset 51b46f2 in mainline for uspace/drv/usbhid/hid.h

Timestamp:

2011-03-01T15:39:52Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

e135751

Parents:

0e3505a (diff), cc44f7e (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 development/ changes

File:

• uspace/drv/usbhid/hid.h (modified) (2 diffs)

uspace/drv/usbhid/hid.h

@@ -37 +37 @@
 #define USBHID_HID_H_
 
+#include <stdint.h>
+
 #include <usb/classes/hid.h>
 #include <ddf/driver.h>
 #include <usb/pipes.h>
-
-/**
- *
- */
-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;
 
 /**
@@ -68 +50 @@
 typedef struct {
         ddf_dev_t *device;
-        usb_hid_configuration_t *conf;
-        usb_hid_report_parser_t *parser;
 
         usb_device_connection_t wire;
         usb_endpoint_pipe_t ctrl_pipe;
         usb_endpoint_pipe_t poll_pipe;
+        
+        uint16_t iface;
+        
+        uint8_t *report_desc;
+        usb_hid_report_parser_t *parser;
+        
+        uint8_t *keycodes;
+        size_t keycode_count;
+        uint8_t modifiers;
+        
+        unsigned mods;
+        unsigned lock_keys;
 } usb_hid_dev_kbd_t;
 
-// TODO: more configurations!
-
 #endif