Changeset 3f189c5 in mainline for uspace/drv/uhci-hcd/uhci_struct

Timestamp:

2011-02-07T14:06:57Z (15 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

fe10e72

Parents:

7e62b62

Message:

Lots of cleanup, removes unused code (replaced by trackers)

Location:

uspace/drv/uhci-hcd/uhci_struct

Files:

• transfer_descriptor.c (modified) (3 diffs)
• transfer_descriptor.h (modified) (4 diffs)

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

@@ -36 +36 @@
 
 #include "transfer_descriptor.h"
+#include "utils/malloc32.h"
 
 void transfer_descriptor_init(transfer_descriptor_t *instance,
@@ -58 +59 @@
 
         instance->buffer_ptr = 0;
-
-        instance->next_va = NULL;
-        instance->callback = NULL;
 
         if (size) {
@@ -118 +116 @@
         return EOK;
 }
-/*----------------------------------------------------------------------------*/
-void transfer_descriptor_fini(transfer_descriptor_t *instance)
-{
-        assert(instance);
-        callback_run(instance->callback,
-                convert_outcome(instance->status),
-                ((instance->status >> TD_STATUS_ACTLEN_POS) + 1) & TD_STATUS_ACTLEN_MASK
-        );
-}
 /**
  * @}

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;
 
@@ -100 +95 @@
         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));
-
-        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)
-{
-        assert(instance);
-        transfer_descriptor_fini(instance);
-        free32(instance);
-}
 
 int transfer_descriptor_status(transfer_descriptor_t *instance);
@@ -130 +104 @@
         return instance->status & TD_STATUS_ERROR_ACTIVE;
 }
-
-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;
-}
 #endif
 /**