Changeset c13ecfe in mainline

Timestamp:

2011-01-28T11:46:22Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

579dec2

Parents:

db7ed07

Message:

Moved implementation to .c

transfer_descriptor_init no longer return error code
transfer_descriptor_fini runs callback

Location:

uspace/drv/uhci

Files:

• Makefile (modified) (1 diff)
• uhci_struct/transfer_descriptor.c (added)
• uhci_struct/transfer_descriptor.h (modified) (5 diffs)

uspace/drv/uhci/Makefile

@@ -40 +40 @@
         root_hub/root_hub.c \
         transfer_list.c \
-        uhci.c 
+        uhci.c \
+        uhci_struct/transfer_descriptor.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/drv/uhci/uhci_struct/transfer_descriptor.h

@@ -57 +57 @@
 #define TD_STATUS_COMPLETE_INTERRUPT_FLAG ( 1 << 24 )
 
-#define TD_STATUS_ACTIVE ( 1 << 23 )
+#define TD_STATUS_ERROR_ACTIVE ( 1 << 23 )
 #define TD_STATUS_ERROR_STALLED ( 1 << 22 )
 #define TD_STATUS_ERROR_BUFFER ( 1 << 21 )
@@ -65 +65 @@
 #define TD_STATUS_ERROR_BIT_STUFF ( 1 << 17 )
 #define TD_STATUS_ERROR_RESERVED ( 1 << 16 )
-#define TD_STATUS_POS 16
-#define TD_STATUS_MASK ( 0xff )
+#define TD_STATUS_ERROR_POS 16
+#define TD_STATUS_ERROR_MASK ( 0xff )
 
 #define TD_STATUS_ACTLEN_POS 0
@@ -86 +86 @@
         uint32_t buffer_ptr;
 
-        /* there is 16 byte of data available here
+        /* there is 16 bytes of data available here
          * those are used to store callback pointer
-         * and next pointer. Thus there is some free space
+         * and next pointer. Thus, there is some free space
          * on 32bits systems.
          */
@@ -95 +95 @@
 } __attribute__((packed)) transfer_descriptor_t;
 
-static inline int transfer_descriptor_init(transfer_descriptor_t *instance,
+void transfer_descriptor_init(transfer_descriptor_t *instance,
   int error_count, size_t size, bool isochronous, usb_target_t target,
-        int pid)
-{
-        assert(instance);
+        int pid);
 
-        instance->next =
-          0 | LINK_POINTER_VERTICAL_FLAG | LINK_POINTER_TERMINATE_FLAG;
-
-        assert(size < 1024);
-        instance->status = 0
-          | ((error_count & TD_STATUS_ERROR_COUNT_MASK) << TD_STATUS_ERROR_COUNT_POS)
-          | TD_STATUS_ACTIVE;
-
-        instance->device = 0
-                | ((size & TD_DEVICE_MAXLEN_MASK) << TD_DEVICE_MAXLEN_POS)
-                | ((target.address & TD_DEVICE_ADDRESS_MASK) << TD_DEVICE_ADDRESS_POS)
-                | ((target.endpoint & TD_DEVICE_ENDPOINT_MASK) << TD_DEVICE_ENDPOINT_POS)
-                | ((pid & TD_DEVICE_PID_MASK) << TD_DEVICE_PID_POS);
-
-        instance->next_va = NULL;
-        instance->callback = NULL;
-
-        return EOK;
-}
+void transfer_descriptor_fini(transfer_descriptor_t *instance);
 
 static inline void transfer_descriptor_append(
@@ -128 +108 @@
         instance->next = (uintptr_t)addr_to_phys( item ) & LINK_POINTER_ADDRESS_MASK;
 }
-
 #endif
 /**