Changeset 8c877b2 in mainline for uspace/drv/usbhid/hiddev.h

Timestamp:

2011-03-04T13:05:35Z (14 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

d49728c

Parents:

dff940f8 (diff), 9a422574 (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 with \usb\development

File:

• uspace/drv/usbhid/hiddev.h (moved) (moved from uspace/drv/usbhid/hid.h ) (1 diff)

uspace/drv/usbhid/hiddev.h

@@ -31 +31 @@
  */
 /** @file
- * Common definitions.
+ * Generic USB HID device structure and API.
  */
 
-#ifndef USBHID_HID_H_
-#define USBHID_HID_H_
+#ifndef USBHID_HIDDEV_H_
+#define USBHID_HIDDEV_H_
+
+#include <stdint.h>
+
+#include <ddf/driver.h>
 
 #include <usb/classes/hid.h>
-#include <ddf/driver.h>
 #include <usb/pipes.h>
+#include <usb/classes/hidparser.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;
-
-/**
- * @brief USB/HID keyboard device type.
- *
- * Quite dummy right now.
+ * @brief USB/HID device type.
  */
 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;
-} usb_hid_dev_kbd_t;
+        
+        uint16_t iface;
+        
+        uint8_t *report_desc;
+        usb_hid_report_parser_t *parser;
+        
+        int initialized;
+} usbhid_dev_t;
 
-// TODO: more configurations!
+/*----------------------------------------------------------------------------*/
 
-#endif
+usbhid_dev_t *usbhid_dev_new(void);
+
+void usbhid_dev_free(usbhid_dev_t **hid_dev);
+
+int usbhid_dev_init(usbhid_dev_t *hid_dev, ddf_dev_t *dev,
+    usb_endpoint_description_t *poll_ep_desc);
+
+/*----------------------------------------------------------------------------*/
+
+#endif /* USBHID_HIDDEV_H_ */
+
+/**
+ * @}
+ */