Changeset 983 for trunk/modules/vci_block_device_tsar/caba/source

Timestamp:

Apr 19, 2015, 5:19:32 PM (10 years ago)

Author:

cfuguet

Message:

bugfix in vci_block_device_tsar:

• fix: writes on the BUFFER register do not erase the content in the BUFFER_EXT register.

• fix: mask the current content before writing a new value on the BUFFER and BUFFER_EXT registers.

File:

• trunk/modules/vci_block_device_tsar/caba/source/src/vci_block_device_tsar.cpp (modified) (2 diffs)

trunk/modules/vci_block_device_tsar/caba/source/src/vci_block_device_tsar.cpp

@@ -115 +115 @@
 std::cout << "  <BDEV_TGT WRITE_BUFFER> value = " << r_tdata.read() << std::endl;
 #endif
-            r_buf_address = (uint64_t)r_tdata.read();
+            r_buf_address = (r_buf_address.read() & 0xFFFFFFFF00000000ULL) |
+                ((uint64_t)r_tdata.read());
             r_target_fsm  = T_IDLE;
         }
@@ -128 +129 @@
 std::cout << "  <BDEV_TGT WRITE_BUFFER_EXT> value = " << r_tdata.read() << std::endl;
 #endif
-            r_buf_address = r_buf_address.read() + (((uint64_t)r_tdata.read())<<32);
+            r_buf_address = (r_buf_address.read() & 0x00000000FFFFFFFFULL) |
+                ((uint64_t)r_tdata.read() << 32);
             r_target_fsm  = T_IDLE;
         }