Josh Blum
5e9cac116e
Merge branch 'fpga_master'
2012-04-25 18:08:37 -07:00
Josh Blum
cb313ea980
e100/b100: bumped compat number for timed commands merge
...
There were common FPGA changes and an incompatibility.
This should have been done before the merge anyhow.
2012-04-25 17:59:52 -07:00
Nicholas Corgan
f032371736
include: updated multi_usrp's help descriptions for USRP info functions
2012-04-25 17:45:52 -07:00
Josh Blum
82c4e283cc
udp: windows registry app for FastSendDatagramThreshold
2012-04-25 13:54:37 -07:00
Nick Foster
70db8e9d1c
slave_fifo: use 2KB FIFO size instead of 1KB
2012-04-24 21:57:52 -07:00
Josh Blum
8a00096f98
b100: implement packet-end/flush cycle timeout
2012-04-24 20:02:02 -07:00
Josh Blum
600258c2ab
gpif: removed unused gpif related files
2012-04-24 18:00:11 -07:00
Josh Blum
ff2649caed
Merge branch 'maint'
2012-04-23 18:45:46 -07:00
Josh Blum
0a4a861afe
uhd: fix missing API export for tasks.hpp
2012-04-23 18:44:54 -07:00
Josh Blum
253be8f0da
uhd: squashed transport work
2012-04-23 13:45:23 -07:00
Josh Blum
ae40e8f5cc
Merge branch 'master' into next
2012-04-23 11:10:57 -07:00
Josh Blum
8088926c08
Merge branch 'maint'
2012-04-22 16:27:26 -07:00
Josh Blum
4286d07d7a
usrp2: removed errors='ignore' for burners for py26
2012-04-22 15:41:22 -07:00
Josh Blum
4378ad4584
Merge branch 'master' into next
2012-04-21 11:09:58 -07:00
Josh Blum
f84d7579ae
Merge branch 'timed_cmds_work_fpga' into timed_cmds_work
2012-04-21 11:06:38 -07:00
Josh Blum
81e2262c9e
e100: fix typo from last commit
2012-04-20 19:25:57 -07:00
Nicholas Corgan
a6ec6e2544
mboard id's are now more concise (codenames are separated, for example), and dboard subdev names are more descriptive (RFX RX is now RFX1200 RX, etc)
2012-04-20 14:21:17 -07:00
Josh Blum
20ea7b7bc9
dboard: updated timed sync stuff for wbx* sbx*
2012-04-20 13:37:04 -07:00
Josh Blum
dc2f14d7f9
usrp2: cleanup for fifo control wraparound_lt16 routine
2012-04-20 12:34:25 -07:00
Josh Blum
00f515da98
N2x0: updated the bootloader w/ latest from fw
2012-04-20 11:52:21 -07:00
Josh Blum
b913183c4c
usrp2: add variable for wb/spi interface
...
This variable gets set based on the rev type
so we can support the command fifo when present.
2012-04-20 11:50:38 -07:00
Josh Blum
ed3624aa04
usrp2: remove settings_fifo_ctrl, meets timing
2012-04-20 10:24:01 -07:00
Josh Blum
ece88b4ca3
send: sph holdover from transport work
2012-04-19 18:08:51 -07:00
Josh Blum
7051b32ba7
Merge branch 'maint'
2012-04-18 15:12:04 -07:00
Ben Hilburn
360681f26f
master: Fixing comments that say SPI is LSB.
2012-04-18 15:11:29 -07:00
Josh Blum
5ebbf8a887
n2x0: card burner fixes for python3.0 and IPv6
...
has_key is not in python3.0, use key in dict
put try catch around interface enumeration, might be an ipv6 issue
2012-04-18 15:08:45 -07:00
Josh Blum
355101a1c9
usrp2: updated fifo command with to 16 (1 short fifo)
2012-04-18 11:23:09 -07:00
Josh Blum
1ddcad462f
fifo ctrl: Nseries timing meets with a single shortfifo
2012-04-17 18:43:25 -07:00
Josh Blum
09df4536a9
Merge branch 'maint'
2012-04-17 14:11:51 -07:00
Josh Blum
4a1ec80d49
usb: do not release recv buffer in wrapper
...
The actual recv buffer will be automatically released when dereferenced.
By releasing this buffer early we allowed for a race condition:
Subsequent wrapper buffers that shared the same actual buffer
could get their memory filled by new recvd packets from the USB layer.
2012-04-17 14:07:58 -07:00
Josh Blum
a345c19cc2
recv: only inspect tsf on timestamp error check
2012-04-17 13:39:09 -07:00
Nicholas Corgan
1c61865d1a
multi_usrp: returns db_eeprom instead of gdb_eeprom in both TX/RX cases
2012-04-17 12:19:05 -07:00
Josh Blum
12958f67e1
Merge branch 'maint'
2012-04-16 17:10:41 -07:00
Josh Blum
b221b3e34d
convert: give SIMD conversions prio over table
...
given performance benchmarks involving the converter,
when the driver is also doing other things
sc8 conversions will still involve tables since
no SIMD implementations exist yet
2012-04-16 16:49:06 -07:00
Josh Blum
749633397f
examples: added multi-channel and host format options to benchmark
2012-04-13 11:51:33 -07:00
Josh Blum
af9db955ed
Merge branch 'maint'
2012-04-13 07:49:50 -07:00
Nicholas Corgan
44b68ee80a
cmake: UHDVersion.cmake gets rid of git commit number if 'release' is specified in UHD_RELEASE_MODE
2012-04-13 07:48:23 -07:00
Josh Blum
34627f1c77
utils: card/net burner string decode
2012-04-12 09:46:38 -07:00
Josh Blum
e8dc93363a
usrp: work on meeting timing constraints
...
* fifo ctrl register the vita ticks and use late
* vita de/framer make nchans const since we dont change it
* simplify readback muxes to minimal usage
2012-04-10 19:10:10 -07:00
Josh Blum
8af42ce3c4
usrp: updated nchan usage for vita rx change
2012-04-10 19:05:02 -07:00
Josh Blum
93d4a16f3b
Merge branch 'maint'
2012-04-10 18:57:23 -07:00
Josh Blum
3fb067567b
uhd: bumped version num to 3.4.1 for release
2012-04-10 18:54:11 -07:00
Josh Blum
12ea88585e
Merge branch 'master' into next
2012-04-10 14:29:28 -07:00
Nicholas Corgan
cc42170942
uhd: updated transport hammer
2012-04-10 12:24:23 -07:00
Josh Blum
76f7943306
Merge branch 'fpga_next' into next
2012-04-10 12:02:27 -07:00
Josh Blum
b9ea3170ab
Merge branch 'fpga_master'
2012-04-10 11:12:24 -07:00
Josh Blum
510632d896
Merge branch 'master' into next
...
Conflicts:
usrp2/top/N2x0/u2plus_core.v
usrp2/top/USRP2/u2_core.v
2012-04-09 19:53:51 -07:00
Josh Blum
bcca51705e
Merge branch 'maint'
2012-04-09 19:51:38 -07:00
Josh Blum
c402ed8c0c
Merge branch 'maint'
2012-04-09 17:29:56 -07:00
Josh Blum
1e143bddd2
Merge branch 'fpga_maint' into maint
2012-04-09 16:37:46 -07:00