Changeset b6120d90 in mainline

Timestamp:

2011-01-28T17:32:58Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

0b68b7c

Parents:

54229db

Message:

Fixed: Error count mask

Made TD fields volatile

Location:

uspace/drv/uhci/uhci_struct

Files:

• transfer_descriptor.c (modified) (1 diff)
• transfer_descriptor.h (modified) (3 diffs)

uspace/drv/uhci/uhci_struct/transfer_descriptor.c

@@ -14 +14 @@
           | ((error_count & TD_STATUS_ERROR_COUNT_MASK) << TD_STATUS_ERROR_COUNT_POS)
           | TD_STATUS_ERROR_ACTIVE;
+
+        uhci_print_verbose("Creating status field: %x.\n", instance->status);
 
         instance->device = 0

uspace/drv/uhci/uhci_struct/transfer_descriptor.h

@@ -46 +46 @@
         link_pointer_t next;
 
-        uint32_t status;
+        volatile uint32_t status;
 
 #define TD_STATUS_RESERVED_MASK 0xc000f800
 #define TD_STATUS_SPD_FLAG ( 1 << 29 )
 #define TD_STATUS_ERROR_COUNT_POS ( 27 )
-#define TD_STATUS_ERROR_COUNT_MASK ( 0x11 )
+#define TD_STATUS_ERROR_COUNT_MASK ( 0x3 )
 #define TD_STATUS_ERROR_COUNT_DEFAULT 3
 #define TD_STATUS_LOW_SPEED_FLAG ( 1 << 26 )
@@ -71 +71 @@
 #define TD_STATUS_ACTLEN_MASK 0x7ff
 
-        uint32_t device;
+        volatile uint32_t device;
 
 #define TD_DEVICE_MAXLEN_POS 21
@@ -84 +84 @@
 #define TD_DEVICE_PID_MASK ( 0xff )
 
-        uint32_t buffer_ptr;
+        volatile uint32_t buffer_ptr;
 
         /* there is 16 bytes of data available here