Josh Blum
a076dc12aa
uhd: update copyright dates
2011-01-05 20:49:45 -08:00
Josh Blum
fabfa8d9dd
Merge branch 'cordic_policy' into next
...
Conflicts:
host/lib/usrp/usrp2/usrp2_regs.cpp
host/lib/usrp/usrp2/usrp2_regs.hpp
2011-01-04 16:49:34 -08:00
Josh Blum
76c8b7fa24
usrp2: implemented get time last pps
...
renamed the enum for the pps time
added calls to single and multi wrappers
set time unknown pps now simpler
removed peek64 stuff from host + fw
please test
2010-12-30 16:41:38 -08:00
Josh Blum
9e75fadc04
usrp2: set time over serdes when slave, added constants to top of cpp file
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
Nick Foster
95cf7753c1
Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into flow_ctrl
...
Conflicts:
host/lib/transport/udp_simple.cpp
host/lib/usrp/usrp2/mboard_impl.cpp
host/lib/usrp/usrp2/usrp2_iface.cpp
host/lib/usrp/usrp2/usrp2_regs.hpp
2010-11-17 18:31:21 -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
8fe1e7b29a
2+: moved mboard_rev to usrp2/ in preparation for merging upstream
2010-11-10 12:02:28 -08: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
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
Nick Foster
90a5d84a18
Merge branch 'master' of git@ettus.sourcerepo.com:ettus/uhdpriv into usrp2p
...
Conflicts:
host/lib/usrp/usrp2/mboard_impl.cpp
host/lib/usrp/usrp2/usrp2_regs.hpp
2010-07-29 18:12:20 -07:00
Nick Foster
aeedd5a53e
Merge branch 'master' of git@ettus.sourcerepo.com:ettus/uhdpriv into usrp2px
...
Conflicts:
host/lib/usrp/usrp2/mboard_impl.cpp
2010-07-27 16:15:51 -07:00
Nick Foster
7aec87d83f
Deleted manually those files to correspond with USRP2P branch.
2010-07-26 15:47:01 -07:00
