Changeset fd07e526 in mainline for uspace/lib/usb/include/usb/usb.h

Timestamp:

2011-09-16T14:50:20Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

432a269, d1e18573

Parents:

47fecbb (diff), 82a31261 (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 USB changes from bzr://krabicka.net/orome/helenos/usb/

• Move common HC code from uhci/ohci drivers to libusbhost
• Rewrite USB HC interface to have common read/write functions for all transfer types.
• Restructure hc drivers to avoid some hooks and void* casts
• Cleanup the code and remove unnecessary mallocs.

File:

• uspace/lib/usb/include/usb/usb.h (modified) (4 diffs)

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

@@ -36 +36 @@
 #define LIBUSB_USB_H_
 
+#include <bool.h>
 #include <sys/types.h>
 #include <byteorder.h>
@@ -105 +106 @@
  * Negative values could be used to indicate error.
  */
-typedef int usb_address_t;
+typedef int16_t usb_address_t;
 
 /** Default USB address. */
@@ -115 +116 @@
  * Negative values could be used to indicate error.
  */
-typedef int usb_endpoint_t;
+typedef int16_t usb_endpoint_t;
 
 /** Maximum endpoint number in USB 1.1.
@@ -125 +126 @@
  * Pair address + endpoint is identification of transaction recipient.
  */
-typedef struct {
-        usb_address_t address;
-        usb_endpoint_t endpoint;
+typedef union {
+        struct {
+                usb_address_t address;
+                usb_endpoint_t endpoint;
+        } __attribute__((packed));
+        uint32_t packed;
 } usb_target_t;
+
+/** Check USB target for allowed values (address and endpoint).
+ *
+ * @param target.
+ * @return True, if values are wihtin limits, false otherwise.
+ */
+static inline bool usb_target_is_valid(usb_target_t target)
+{
+        return !(target.endpoint > 15 || target.endpoint < 0
+            || target.address >= USB11_ADDRESS_MAX || target.address < 0);
+}
 
 /** Compare USB targets (addresses and endpoints).