Changeset 6143ce3 in mainline for uspace/drv/uhci-hcd/uhci.c

Timestamp:

2011-03-13T15:37:28Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

8850690

Parents:

eb0dc58

Message:

Rename queue_head_t ⇒ qh_t

Refactoring

File:

• uspace/drv/uhci-hcd/uhci.c (modified) (4 diffs)

uspace/drv/uhci-hcd/uhci.c

@@ -437 +437 @@
                 int frnum = pio_read_16(&instance->registers->frnum) & 0x3ff;
 
-                uintptr_t expected_pa = instance->frame_list[frnum] & (~0xf);
+                uintptr_t expected_pa = instance->frame_list[frnum]
+                    & LINK_POINTER_ADDRESS_MASK;
                 uintptr_t real_pa = addr_to_phys(QH(interrupt));
                 if (expected_pa != real_pa) {
@@ -444 +445 @@
                 }
 
-                expected_pa = QH(interrupt)->next_queue & (~0xf);
+                expected_pa = QH(interrupt)->next & LINK_POINTER_ADDRESS_MASK;
                 real_pa = addr_to_phys(QH(control_slow));
                 if (expected_pa != real_pa) {
@@ -451 +452 @@
                 }
 
-                expected_pa = QH(control_slow)->next_queue & (~0xf);
+                expected_pa = QH(control_slow)->next & LINK_POINTER_ADDRESS_MASK;
                 real_pa = addr_to_phys(QH(control_full));
                 if (expected_pa != real_pa) {
@@ -458 +459 @@
                 }
 
-                expected_pa = QH(control_full)->next_queue & (~0xf);
+                expected_pa = QH(control_full)->next & LINK_POINTER_ADDRESS_MASK;
                 real_pa = addr_to_phys(QH(bulk_full));
                 if (expected_pa != real_pa ) {