Changeset fd07e526 in mainline for uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.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/drv/bus/usb/uhci/hw_struct/transfer_descriptor.h (modified) (7 diffs)

uspace/drv/bus/usb/uhci/hw_struct/transfer_descriptor.h

@@ -69 +69 @@
 #define TD_STATUS_ACTLEN_MASK 0x7ff
 
-        /* double word with USB device specific info */
+        /** Double word with USB device specific info */
         volatile uint32_t device;
 #define TD_DEVICE_MAXLEN_POS 21
@@ -87 +87 @@
         /* According to UHCI design guide, there is 16 bytes of
          * data available here.
-         * According to linux kernel the hardware does not care,
-         * it just needs to be aligned. We don't use it anyway.
+         * According to Linux kernel the hardware does not care,
+         * memory just needs to be aligned. We don't use it anyway.
          */
 } __attribute__((packed)) td_t;
@@ -95 +95 @@
 void td_init(td_t *instance, int error_count, size_t size, bool toggle,
     bool iso, bool low_speed, usb_target_t target, usb_packet_id pid,
-    void *buffer, td_t *next);
+    const void *buffer, const td_t *next);
 
-int td_status(td_t *instance);
+int td_status(const td_t *instance);
 
-void td_print_status(td_t *instance);
+void td_print_status(const td_t *instance);
 /*----------------------------------------------------------------------------*/
 /** Helper function for parsing actual size out of TD.
@@ -106 +106 @@
  * @return Parsed actual size.
  */
-static inline size_t td_act_size(td_t *instance)
+static inline size_t td_act_size(const td_t *instance)
 {
         assert(instance);
         const uint32_t s = instance->status;
+        /* Actual size is encoded as n-1 (UHCI design guide p. 23) */
         return ((s >> TD_STATUS_ACTLEN_POS) + 1) & TD_STATUS_ACTLEN_MASK;
 }
@@ -119 +120 @@
  * false otherwise.
  */
-static inline bool td_is_short(td_t *instance)
+static inline bool td_is_short(const td_t *instance)
 {
         const size_t act_size = td_act_size(instance);
@@ -134 +135 @@
  * @return Toggle bit value.
  */
-static inline int td_toggle(td_t *instance)
+static inline int td_toggle(const td_t *instance)
 {
         assert(instance);
@@ -145 +146 @@
  * @return Active bit value.
  */
-static inline bool td_is_active(td_t *instance)
+static inline bool td_is_active(const td_t *instance)
 {
         assert(instance);