Changeset 9097c16a in mainline for uspace/drv/usbhid/hid.h

Timestamp:

2011-02-04T13:14:14Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

9e7cdf8

Parents:

11797d5 (diff), ff244e6 (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 development

File:

• uspace/drv/usbhid/hid.h (moved) (moved from uspace/drv/vhc/debug.c ) (2 diffs)

uspace/drv/usbhid/hid.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Vojtech Horky
+ * Copyright (c) 2011 Lubos Slovak
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup usb
+/** @addtogroup drvusbhid
  * @{
  */
 /** @file
- * @brief Debugging support.
+ * Common definitions.
  */
-#include <stdio.h>
-#include <ipc/ipc.h>
-#include <usb/debug.h>
 
-#include "vhcd.h"
+#ifndef USBHID_HID_H_
+#define USBHID_HID_H_
 
-
-/** Debug print informing of invalid call.
- */
-void dprintf_inval_call(int level, ipc_call_t call, sysarg_t phone_hash)
-{
-        dprintf(level, "phone%#x: invalid call [%u (%u, %u, %u, %u, %u)]",
-            phone_hash,
-            IPC_GET_IMETHOD(call),
-            IPC_GET_ARG1(call), IPC_GET_ARG2(call), IPC_GET_ARG3(call),
-            IPC_GET_ARG4(call), IPC_GET_ARG5(call));
-}
+#include <usb/classes/hid.h>
+#include <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;
+
+/**
+ * @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_hid_report_parser_t *parser;
+
+        usb_device_connection_t wire;
+        usb_endpoint_pipe_t poll_pipe;
+} usb_hid_dev_kbd_t;
+
+// TODO: more configurations!
+
+#endif