Changeset 7a725b13 in mainline for uspace/lib/usb/include

Timestamp:

2011-01-14T14:23:33Z (15 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

b65ca41d

Parents:

f40a1e2 (diff), 2f60e57d (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 from usb/development

Location:

uspace/lib/usb/include/usb

Files:

• classes/hidparser.h (modified) (3 diffs)
• dp.h (moved) (moved from uspace/srv/net/tl/icmp/icmp_module.h ) (2 diffs)

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

@@ -38 +38 @@
 #include <stdint.h>
 
+/**
+ * Description of report items
+ */
+typedef struct {
+
+        uint8_t usage_min;
+        uint8_t usage_max;
+        uint8_t logical_min;
+        uint8_t logical_max;
+        uint8_t size;
+        uint8_t count;
+        uint8_t offset;
+
+} usb_hid_report_item_t;
+
+
 /** HID report parser structure. */
 typedef struct {
 } usb_hid_report_parser_t;
+
 
 /** HID parser callbacks for IN items. */
@@ -50 +67 @@
          * @param arg Custom argument.
          */
-        void (*keyboard)(const uint16_t *key_codes, size_t count, void *arg);
+        void (*keyboard)(const uint8_t *key_codes, size_t count, const uint8_t modifiers, void *arg);
 } usb_hid_report_in_callbacks_t;
+
+#define USB_HID_BOOT_KEYBOARD_NUM_LOCK          0x01
+#define USB_HID_BOOT_KEYBOARD_CAPS_LOCK         0x02
+#define USB_HID_BOOT_KEYBOARD_SCROLL_LOCK       0x04
+#define USB_HID_BOOT_KEYBOARD_COMPOSE           0x08
+#define USB_HID_BOOT_KEYBOARD_KANA                      0x10
+
+/*
+ * modifiers definitions
+ */
+
+int usb_hid_boot_keyboard_input_report(const uint8_t *data, size_t size,
+        const usb_hid_report_in_callbacks_t *callbacks, void *arg);
+
+int usb_hid_boot_keyboard_output_report(uint8_t leds, uint8_t *data, size_t size);
 
 int usb_hid_parse_report_descriptor(usb_hid_report_parser_t *parser, 
@@ -60 +92 @@
     const usb_hid_report_in_callbacks_t *callbacks, void *arg);
 
+
+int usb_hid_free_report_parser(usb_hid_report_parser_t *parser);
+
 #endif
 /**

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2008 Lukas Mejdrech
+ * Copyright (c) 2011 Vojtech Horky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup icmp
+/** @addtogroup libusb
  * @{
  */
+/** @file
+ * @brief USB descriptor parser.
+ */
+#ifndef LIBUSB_DP_H_
+#define LIBUSB_DP_H_
 
-/** @file
- * ICMP module functions.
- * The functions are used as ICMP module entry points.
- */
+#include <sys/types.h>
+#include <usb/usb.h>
+#include <usb/descriptor.h>
 
-#ifndef NET_ICMP_MODULE_H_
-#define NET_ICMP_MODULE_H_
+typedef struct {
+        int child;
+        int parent;
+} usb_dp_descriptor_nesting_t;
 
-#include <async.h>
-#include <ipc/ipc.h>
+typedef struct {
+        usb_dp_descriptor_nesting_t *nesting;
+} usb_dp_parser_t;
 
-extern int icmp_initialize(async_client_conn_t);
-extern int icmp_message_standalone(ipc_callid_t, ipc_call_t *, ipc_call_t *,
-    size_t *);
+typedef struct {
+        uint8_t *data;
+        size_t size;
+        void *arg;
+} usb_dp_parser_data_t;
+
+uint8_t *usb_dp_get_nested_descriptor(usb_dp_parser_t *,
+    usb_dp_parser_data_t *, uint8_t *);
+uint8_t *usb_dp_get_sibling_descriptor(usb_dp_parser_t *,
+    usb_dp_parser_data_t *, uint8_t *, uint8_t *);
 
 #endif
-
-/** @}
+/**
+ * @}
  */