Changeset df6ded8 in mainline for uspace/lib/c

Timestamp:

2018-02-28T16:37:50Z (8 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

1b20da0

Parents:

f5e5f73 (diff), b2dca8de (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.

git-author:

Jakub Jermar <jakub@…> (2018-02-28 16:06:42)

git-committer:

Jakub Jermar <jakub@…> (2018-02-28 16:37:50)

Message:

Merge github.com:helenos-xhci-team/helenos

This commit merges support for USB 3 and generally refactors, fixes,
extends and cleans up the existing USB framework.

Notable additions and features:

• new host controller driver has been implemented to control various xHC models (among others, NEC Renesas uPD720200)
• isochronous data transfer mode
• support for explicit USB device removal
• USB tablet driver

Location:

uspace/lib/c/include

Files:

• bitops.h (modified) (1 diff)
• byteorder.h (modified) (1 diff)
• ipc/dev_iface.h (modified) (2 diffs)

uspace/lib/c/include/bitops.h

@@ -54 +54 @@
 #define BIT_RANGE_EXTRACT(type, hi, lo, value) \
     (((value) >> (lo)) & BIT_RRANGE(type, (hi) - (lo) + 1))
+
+/** Insert @a value between bits @a hi .. @a lo. */
+#define BIT_RANGE_INSERT(type, hi, lo, value) \
+    (((value) & BIT_RRANGE(type, (hi) - (lo) + 1)) << (lo))
 
 /** Return position of first non-zero bit from left (i.e. [log_2(arg)]).

uspace/lib/c/include/byteorder.h

@@ -85 +85 @@
 #define ntohl(n)  uint32_t_be2host((n))
 
+#define uint8_t_be2host(n)  (n)
+#define uint8_t_le2host(n)  (n)
+#define host2uint8_t_be(n)  (n)
+#define host2uint8_t_le(n)  (n)
+#define host2uint8_t_le(n)  (n)
+
+#define  int8_t_le2host(n)  uint8_t_le2host(n)
+#define int16_t_le2host(n) uint16_t_le2host(n)
+#define int32_t_le2host(n) uint32_t_le2host(n)
+#define int64_t_le2host(n) uint64_t_le2host(n)
+
+#define  int8_t_be2host(n)  uint8_t_be2host(n)
+#define int16_t_be2host(n) uint16_t_be2host(n)
+#define int32_t_be2host(n) uint32_t_be2host(n)
+#define int64_t_be2host(n) uint64_t_be2host(n)
+
+#define  host2int8_t_le(n)  host2uint8_t_le(n)
+#define host2int16_t_le(n) host2uint16_t_le(n)
+#define host2int32_t_le(n) host2uint32_t_le(n)
+#define host2int64_t_le(n) host2uint64_t_le(n)
+
+#define  host2int8_t_be(n)  host2uint8_t_be(n)
+#define host2int16_t_be(n) host2uint16_t_be(n)
+#define host2int32_t_be(n) host2uint32_t_be(n)
+#define host2int64_t_be(n) host2uint64_t_be(n)
+
 static inline uint64_t uint64_t_byteorder_swap(uint64_t n)
 {

uspace/lib/c/include/ipc/dev_iface.h

@@ -44 +44 @@
         /** Audio device pcm buffer interface */
         AUDIO_PCM_BUFFER_IFACE,
-        
+
         /** Network interface controller interface */
         NIC_DEV_IFACE,
-                
+
         /** IEEE 802.11 interface controller interface */
         IEEE80211_DEV_IFACE,
-        
+
         /** Interface provided by any PCI device. */
         PCI_DEV_IFACE,
@@ -56 +56 @@
         /** Interface provided by any USB device. */
         USB_DEV_IFACE,
-        /** Interface provided by USB host controller. */
+        /** Interface provided by USB diagnostic devices. */
+        USBDIAG_DEV_IFACE,
+        /** Interface provided by USB host controller to USB device. */
         USBHC_DEV_IFACE,
         /** Interface provided by USB HID devices. */