Changeset 904b1bc in mainline for uspace/drv/bus/usb/ehci/hw_struct/queue_head.h

Timestamp:

2018-05-22T10:36:58Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

a4eb3ba2

Parents:

4f8772d4

git-author:

Jiri Svoboda <jiri@…> (2018-05-21 17:36:30)

git-committer:

Jiri Svoboda <jiri@…> (2018-05-22 10:36:58)

Message:

Fix remaining ccheck issues.

File:

• uspace/drv/bus/usb/ehci/hw_struct/queue_head.h (modified) (6 diffs)

uspace/drv/bus/usb/ehci/hw_struct/queue_head.h

@@ -49 +49 @@
 
         volatile uint32_t ep_char;
+        volatile uint32_t ep_cap;
+
+        link_pointer_t current;
+        /* Transfer overlay starts here */
+        link_pointer_t next;
+        link_pointer_t alternate;
+        volatile uint32_t status;
+        volatile uint32_t buffer_pointer[5];
+
+        /* 64 bit struct only */
+        volatile uint32_t extended_bp[5];
+} __attribute__((packed, aligned(32))) qh_t;
+
+/*
+ * qh_t.ep_char
+ */
 #define QH_EP_CHAR_RL_MASK    0xf
 #define QH_EP_CHAR_RL_SHIFT   28
@@ -78 +94 @@
     (((val) >> QH_EP_CHAR_ADDR_SHIFT) & QH_EP_CHAR_ADDR_MASK)
 
-        volatile uint32_t ep_cap;
+/*
+ * qh_t.ep_cap
+ */
 #define QH_EP_CAP_MULTI_MASK   0x3
 #define QH_EP_CAP_MULTI_SHIFT  30
@@ -100 +118 @@
         (((val) & QH_EP_CAP_S_MASK_MASK) << QH_EP_CAP_S_MASK_SHIFT)
 
-        link_pointer_t current;
-/* Transfer overlay starts here */
-        link_pointer_t next;
-        link_pointer_t alternate;
+/*
+ * qh_t.alternate
+ */
 #define QH_ALTERNATE_NACK_CNT_MASK   0x7
 #define QH_ALTERNATE_NACK_CNT_SHIFT  1
 
-        volatile uint32_t status;
+/*
+ * qh_t.status
+ */
 #define QH_STATUS_TOGGLE_FLAG   (1 << 31)
 #define QH_STATUS_TOTAL_MASK    0x7fff
@@ -127 +146 @@
 #define QH_STATUS_PING_FLAG     (1 << 0)
 
-        volatile uint32_t buffer_pointer[5];
+/*
+ * qh_t.buffer_pointer
+ */
 #define QH_BUFFER_POINTER_MASK   0xfffff000
 /* Only the first buffer pointer */
@@ -141 +162 @@
 #define QH_BUFFER_POINTER_FTAG_SHIFT  0
 
-        /* 64 bit struct only */
-        volatile uint32_t extended_bp[5];
-} __attribute__((packed, aligned(32))) qh_t;
 
 static inline void qh_append_qh(qh_t *qh, const qh_t *next)
@@ -212 +230 @@
 }
 
-
-void qh_init(qh_t *instance, const endpoint_t *ep);
+extern void qh_init(qh_t *instance, const endpoint_t *ep);
+
 #endif
 /**