Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | moved regs around for vita49 | Matt Ettus | 2009-11-05 | 2 | -12/+13 |
| | |||||
* | vita rx instead of rx_control. Ready for firmware testing. Misses timing ↵ | Matt Ettus | 2009-11-05 | 4 | -4/+48 |
| | | | | by a little bit, will worry later. | ||||
* | put 64 bit timer for vita49 on the settings bus | Matt Ettus | 2009-11-05 | 3 | -8/+17 |
| | |||||
* | VITA49 rx (and tx skeleton) copied over from quad radio | Matt Ettus | 2009-11-05 | 7 | -0/+1026 |
| | |||||
* | This branch is for porting from the quad radio, and minor text cleanups | Matt Ettus | 2009-11-04 | 4 | -15/+259 |
| | | | | | | The counter is for performance monitoring in firmware, priority encoder and new interrupt controller are from quad radio and speed up interrupts. This is tested and it works for me. | ||||
* | earliest beta files renamed to avoid confusion | Matt Ettus | 2009-10-11 | 6 | -0/+0 |
| | |||||
* | Properly reset the fifos. We didn't connect before. | Matt Ettus | 2009-10-05 | 1 | -5/+5 |
| | |||||
* | Merge branch 'new_eth' of http://gnuradio.org/git/matt into master | Johnathan Corgan | 2009-10-01 | 613 | -90023/+2518 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'new_eth' of http://gnuradio.org/git/matt: (42 commits) Fix warnings, mostly from implicitly defined wires or unspecified widths fullchip sim now compiles again, after moving eth and models over to new simple_gemac remove unused opencores remove debugging code no idea where this came from, it shouldn't be here Copied wb_1master back from quad radio Remove old mac. Good riddance. remove unused port More xilinx fifos, more clean up of our fifos might as well use a cascade fifo to help timing and give a little more capacity fix a typo which caused tx glitches Untested fixes for getting serdes onto the new fifo system. Compiles, at least Implement Eth flow control using pause frames parameterized fifo sizes, some reformatting remove unused old style fifo allow control of whether or not to honor flow control, adds some debug lines debug the rx side no longer used, replaced by newfifo version remove special last_line adjustment from ethernet port Firmware now inserts mac source address value in each frame. ... | ||||
| * | Fix warnings, mostly from implicitly defined wires or unspecified widths | Matt Ettus | 2009-10-01 | 6 | -8/+14 |
| | | |||||
| * | fullchip sim now compiles again, after moving eth and models over to new ↵ | Matt Ettus | 2009-10-01 | 5 | -17/+159 |
| | | | | | | | | simple_gemac | ||||
| * | remove unused opencores | Matt Ettus | 2009-10-01 | 463 | -71885/+0 |
| | | |||||
| * | Merge branch 'new_wb_intercon' into new_eth | Matt Ettus | 2009-09-30 | 2 | -224/+239 |
| |\ | | | | | | | | | | | | | | | | | | | Functionality should not change at all Conflicts: usrp2/fpga/top/u2_core/u2_core.v | ||||
| | * | Copied wb_1master back from quad radio | Matt Ettus | 2009-09-30 | 2 | -223/+238 |
| | | | | | | | | | | | | more sane config options, should be exactly the same memory map | ||||
| * | | no idea where this came from, it shouldn't be here | Matt Ettus | 2009-09-30 | 1 | -1/+1 |
| | | | |||||
| * | | Merge commit 'origin' into new_eth | Matt Ettus | 2009-09-24 | 3 | -11/+24 |
| |\| | | | | | | | | | | | | | Conflicts: .gitignore | ||||
| * | | Merge branch 'serdes_newfifo' into new_eth | Matt Ettus | 2009-09-20 | 3 | -79/+30 |
| |\ \ | |||||
| | * | | Untested fixes for getting serdes onto the new fifo system. Compiles, at least | Matt Ettus | 2009-09-04 | 3 | -79/+30 |
| | | | | |||||
| * | | | Remove old mac. Good riddance. | Matt Ettus | 2009-09-10 | 64 | -15211/+0 |
| | | | | |||||
| * | | | remove unused port | Matt Ettus | 2009-09-10 | 1 | -1/+1 |
| | | | | |||||
| * | | | More xilinx fifos, more clean up of our fifos | Matt Ettus | 2009-09-10 | 12 | -129/+555 |
| | | | | |||||
| * | | | might as well use a cascade fifo to help timing and give a little more capacity | Matt Ettus | 2009-09-10 | 1 | -1/+1 |
| | | | | |||||
| * | | | fix a typo which caused tx glitches | Matt Ettus | 2009-09-05 | 1 | -1/+1 |
| |/ / | |||||
| * | | Implement Eth flow control using pause frames | Matt Ettus | 2009-09-04 | 5 | -73/+66 |
| | | | | | | | | | | | | | | | | | | Not fully tested, but it seems to work without frame errors, sequence number errors or ethernet overruns. Still of course will get tx underruns on a slow machine, and the transmitted signal has some issues though. | ||||
| * | | parameterized fifo sizes, some reformatting | Matt Ettus | 2009-09-04 | 2 | -54/+57 |
| | | | |||||
| * | | remove unused old style fifo | Matt Ettus | 2009-09-04 | 1 | -31/+0 |
| | | | |||||
| * | | allow control of whether or not to honor flow control, adds some debug lines | Matt Ettus | 2009-09-04 | 1 | -6/+16 |
| | | | |||||
| * | | debug the rx side | Matt Ettus | 2009-09-04 | 1 | -1/+6 |
| | | | |||||
| * | | no longer used, replaced by newfifo version | Matt Ettus | 2009-09-04 | 1 | -66/+0 |
| | | | |||||
| * | | seems to build a decent fpga, but still some issues with a full connection. | Matt Ettus | 2009-09-03 | 3 | -29/+36 |
| | | | |||||
| * | | MAC transmit seems to work now. The root cause of the problem was ↵ | Matt Ettus | 2009-09-03 | 4 | -67/+70 |
| | | | | | | | | | | | | accidentally using the rx_clk in one stage of the fifos on the tx side. | ||||
| * | | set device to xc3s2000. Shouldn't make any differences. | Matt Ettus | 2009-09-03 | 1 | -2/+2 |
| | | | |||||
| * | | misc ignores | Matt Ettus | 2009-09-03 | 2 | -0/+3 |
| | | | |||||
| * | | made a new block ram based fifo, 64 (65) elements long, all fifos now have ↵ | Matt Ettus | 2009-09-03 | 28 | -155/+652 |
| | | | | | | | | | | | | "enhanced level logic" for accurate fullness. Maybe this will help... | ||||
| * | | bring the testbench files up to date | Matt Ettus | 2009-09-02 | 4 | -88/+79 |
| | | | |||||
| * | | major cleanup of 2 clock fifos | Matt Ettus | 2009-09-02 | 4 | -29/+48 |
| | | | |||||
| * | | cleaning up the new fifos | Matt Ettus | 2009-09-02 | 3 | -155/+0 |
| | | | |||||
| * | | cascadefifo.v wasn't used, only the double cascade version. fifo_2clock.v ↵ | Matt Ettus | 2009-09-02 | 4 | -56/+2 |
| | | | | | | | | | | | | and fifo_2clock.v are empty | ||||
| * | | never used, not needed | Matt Ettus | 2009-09-02 | 4 | -441/+0 |
| | | | |||||
| * | | debug pins, cleaned ignores | Matt Ettus | 2009-09-02 | 3 | -9/+22 |
| | | | |||||
| * | | sort out active-low lines on locallink fifos, added debug pins | Matt Ettus | 2009-09-02 | 1 | -3/+15 |
| | | | |||||
| * | | Removed these files completely, they were for the old style of fifos | Matt Ettus | 2009-09-02 | 4 | -497/+0 |
| | | | |||||
| * | | fixed addressing of registers, and added write enables to those that were ↵ | Matt Ettus | 2009-09-01 | 1 | -6/+9 |
| | | | | | | | | | | | | missing. MDIO seems ok. | ||||
| * | | Merged SVN matt/new_eth r10782:11633 into new_eth | Johnathan Corgan | 2009-08-31 | 25 | -957/+693 |
| | | | | | | | | | | | | | | | | | | | | | * svn diff http://gnuradio.org/svn/branches/developers/matt/new_eth -r10782:11633 * Patch applied with no conflicts or fuzz. | ||||
* | | | Enable pps interrupts. Not sure why they were disabled in the first place. | Matt Ettus | 2009-09-29 | 1 | -3/+2 |
| |/ |/| | |||||
* | | Synchronize the internal phase of the halfband filters to the start of the ↵ | Matt Ettus | 2009-09-24 | 3 | -11/+24 |
|/ | | | | "run" signal. This is important for MIMO. Bug reported by Christoph Hein and Hanwen . | ||||
* | Added git ignore files auto created from svn:ignore properties. | git repository hosting | 2009-08-13 | 21 | -0/+331 |
| | |||||
* | Add custom FPGA build. | jcorgan | 2009-07-30 | 12 | -3/+1704 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a custom build for USRP2 FPGA. It allows using a BasicRX or LFRX board and feed two independent, real signals. In addition, instead of the CIC/HB decimator, which optimizes frequency response, it uses an integrate and dump decimator, which optimizes for time-domain impulse response. These changes have been made in dsp_core_rx.v: * A second DDC has been added, sharing a frequency register with the existing DDC. * The output of the two DDCs are interleaved as I1 Q1 I2 Q2I ... into the receive FIFO. This limits the host configured decimation to 8 intead of 4. Use gr.deinterleave to recover the streams. * The ADCs are hardcoded: RX_A ==> DDC #1 I-input 0 ==> DDC #1 Q-input RX_B ==> DDC #2 I-input 0 ==> DDC #2 Q-input Thus, the input mux has been disabled. * The CIC/HB decimator has been replaced by an integrate and dump at the decimation rate. * To assist with meeting timing, the external RAM has been disabled. The basic application is to coherently sample two real IF streams and downconvert to baseband, while minimizing the impulse response duration of the resampling filters. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11519 221aa14e-8319-0410-a670-987f0aec2ac5 | ||||
* | Fix swapped signals. | jcorgan | 2009-04-27 | 2 | -2/+3 |
| | | | | git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10926 221aa14e-8319-0410-a670-987f0aec2ac5 | ||||
* | Merged r10770:10887 from jcorgan/iad2 into trunk. Adds alternative USRP2 ↵ | jcorgan | 2009-04-22 | 8 | -0/+776 |
| | | | | | | FPGA build to use integrate-and-dump decimator instead of CIC/HB combination. This provides a much shorter time duration impulse response for the same decimation rate, at the expense of worse stop-band rejection. git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10888 221aa14e-8319-0410-a670-987f0aec2ac5 | ||||
* | mostly formatting and name changes. commented out special purpose pins. | matt | 2009-04-12 | 1 | -180/+180 |
| | | | | git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@10814 221aa14e-8319-0410-a670-987f0aec2ac5 |