Changeset 79d2987 in mainline for uspace/drv/uhci-hcd/uhci_struct/transfer_descriptor.h

Timestamp:

2011-02-11T17:16:36Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

4e8e1f5

Parents:

25971d2 (diff), 608afb9 (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 development/ changes

File:

• uspace/drv/uhci-hcd/uhci_struct/transfer_descriptor.h (modified) (2 diffs)

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

@@ -38 +38 @@
 #include <usb/usb.h>
 
-#include "utils/malloc32.h"
-#include "callback.h"
 #include "link_pointer.h"
 
@@ -86 +84 @@
         volatile uint32_t buffer_ptr;
 
-        /* there is 16 bytes of data available here
-         * those are used to store callback pointer
-         * and next pointer. Thus, there is some free space
-         * on 32bits systems.
+        /* there is 16 bytes of data available here, according to UHCI
+         * Design guide, according to linux kernel the hardware does not care
+         * we don't use it anyway
          */
-        struct transfer_descriptor *next_va;
-        callback_t *callback;
 } __attribute__((packed)) transfer_descriptor_t;
 
 
 void transfer_descriptor_init(transfer_descriptor_t *instance,
-  int error_count, size_t size, bool isochronous, usb_target_t target,
-        int pid, void *buffer);
+    int error_count, size_t size, bool toggle, bool isochronous,
+    usb_target_t target, int pid, void *buffer);
 
-static inline transfer_descriptor_t * transfer_descriptor_get(
-  int error_count, size_t size, bool isochronous, usb_target_t target,
-  int pid, void *buffer)
-{
-        transfer_descriptor_t * instance =
-          malloc32(sizeof(transfer_descriptor_t));
+int transfer_descriptor_status(transfer_descriptor_t *instance);
 
-        if (instance)
-                transfer_descriptor_init(
-                  instance, error_count, size, isochronous, target, pid, buffer);
-        return instance;
-}
-
-void transfer_descriptor_fini(transfer_descriptor_t *instance);
-
-static inline void transfer_descriptor_dispose(transfer_descriptor_t *instance)
+static inline bool transfer_descriptor_is_active(
+    transfer_descriptor_t *instance)
 {
         assert(instance);
-        transfer_descriptor_fini(instance);
-        free32(instance);
-}
-
-static inline void transfer_descriptor_append(
-  transfer_descriptor_t *instance, transfer_descriptor_t *item)
-{
-        assert(instance);
-        instance->next_va = item;
-        instance->next = (uintptr_t)addr_to_phys( item ) & LINK_POINTER_ADDRESS_MASK;
+        return (instance->status & TD_STATUS_ERROR_ACTIVE) != 0;
 }
 #endif