Commit Graph

80 Commits

Author SHA1 Message Date
Josh Blum
c473cc56fa usrp1: pulled in cmake build system for usrp1 firmware 2010-11-05 12:32:09 -07:00
Josh Blum
7a7e704fa3 Merge branch 'ovfl' into good_stuff 2010-11-04 19:37:36 -07:00
Josh Blum
8a695c0684 usrp2: fw sends gratuitous arp on link-up 2010-10-22 11:05:27 -07:00
Josh Blum
bd59192bd4 usrp2: handle real overflow packets in host, reload continuous stream cmd, remove firmware handling 2010-10-21 12:27:49 -07:00
Nick Foster
b96088b692 EEPROM burning in UHD. Changed some USB device handle stuff. Added usrp_init_eeprom.cpp. Hacked up the firmware makefile to behave and to generate .bin EEPROM images instead of IHX. 2010-08-31 16:44:30 -07:00
Josh Blum
2f3269f359 usrp1: images for usrp1, makefile checks for image generation dependencies 2010-08-19 18:23:19 -07:00
Josh Blum
ea86054d72 Merge branch 'master' into usrp1 2010-08-17 17:52:17 -07:00
Nick Foster
288f932423 usrp2: don't forward dbsm errors 2010-08-16 17:44:05 -07:00
Nick Foster
ecc971c613 IRQ-based SPI works. Don't try to do multiple transactions without waiting for results first. In fact, don't try to do
an I2C transaction while an SPI transaction is pending.
2010-08-16 17:29:40 -07:00
Nick Foster
20d1f96f95 syntax 2010-08-16 17:29:40 -07:00
Nick Foster
5b5f8901f5 first stab at irq'ed spi 2010-08-16 17:29:40 -07:00
Nick Foster
c23a4c4334 Removed NACK checking so things don't barf when daughterboards aren't connected.
When we have real error handling in the DUDE/BRO protocol we'll add this back in.
2010-08-16 17:29:40 -07:00
Nick Foster
936c5518e4 Fix warnings related to const-ness and volatile-ness. 2010-08-16 17:29:40 -07:00
Thomas Tsou
b3a092055a usrp1: Add SPI transaction command to FX2 firmware
The existing SPI read command is set for half-duplex 8-bit
or 16-bit writes followed by an equivalent sized read.
This patch adds a new command, VRQ_SPI_TRANSACT, which
performs a full-duplex transaction up to 4-bytes. Since the
data buffer of the USB control transfer is not available
for outbound data on IN requests, the 4 bytes of write data
are sent through the request parameters. Enables are sent
in the previsouly unused high byte of the length parameter.
The USB field mappings are shown below. Only rising edge
and MSB operation is supported.

Field (8-bit)           Description
=====                   =====
bmRequestType           0x80 (USB Device IN request)
bRequest                0x83 (VRQ_SPI_TRANSACT)
wValueH                 OUT data(0)
wValueL                 OUT data(1)
wIndexH                 OUT data(2)
wIndexL                 OUT data(3)
wLengthH                SPI enables
wLengthL                Number of bytes to transfer (1-4)

EP0BUF                  IN data
2010-08-13 17:54:01 -07:00
Thomas Tsou
70eae1d242 usrp1: Add FX2 firmware files
These firmware files for the usrp1 are imported from
GNURadio.
2010-08-13 12:25:36 -07:00
Nick Foster
579268112a Bring in changes since last week. 2010-08-10 14:53:26 -07:00
Nick Foster
5514d168ab Interrupt-driven I2C. txrx_uhd uses async i2c for comms. 2010-08-10 14:16:48 -07:00
Josh Blum
f6c3178c7c usrp2: added fpga compat number, renamed firmware proto version to compat 2010-08-09 18:29:13 -07:00
Josh Blum
4240d5a2a1 usrp2: reorganized firmware directory 2010-07-30 12:43:41 -07:00
Josh Blum
23a0454998 usrp2: added tx policy register and changed fw to not handle error in buffer pool 2010-07-29 16:00:39 -07:00
Josh Blum
8a7a824848 usrp2: installed a simple dbsm_rx_inspector, it wont work without it... 2010-07-16 20:38:19 -07:00
Josh Blum
8171547b6c usrp2: remove mb intervention on outgoing packets 2010-07-15 18:47:07 -07:00
Josh Blum
4594aef53f usrp2: forward errors in the dbsm to communicate them up to the host 2010-07-12 20:38:33 -07:00
Josh Blum
a95eaac42f usrp2: Added a peek64 to read pairs of 32 bit numbers such as time64
also added a templated host to/from network conversion in byteswap.hpp (didnt use it though)
2010-07-05 19:12:01 -07:00
Josh Blum
01e5f592d6 usrp2: increased transport buffer minimum size, and added warning
added more notes on buffer size to the manual

