diff options
| author | Ashish Chaudhari <ashish@ettus.com> | 2018-02-20 11:42:56 -0800 |
|---|---|---|
| committer | Ashish Chaudhari <ashish.chaudhari@ettus.com> | 2018-02-21 16:50:18 -0800 |
| commit | d5109ae99e5da24707a8d7a6d57b96f6deabbede (patch) | |
| tree | 7f06c5cbb5e820323f083731fac0d2477e04c06c /host | |
| parent | cf644768c43cc15844e3f1b64f6e363634719f5e (diff) | |
| download | uhd-d5109ae99e5da24707a8d7a6d57b96f6deabbede.tar.gz uhd-d5109ae99e5da24707a8d7a6d57b96f6deabbede.tar.bz2 uhd-d5109ae99e5da24707a8d7a6d57b96f6deabbede.zip | |
rfnoc,x300: Multiple clocking changes
- Moved bus_clk <=> ce_clk crossing to axi_wrapper in FPGA
which resulted in a noc_shell compat bump
- Change x300 bus_clk frequency to 187.5 MHz
Diffstat (limited to 'host')
| -rw-r--r-- | host/include/uhd/rfnoc/constants.hpp | 2 | ||||
| -rw-r--r-- | host/lib/usrp/x300/x300_fw_common.h | 2 | ||||
| -rw-r--r-- | host/lib/usrp/x300/x300_impl.hpp | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/host/include/uhd/rfnoc/constants.hpp b/host/include/uhd/rfnoc/constants.hpp index 05d6864e5..53514c157 100644 --- a/host/include/uhd/rfnoc/constants.hpp +++ b/host/include/uhd/rfnoc/constants.hpp @@ -25,7 +25,7 @@ static const std::string XML_PATH_ENV = "UHD_RFNOC_DIR"; //! If the block name can't be automatically detected, this name is used static const std::string DEFAULT_BLOCK_NAME = "Block"; static const uint64_t DEFAULT_NOC_ID = 0xFFFFFFFFFFFFFFFF; -static const size_t NOC_SHELL_COMPAT_MAJOR = 1; +static const size_t NOC_SHELL_COMPAT_MAJOR = 2; static const size_t NOC_SHELL_COMPAT_MINOR = 0; static const size_t MAX_PACKET_SIZE = 8000; // bytes diff --git a/host/lib/usrp/x300/x300_fw_common.h b/host/lib/usrp/x300/x300_fw_common.h index 67a1e16fa..9cfae8e16 100644 --- a/host/lib/usrp/x300/x300_fw_common.h +++ b/host/lib/usrp/x300/x300_fw_common.h @@ -23,7 +23,7 @@ extern "C" { #define X300_REVISION_MIN 2 #define X300_FW_COMPAT_MAJOR 5 #define X300_FW_COMPAT_MINOR 2 -#define X300_FPGA_COMPAT_MAJOR 0x22 +#define X300_FPGA_COMPAT_MAJOR 0x23 //shared memory sections - in between the stack and the program space #define X300_FW_SHMEM_BASE 0x6000 diff --git a/host/lib/usrp/x300/x300_impl.hpp b/host/lib/usrp/x300/x300_impl.hpp index f5c445d3a..9e89ca542 100644 --- a/host/lib/usrp/x300/x300_impl.hpp +++ b/host/lib/usrp/x300/x300_impl.hpp @@ -34,9 +34,9 @@ static const std::string X300_FW_FILE_NAME = "usrp_x300_fw.bin"; static const std::string X300_DEFAULT_CLOCK_SOURCE = "internal"; -static const double X300_DEFAULT_TICK_RATE = 200e6; //Hz -static const double X300_DEFAULT_DBOARD_CLK_RATE = 50e6; //Hz -static const double X300_BUS_CLOCK_RATE = 166.666667e6; //Hz +static const double X300_DEFAULT_TICK_RATE = 200e6; //Hz +static const double X300_DEFAULT_DBOARD_CLK_RATE = 50e6; //Hz +static const double X300_BUS_CLOCK_RATE = 187.5e6; //Hz static const size_t X300_RX_SW_BUFF_SIZE_ETH = 0x2000000;//32MiB For an ~8k frame size any size >32MiB is just wasted buffer space static const size_t X300_RX_SW_BUFF_SIZE_ETH_MACOS = 0x100000; //1Mib |