diff options
| author | Nick Foster <nick@nerdnetworks.org> | 2010-07-28 18:22:32 -0700 |
|---|---|---|
| committer | Nick Foster <nick@nerdnetworks.org> | 2010-07-28 18:22:32 -0700 |
| commit | f9cec099f9909bbdf7b9f1c20db9c81173a9b98d (patch) | |
| tree | 6d77f95a8eef370cfae3af5d400576a58c4a5313 | |
| parent | 329415df45212206c44c9ae44851f972dce3ed53 (diff) | |
| download | uhd-f9cec099f9909bbdf7b9f1c20db9c81173a9b98d.tar.gz uhd-f9cec099f9909bbdf7b9f1c20db9c81173a9b98d.tar.bz2 uhd-f9cec099f9909bbdf7b9f1c20db9c81173a9b98d.zip | |
Added back in clock_mimo_enable stuff since USRP2 breaks without it.
Should look further into initializing ALL clocks on host side.
| -rw-r--r-- | firmware/microblaze/lib/clocks.c | 14 | ||||
| -rw-r--r-- | firmware/microblaze/lib/clocks.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/firmware/microblaze/lib/clocks.c b/firmware/microblaze/lib/clocks.c index 08f15deb1..b9bd2e107 100644 --- a/firmware/microblaze/lib/clocks.c +++ b/firmware/microblaze/lib/clocks.c @@ -58,7 +58,7 @@ clocks_init(void) // ad9510_write_reg(0x5A, 0x01); // Update Regs // Primary clock configuration -// clocks_mimo_config(MC_WE_DONT_LOCK); + clocks_mimo_config(MC_WE_DONT_LOCK); // Set up other clocks //clocks_enable_test_clk(false, 0); @@ -71,7 +71,7 @@ clocks_init(void) //clocks_enable_adc_clk(true, 1); } -/* + void clocks_mimo_config(int flags) { @@ -116,12 +116,12 @@ clocks_mimo_config(int flags) } // Do we drive a clock onto the MIMO connector? - if (flags & MC_PROVIDE_CLK_TO_MIMO) - clocks_enable_clkexp_out(true,10); - else - clocks_enable_clkexp_out(false,0); +// if (flags & MC_PROVIDE_CLK_TO_MIMO) +// clocks_enable_clkexp_out(true,10); +// else +// clocks_enable_clkexp_out(false,0); } -*/ + /* bool clocks_lock_detect() diff --git a/firmware/microblaze/lib/clocks.h b/firmware/microblaze/lib/clocks.h index 2769fd434..399127595 100644 --- a/firmware/microblaze/lib/clocks.h +++ b/firmware/microblaze/lib/clocks.h @@ -43,7 +43,7 @@ void clocks_init(void); * Configure our master clock source, and whether or not we drive a * clock onto the mimo connector. See MC_flags in usrp2_mimo_config.h. */ -//void clocks_mimo_config(int flags); +void clocks_mimo_config(int flags); /*! * \brief Lock Detect -- Return True if our PLL is locked |