Changeset cc5908e in mainline for uspace/lib/usb/include

Timestamp:

2011-05-07T14:28:51Z (15 years ago)

Author:

Matej Klonfar <maklf@…>

Branches:

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

Children:

252cf2a, 68b614e

Parents:

bd2394b (diff), 7205209 (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:

Development changes merged

Location:

uspace/lib/usb/include/usb

Files:

• classes/hid_report_items.h (modified) (1 diff)
• classes/hidtypes.h (modified) (3 diffs)
• host.h (moved) (moved from uspace/app/virtusbkbd/stdreq.h ) (2 diffs)
• usb.h (modified) (1 diff)

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

@@ -46 +46 @@
 #define USB_HID_ITEM_IS_LONG(data)      (data == 0xFE)
 
+
+/**
+ * Extended usage macros
+ */
+#define USB_HID_IS_EXTENDED_USAGE(usage)        ((usage & 0xFFFF0000) != 0)
+#define USB_HID_EXTENDED_USAGE_PAGE(usage)      ((usage & 0xFFFF0000) >> 16)
+#define USB_HID_EXTENDED_USAGE(usage)           (usage & 0xFFFF)
 
 /**

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

@@ -39 +39 @@
 #include <adt/list.h>
 
-#define USB_HID_MAX_USAGES      20
+#define USB_HID_MAX_USAGES      0xffff
 
 #define USB_HID_UINT32_TO_INT32(x, size)        ((((x) & (1 << ((size) - 1))) != 0) ? -(~(x - 1) & ((1 << size) - 1)) : (x)) //(-(~((x) - 1)))
@@ -92 +92 @@
         int32_t physical_minimum;
         int32_t physical_maximum;
-        uint32_t usage_minimum;
-        uint32_t usage_maximum;
+        int32_t usage_minimum;
+        int32_t usage_maximum;
         uint32_t unit;
         uint32_t unit_exponent;
-        
+
+        uint32_t *usages;
+        size_t usages_count;
 
         int32_t value;
@@ -121 +123 @@
 
         /** */  
-        uint32_t usage_minimum;
-        /** */  
-        uint32_t usage_maximum;
+        int32_t usage_minimum;
+        /** */  
+        int32_t usage_maximum;
         /** */  
         int32_t logical_minimum;

uspace/lib/usb/include/usb/host.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Vojtech Horky
+ * Copyright (c) 2011 Vojtech Horky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup usbvirtkbd
+/** @addtogroup libusb
  * @{
  */
 /** @file
- * @brief Standard device request handlers.
+ * Host controller common functions.
  */
-#ifndef VUK_STDREQ_H_
-#define VUK_STDREQ_H_
+#ifndef LIBUSB_HOST_H_
+#define LIBUSB_HOST_H_
 
-#include <usbvirt/device.h>
+#include <sys/types.h>
+#include <ipc/devman.h>
 
-int req_get_descriptor(usbvirt_device_t *device,
-    const usb_device_request_setup_packet_t *setup_packet,
-    uint8_t *data, size_t *act_size);
+int usb_ddf_get_hc_handle_by_class(size_t, devman_handle_t *);
 
 #endif

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

@@ -172 +172 @@
 } usb_packet_id;
 
+/** Class name for USB host controllers. */
+#define USB_HC_DDF_CLASS_NAME "usbhc"
+
 #endif
 /**