pulled in some firmware fixes from the mimo work, just to have them in here
2010-07-05 12:29:31 -07:00
Josh Blum
a950a544f5 usrp2 mb: replace hard coded constants with macros for rx offset 2010-06-18 10:52:24 -07:00
Josh Blum
81f211c94f Moved usrp2 eeprom addr read/write to host control over i2c/eeprom interface calls.
No longer part of the dude/bro protocol.

Simplified the mac and ip addr read write code in mboard impl.

Modified the mac addr type to take byte_vector_t from serial.hpp types.
2010-05-11 16:35:01 -07:00
Josh Blum
7c7b0d0a0d Added a place for serdes control on the host.
Fix bug in codec control.
Comment out some clock control in fw code.
2010-05-10 16:37:12 -07:00
Josh Blum
650e0d9b35 Merge branch 'shrinkfw' into usrp2 2010-05-10 14:18:00 -07:00
Josh Blum
2780e2cff0 added icmp echo reply to usrp2 2010-05-03 17:21:32 -07:00
Josh Blum
30bd666e30 Moved some misc setting registers into host. 2010-04-28 17:38:22 -07:00
Josh Blum
c79595e6cc removed some unused things like gpio from microblaze code 2010-04-28 17:23:55 -07:00
Josh Blum
a7c230cb1f Added reload flag to the stream cmd.
This reloads the last command to handle continuous streaming in hardware.
Moved rx control register setup and stream command issuing to the host.
2010-04-28 16:35:22 -07:00
Josh Blum
f040d79d25 Merge branch 'eeprom' of git@ettus.sourcerepo.com:ettus/uhdpriv 2010-04-26 12:19:00 -07:00
Josh Blum
15befa19de renamed the firmware main image to txrx_uhd.bin 2010-04-25 22:17:16 -07:00
Josh Blum
039eceb4b2 Moved reading the eeprom (dboard ids) onto the host.
Created a eeprom parser for the format in the dboard.
Removed the support from the microblaze code.
2010-04-23 19:21:47 -07:00
Josh Blum
19a2f02768 toggle led a for continuous streaming 2010-04-22 13:24:21 -07:00
Josh Blum
e5248746f6 Added protocol version number to usrp2 common header and data struct. 2010-04-21 17:49:00 -07:00
Josh Blum
0d365ff303 pulled aux dac and adc support from microblaze, its in the host now 2010-04-19 18:31:16 -07:00
Josh Blum
c10e58cf25 removed unused firmware code 2010-04-13 16:19:33 -07:00
Josh Blum
841400bb4e Moved ad9777 control 100% on to the host 2010-04-13 16:08:14 -07:00
Josh Blum
b66a74ff1f Reworked the spi part of the dboard interface.
It turns out to be more complicated.
The integer type is better for holding the bits.
The edges can be different, so the spi config hold 2 edge setting for mosi and miso.
2010-04-07 00:46:42 -07:00
Josh Blum
12aa8ad74c added 16 bit peek and poke, 16 bit register defs for gpios and atrs 2010-04-05 12:18:17 -07:00
Josh Blum
83bd55d639 extended stream cmd with mode enum, and extended fragment flags in metadata 2010-04-03 19:43:20 -07:00
Josh Blum
f01b1a394f added spi slaves to regs, use std copy for buffs 2010-03-31 19:25:22 -07:00
Josh Blum
f15df8146c Moved dsp (rx and tx), time config, and clock config (mostly) into the host. 2010-03-31 18:55:48 -07:00
Josh Blum
38248b816c Refactor ATR part of dboard interface (and some constants).
Added peek and poke to the dude/bro protocol.
Started moving more control code through peek and poke.
Added usrp_regs.hpp to be like memory map for slave perifs.
2010-03-31 17:43:20 -07:00
Josh Blum
2276c737e8 removed that fw sets seq stuff, not applicable 2010-03-26 13:45:51 -07:00
Josh Blum
1657a02203 insert correct control word and vrt len into the buffer 2010-03-26 12:54:20 -07:00
Josh Blum
af586ae149 Overhaullllllled the way we do streaming. There is an odd bug where
a zero length command (now, no chain) used to stop the streaming.
Now it seems to do the reverse... must investigate.

Made all clock configuration into enums. The strings were painful
and there cant be that many variations that enums cant cover them.
The enums will make more sense to developers than mystery strings.
2010-03-25 18:36:16 -07:00