Josh Blum
11539ef6f6
usrp2: moved impl back into usrp subdir
2011-06-29 14:00:22 -07:00
Josh Blum
25d6e39c6a
usrp2: init the usrp2_ctrl_data_t to make valgrind happy
2011-06-24 16:20:33 -07:00
Nick Foster
fb85b0c9eb
N210: stop sending 1 char at a time to the GPSDO
2011-06-14 17:23:08 -07:00
Josh Blum
9f8a2d0369
usrp2: catch exceptions thrown in locker loop (like the user unplugs device)
2011-06-01 17:46:59 -07:00
Nick Foster
21856ee1ba
N210: changes for rev 4 support
2011-05-18 20:19:03 -07:00
Josh Blum
9065043544
usrp2: moved register map into #defines, entries for new dsp frontend
...
also fixes irq rb
2011-05-17 15:12:02 -07:00
Josh Blum
e6e010e02a
usrp2: device locking, use gpid so the process cant lock itself out
2011-05-11 13:21:27 -07:00
Josh Blum
e75919bc9e
usrp2: added the concept of device locking to usrp2/nseries devices
...
Each iface instance can lock itself to a particular device.
When the device is locked, it cannot be discovered through find.
Locking works by having a lock thread periodically update
a register in the firmware that says when the device was last locked.
The find routine can determine if a device is locked by checking
the difference between the current time and this register.
2011-05-01 15:42:32 -07:00
Josh Blum
11e856ebca
usrp2: combined peek and poke commands and added virtual firmware registers
...
It would be nice to have persistent registers in the device to do things like device locking.
Rather than invent a new communication type, we just repurposed the register manipulation.
2011-05-01 14:18:16 -07:00
Josh Blum
a28099fe4a
usrp2: improve the compatibility error messages
2011-04-19 09:36:53 -07:00
Josh Blum
668402f27e
usrp2: use the firmware's discovered compat number
2011-04-13 10:59:18 -07:00
Josh Blum
f9e1f06e81
usrp2: add check for holler protocol, we can support backwards
2011-04-13 10:04:42 -07:00
Josh Blum
2f102fbff2
usrp2: support fw protos with older compats for various parts
...
i2c, spi, and uart are long time no changing
registers changed recently (think re-map)
also, perform the fpga compat check in the make
now we can find devices with out of date images
2011-04-08 16:59:29 -05:00
Josh Blum
98028b366f
Merge branch 'mb_iface' into next
...
Conflicts:
host/lib/usrp/usrp2/usrp2_iface.hpp
2011-03-03 16:28:26 -08:00
Josh Blum
f938ed7938
Merge branch 'master' into next
...
Conflicts:
host/lib/usrp/usrp2/mboard_impl.cpp
host/lib/usrp/usrp2/usrp2_impl.cpp
2011-03-03 11:18:50 -08:00
Josh Blum
785096ccbb
usrp2: only include fw_common when needed, remove virtual send/recv, not exposed
2011-03-02 11:11:02 -08:00
Josh Blum
4357f5d3c0
uhd: replaced instanced of std::exception with the uhd exceptions
2011-02-24 16:35:29 -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
20a524d1a0
uhd: moved exception to top level include
2011-02-24 14:18:52 -08:00
Josh Blum
aae5cc481b
usrp2: initialize _ctrl_seq_num to remove many valgrind warnings
2011-02-09 12:14:42 -08:00
Nick Foster
330a014dfc
next: generalized the GPS interface to any USRP device. just give it a function to write/read strings to UART.
...
not sure if i'm happy with the interface; maybe inheriting is cleaner. this works though.
gps interface for usrp2 is disabled right now in mboard_impl.
2011-01-17 22:51:14 -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
cc639e876f
usrp-n: simplify ctrl response error so it cant throw, also increase timeout while we are at it
2010-12-08 19:25:51 -08:00
Josh Blum
2568efd1ea
usrp2: cover both rev3 cases for usrp2 revision numbers
2010-11-24 10:08:24 -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
b08ac6273f
uhd: removed windows warnings, added string formatting in usrp-n
2010-11-11 19:13:22 -08:00
Josh Blum
258d9bb45f
usrp-n: populated name properties to use the generated cname from iface
2010-11-11 17:57:59 -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
5a3b5a0608
Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp2p
2010-11-11 14:06:56 -08:00
Josh Blum
314efb0945
usrp2: switch the timeout to units of seconds
2010-11-11 12:23:33 -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
8c434f7d63
uhd: renamed enums to reflect new convention
2010-11-10 11:14:47 -08:00
Josh Blum
374f6ff05e
Merge branch 'master' into flow_ctrl
...
Conflicts:
host/lib/usrp/usrp2/mboard_impl.cpp
host/lib/usrp/usrp2/usrp2_impl.hpp
2010-11-05 21:22:54 -07: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
2f6ab10923
Moved mboard rev detection to iface.cpp.
...
This fixes the incorrect FPGA compat number readback bug. We were trying to read before the register set had been loaded.
2010-10-20 18:31:31 -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
Josh Blum
d54fd2abff
usrp2: use select rather than manually polling the simple udp socket
2010-10-11 18:21:16 -07:00
Josh Blum
37f1f1451f
usrp2: add fc control registers, use small timeout for control packets again
2010-10-11 10:12:14 -07:00
Nick Foster
f89f7476a1
Brought in changes to SPI to match up with parallel branch so they share a common protocol.
2010-08-16 17:29:22 -07:00
Nick Foster
727d8711f9
Support for NMEA reads. Uses NMEA parsing instead of Jackson Labs parsing.
...
No multibaud support yet. read/write_uart() now do multiple-packet writes in multiples of 20 bytes (hardcoded).
2010-08-13 16:16:22 -07:00
Nick Foster
5ab3f05352
GPS interface works for Jackson Labs devices.
2010-08-13 13:07:56 -07:00
Nick Foster
3fe2744e7a
Host-side fixes for GPS UART.
2010-08-12 18:15:27 -07:00
Nick Foster
e2fcb81514
Added host-side support for UART messaging.
...
Have not yet added GPS control library. Debug crap in mboard_impl.cpp constructor.
2010-08-12 16:27:57 -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
Josh Blum
f6c3178c7c
usrp2: added fpga compat number, renamed firmware proto version to compat
2010-08-09 18:29:13 -07:00
Nick Foster
e5722d61aa
ADC SPI works. ADC gain interface "works".
2010-07-28 15:19:29 -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
