Commit graph

32 commits

Author SHA1 Message Date
Josh Blum
db6ba7d474 Merge branch 'maint' 2012-05-14 11:52:29 -07:00
Jason Abele
d8d749422b Throwing here causes difficulty initializing new USRPs 2012-05-14 11:49:15 -07:00
Josh Blum
12223186e7 fifo ctrl: spi core work and host implementation 2012-03-23 14:36:56 -07:00
Nick Foster
4cb26d251d N210 R4 should be using LVDS TX clock, not CMOS. 2012-01-04 17:06:23 -08:00
Josh Blum
09cf8eb164 uhd: added more SAFE_CALL macros to hardware wrapper dtors
And removed the calls on the sptr resets (not needed now).
2011-06-10 15:23:24 -07:00
Nick Foster
21856ee1ba N210: changes for rev 4 support 2011-05-18 20:19:03 -07:00
Josh Blum
95b966a599 uhd: update copyright headers with automated script 2011-03-23 18:48:30 -07:00
Nick Foster
1b63cd2560 Generalized mboard_iface and added a SPI convenience class a la I2C 2011-03-03 10:50:45 -08:00
Josh Blum
16f08844d7 uhd: renamed the assert header to assert has
only the assert has implementation is in this header

uhd assert throw moved to the exception header

updated code base includes to match
2011-02-24 14:54:24 -08:00
Josh Blum
1bf0619c9e usrp2: configured clock delay over mimo cable 2010-12-11 18:43:10 -08:00
Nick Foster
0336b6fb35 packet_router: added set_mimo_clock_delay to clock_ctrl.
Delay range is fixed right now to [0.444, 9.744]ns in 300ps increments
2010-12-11 18:43:10 -08:00
Josh Blum
8af031ad89 usrp-n: configure clocking over the serdes cable
added status to register to readback master/slave mode

removed mimo enum from clock config, its not relevant

added serdes clock config to the update clock config method
2010-12-11 18:43:10 -08:00
Josh Blum
476afe68f5 usrp2: made enums for the rev types and implemented in code 2010-11-11 17:40:01 -08:00
Nick Foster
e0b3b4e3dd U2P: Ripped out the mboard_rev_t structure in favor of an enum in usrp2_regs.hpp and some logic.
Also change ethernet.c to move generic code to eth_lib.
2010-11-10 16:23:11 -08:00
Nick Foster
fb0cdbc553 Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp2p-next
Conflicts:
	firmware/microblaze/lib/u2_init.c
	host/lib/usrp/usrp2/clock_ctrl.cpp
	host/lib/usrp/usrp2/fw_common.h
	host/lib/usrp/usrp2/mboard_impl.cpp
	host/lib/usrp/usrp2/usrp2_iface.cpp
	host/lib/usrp/usrp2/usrp2_iface.hpp
2010-11-10 12:15:35 -08:00
Nick Foster
8fe1e7b29a 2+: moved mboard_rev to usrp2/ in preparation for merging upstream 2010-11-10 12:02:28 -08:00
Josh Blum
fcf9f6ba32 usrp2: move mboard eeprom instance into iface to the clock control can access it 2010-11-04 20:38:25 -07:00
Nick Foster
5b4cbfe461 USRP2P: mboard rev works through props interface.
Added usrp2_burn_mb_rev.cpp to utils. It is not installed to the utils install dir.

Not all happy with the mboard_rev setup -- is_usrp2p() is too specific for a generalized mboard_rev concept. I'm not sure where else to put it so for now it stays.
2010-10-12 16:26:19 -07:00
Nick Foster
5982ec4ee2 USRP2P: This is surprisingly involved. Adding a consistent interface to deal with hardware revisions. 2010-10-12 14:46:41 -07:00
Nick Foster
b6dae16e5b USRP2P: internal reference selected by default. 2010-10-05 16:54:34 -07:00
Nick Foster
6dd502737b Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp2p
Conflicts:
	host/lib/usrp/usrp2/io_impl.cpp
2010-09-30 12:28:29 -07:00
Josh Blum
1b3b856f5a usrp2: provide clock over mimo connector so usrp2 can share refs 2010-09-17 16:50:59 -07:00
Nick Foster
663808e847 Merge branch 'master' into usrp2p
this was the merge from hell

Conflicts:

	firmware/microblaze/Makefile.am
	firmware/microblaze/bootstrap
	firmware/microblaze/configure.ac
	firmware/microblaze/lib/Makefile.inc
	host/lib/CMakeLists.txt
	host/lib/usrp/mimo_usrp.cpp
	host/lib/usrp/simple_usrp.cpp
	host/lib/usrp/usrp2/clock_ctrl.cpp
	host/lib/usrp/usrp2/codec_impl.cpp
	host/lib/usrp/usrp2/dboard_impl.cpp
	host/lib/usrp/usrp2/mboard_impl.cpp
	host/lib/usrp/usrp2/usrp2_iface.hpp
	host/lib/usrp/usrp2/usrp2_impl.hpp
	host/lib/usrp/usrp2/usrp2_regs.hpp
	host/test/CMakeLists.txt
2010-08-10 17:02:47 -07:00
Jason Abele
ce5940f86e DBSRX support in UHD 2010-08-04 18:50:37 -07:00
Nick Foster
d8f3980e45 Host-side changes to work with the USRP2+.
Change summary:
Added clock register selection between USRP2/USRP2+
Added memory map selection between USRP2/USRP2+
Added ADS62P44 support for USRP2+
2010-07-26 16:33:17 -07:00
Josh Blum
1c1d967ec7 usrp2: init clock rate shadows for dboard iface, uhd: pthread sched fix error condition check 2010-06-18 17:59:57 -07:00
Josh Blum
c554cefcab usrp2: implemented dboard clock divider control in usrp2 clock control 2010-06-17 11:53:08 -07:00
Josh Blum
7aeb266783 added set clock rate, and get clock rates to dboard iface, usrp2 needs clock ctrl implementation... 2010-06-17 11:36:14 -07:00
Josh Blum
4f0736ef7c move get clock rate into clock control 2010-06-04 12:32:06 -07:00
Josh Blum
f2b560d5f8 Prepend usrp2 onto the helper classes in usrp2 impl to avoid symbol conflicts. 2010-06-04 12:16:09 -07:00
Josh Blum
4ea8822a50 clock bypass divider fixes, forgot to move this part into the host 2010-05-18 17:38:49 -07:00
Josh Blum
bf7ef6aeb5 Moved adc and dac control into codec control source file.
The codec control powers down the chips on destruction.
2010-05-10 15:14:48 -07:00
Renamed from host/lib/usrp/usrp2/clock_control.cpp (Browse further)