diff options
author | jcorgan | 2008-12-28 17:26:29 +0000 |
---|---|---|
committer | jcorgan | 2008-12-28 17:26:29 +0000 |
commit | dbd66da2876df4b57e083aa90ad04e024f70ec34 (patch) | |
tree | 20d5e90bd4fa93fb75385c922f083f09af00f847 /usrp2/host/include | |
parent | 38fe0d40793814e94e17e5ae7813a54e68d08dd9 (diff) | |
download | gnuradio-dbd66da2876df4b57e083aa90ad04e024f70ec34.tar.gz gnuradio-dbd66da2876df4b57e083aa90ad04e024f70ec34.tar.bz2 gnuradio-dbd66da2876df4b57e083aa90ad04e024f70ec34.zip |
Replaced USRP2 peek() with peek32(), handles endian-swapping if needed
git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10174 221aa14e-8319-0410-a670-987f0aec2ac5
Diffstat (limited to 'usrp2/host/include')
-rw-r--r-- | usrp2/host/include/usrp2/usrp2.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usrp2/host/include/usrp2/usrp2.h b/usrp2/host/include/usrp2/usrp2.h index e942bb579..ea906cdc7 100644 --- a/usrp2/host/include/usrp2/usrp2.h +++ b/usrp2/host/include/usrp2/usrp2.h @@ -362,18 +362,18 @@ namespace usrp2 { bool sync_to_pps(); /*! - * Read memory from Wishbone bus + * Read memory from Wishbone bus as 32-bit words. Handles endian swapping if needed. * * \param addr 32-bit aligned address. Only the lower 16-bits are significant. - * \param len Number of bytes to read, must be positive and multiple of 4. + * \param len Number of 32-bit words * - * \returns Vector of 8-bit read values + * \returns Vector of 32-bit read values * * WARNING: Attempts to read memory from addresses that do not correspond to RAM or * memory-mapped peripherals may cause the USRP2 to hang, requiring a power cycle. * */ - std::vector<uint8_t> peek(uint32_t addr, uint32_t len); + std::vector<uint32_t> peek32(uint32_t addr, uint32_t words); #if 0 // not yet implemented |