Changeset 00db345a in mainline for uspace/drv/uhci-hcd/uhci_struct/transfer_descriptor.h

Timestamp:

2011-03-05T11:51:14Z (14 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

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

Children:

1efe89b

Parents:

7ac73a4 (diff), 474d08e (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:

Merged development changes.

File:

• uspace/drv/uhci-hcd/uhci_struct/transfer_descriptor.h (modified) (1 diff)

uspace/drv/uhci-hcd/uhci_struct/transfer_descriptor.h

@@ -88 +88 @@
          * we don't use it anyway
          */
-} __attribute__((packed)) transfer_descriptor_t;
+} __attribute__((packed)) td_t;
 
 
-void transfer_descriptor_init(transfer_descriptor_t *instance,
-    int error_count, size_t size, bool toggle, bool isochronous, bool low_speed,
-    usb_target_t target, int pid, void *buffer, transfer_descriptor_t * next);
+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);
 
-int transfer_descriptor_status(transfer_descriptor_t *instance);
+int td_status(td_t *instance);
 
-static inline size_t transfer_descriptor_actual_size(
-    transfer_descriptor_t *instance)
+static inline size_t td_act_size(td_t *instance)
 {
         assert(instance);
         return
-            ((instance->status >> TD_STATUS_ACTLEN_POS) + 1) & TD_STATUS_ACTLEN_MASK;
+            ((instance->status >> TD_STATUS_ACTLEN_POS) + 1)
+            & TD_STATUS_ACTLEN_MASK;
 }
 
-static inline bool transfer_descriptor_is_active(
-    transfer_descriptor_t *instance)
+static inline bool td_is_short(td_t *instance)
+{
+        const size_t act_size = td_act_size(instance);
+        const size_t max_size =
+            ((instance->device >> TD_DEVICE_MAXLEN_POS) + 1)
+            & TD_DEVICE_MAXLEN_MASK;
+        return
+            (instance->status | TD_STATUS_SPD_FLAG) && act_size < max_size;
+}
+
+static inline bool td_is_active(td_t *instance)
 {
         assert(instance);