Changeset b00849e in mainline for uspace/lib/usb/include/usb/classes/hid.h

Timestamp:

2011-02-02T00:57:32Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

1537ba6, 3597dab

Parents:

2cea1045 (diff), 2f4438f5 (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:

Merged pipe API

The pipe API shall eventually replace USB device drivers API explicitly
using phones. This API uses extra abstraction level by introducing
device connection (the wire) and endpoint pipe.

The USB HID driver uses the new API, hub driver does not.

File:

• uspace/lib/usb/include/usb/classes/hid.h (modified) (2 diffs)

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>
@@ -101 +100 @@
 } __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