diff options
| author | ettus <matt.prost@ni.com> | 2020-09-02 11:26:42 -0500 |
|---|---|---|
| committer | Aaron Rossetto <aaron.rossetto@ni.com> | 2020-09-03 09:40:34 -0500 |
| commit | 5e7c0e61a8014535611ff7083e45e7a63d40c6d8 (patch) | |
| tree | 89178b13fd79e2d79fd2602b616d3105a70726c0 /host | |
| parent | 3d5d136534bed3e1af50176fc36e26245ab323b9 (diff) | |
| download | uhd-5e7c0e61a8014535611ff7083e45e7a63d40c6d8.tar.gz uhd-5e7c0e61a8014535611ff7083e45e7a63d40c6d8.tar.bz2 uhd-5e7c0e61a8014535611ff7083e45e7a63d40c6d8.zip | |
rfnoc: replay: Add support for 32-bit memory address widths
Increases the supported memory sizes in software to 2^32 and beyond.
Signed-off-by: mattprost <matt.prost@ni.com>
Diffstat (limited to 'host')
| -rw-r--r-- | host/lib/rfnoc/replay_block_control.cpp | 2 | ||||
| -rw-r--r-- | host/tests/rfnoc_block_tests/replay_block_test.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/host/lib/rfnoc/replay_block_control.cpp b/host/lib/rfnoc/replay_block_control.cpp index 6067650e0..a2b45f575 100644 --- a/host/lib/rfnoc/replay_block_control.cpp +++ b/host/lib/rfnoc/replay_block_control.cpp @@ -77,7 +77,7 @@ public: _fpga_compat(_replay_reg_iface.peek32(REG_COMPAT_ADDR)), _word_size( uint16_t((_replay_reg_iface.peek32(REG_MEM_SIZE_ADDR) >> 16) & 0xFFFF) / 8), - _mem_size(uint64_t(1 << (_replay_reg_iface.peek32(REG_MEM_SIZE_ADDR) & 0xFFFF))) + _mem_size(uint64_t(1ULL << (_replay_reg_iface.peek32(REG_MEM_SIZE_ADDR) & 0xFFFF))) { UHD_ASSERT_THROW(get_num_input_ports() == get_num_output_ports()); uhd::assert_fpga_compat(MAJOR_COMPAT, diff --git a/host/tests/rfnoc_block_tests/replay_block_test.cpp b/host/tests/rfnoc_block_tests/replay_block_test.cpp index 4e4e7847d..f84b98ac8 100644 --- a/host/tests/rfnoc_block_tests/replay_block_test.cpp +++ b/host/tests/rfnoc_block_tests/replay_block_test.cpp @@ -73,8 +73,8 @@ struct replay_block_fixture : num_channels(4) , num_input_ports(num_channels) , num_output_ports(num_channels) - , mem_addr_size(20) - , max_buffer_size(1 << mem_addr_size) + , mem_addr_size(32) + , max_buffer_size(1ULL << mem_addr_size) , default_item_size(4) , word_size(8) , reg_iface(std::make_shared<replay_mock_reg_iface_t>( |