Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into flow_ctrl | Josh Blum | 2010-10-21 | 33 | -718/+2166 |
|\ | |||||
| * | usrp: remove irrelevant copied comment from single usrp | Josh Blum | 2010-10-21 | 1 | -2/+0 |
| | | |||||
| * | usrp: use a dash as the gain name prefix separator, removed RX/TX auto ↵ | Josh Blum | 2010-10-20 | 2 | -4/+4 |
| | | | | | | | | suffix for XCVR board cnames | ||||
| * | usrp: convenience wrappers for dealing with overall gains | Josh Blum | 2010-10-20 | 2 | -26/+66 |
| | | |||||
| * | usrp: use the dboard id to prefix the subdev gain group names | Josh Blum | 2010-10-20 | 10 | -32/+46 |
| | | |||||
| * | usrp: added gain element access by gain name to multi and single wrappers | Josh Blum | 2010-10-20 | 4 | -56/+150 |
| | | |||||
| * | uhd: added name parameter to gain group, get range, set/get value by name | Josh Blum | 2010-10-20 | 4 | -18/+59 |
| | | |||||
| * | usrp: added docstrings to single and multi usrp for undocumented methods | Josh Blum | 2010-10-20 | 2 | -4/+432 |
| | | |||||
| * | usrp: updated docs to reflect switch to multi-usrp interface | Josh Blum | 2010-10-19 | 2 | -5/+5 |
| | | |||||
| * | uhd: remove some warnings in MSVC and with typo in xcvr2450 | Josh Blum | 2010-10-19 | 2 | -3/+4 |
| | | |||||
| * | usrp: change the bandwidth param to a double (its a frequency), add set and ↵ | Josh Blum | 2010-10-19 | 6 | -34/+60 |
| | | | | | | | | gets for BW in the wrappers | ||||
| * | Merge branch 'multi_usrp' | Josh Blum | 2010-10-19 | 11 | -597/+1328 |
| |\ | |||||
| | * | multi-usrp: fixed num channel calculation, moved logic to cpm functions | Josh Blum | 2010-10-19 | 1 | -16/+16 |
| | | | |||||
| | * | multi-usrp: corrected calculations for channel and mboard indexes | Josh Blum | 2010-10-18 | 1 | -30/+25 |
| | | | |||||
| | * | usrp: deleted deprecated simple and mimo wrappers, moved implementations ↵ | Josh Blum | 2010-10-18 | 5 | -585/+557 |
| | | | | | | | | | | | | into headers | ||||
| | * | usrp: moved warnings logic into wrappers | Josh Blum | 2010-10-17 | 4 | -18/+97 |
| | | | |||||
| | * | usrp: created multi-usrp (multi chan, multi board), and deprecated mimo-usrp | Josh Blum | 2010-10-16 | 8 | -9/+694 |
| | | | |||||
| * | | uhd: split unit tests into individual tests by file + they get installed | Josh Blum | 2010-10-19 | 2 | -7/+13 |
| | | | |||||
| * | | uhd: made ticks signed in time spec, fixed full secs implementation, added ↵ | Josh Blum | 2010-10-19 | 4 | -9/+78 |
| |/ | | | | | | | unit tests | ||||
* | | Merge branch 'master' into flow_ctrl | Josh Blum | 2010-10-18 | 1 | -1/+1 |
|\| | | | | | | | | | Conflicts: host/lib/usrp/usrp2/io_impl.cpp | ||||
| * | usrp2: make the booty smaller than the number of recv frames | Josh Blum | 2010-10-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This may fix some of our woes when the host cannot keep up. That is, with a smaller booty, the managed buffers will get freed up and the call to get buffer will never block waiting for a buffer to become free. This has several side effects: 1) Overflows are more likely to occur in the pirate thread. Pirate-based overflows will overwrite old packets, whereas socket-based overflows will discard newer incoming packets. 2) The pirate thread will continue to pull in async packets rather than loosing them in a socket-based overflow. | ||||
* | | usrp2: dont need to start streaming for this hack | Josh Blum | 2010-10-15 | 1 | -1/+0 |
| | | |||||
* | | usrp2: temp fix to send dummy packets and flush so FPGA vita machine are in ↵ | Josh Blum | 2010-10-15 | 1 | -0/+26 |
| | | | | | | | | known state | ||||
* | | Merge branch 'flow_ctrl_with_fpga' | Josh Blum | 2010-10-15 | 77 | -405/+11159 |
|\ \ | |/ |/| | |||||
| * | Merge branch 'flow_control' into flow_ctrl | Josh Blum | 2010-10-14 | 57 | -256/+10817 |
| |\ | |||||
| | * | now handles frames larger than the vita packet (i.e. with padding) | Matt Ettus | 2010-10-12 | 1 | -6/+16 |
| | | | |||||
| | * | don't clear out following packets on an eob ack | Matt Ettus | 2010-10-12 | 1 | -1/+1 |
| | | | |||||
| | * | don't flag an error on eob ack | Matt Ettus | 2010-10-12 | 1 | -1/+1 |
| | | | |||||
| | * | proper triggering for interrupts generated on the dsp_clk | Matt Ettus | 2010-10-12 | 1 | -1/+8 |
| | | | |||||
| | * | cleanup for 32 bit seqnum | Matt Ettus | 2010-10-11 | 1 | -4/+3 |
| | | | |||||
| | * | increase compatibility number for flow control | Matt Ettus | 2010-10-11 | 1 | -1/+1 |
| | | | |||||
| | * | switch to 32 bit sequence numbers. Will wrap in ~15 hours at max rate | Matt Ettus | 2010-10-11 | 3 | -14/+16 |
| | | | |||||
| | * | send message on eob to ack the end of transmission | Matt Ettus | 2010-10-11 | 1 | -1/+6 |
| | | | |||||
| | * | typo which isn't caught by xilinx | Matt Ettus | 2010-10-11 | 1 | -1/+1 |
| | | | |||||
| | * | separated flow control and error reporting on tx path. should work with and ↵ | Matt Ettus | 2010-10-10 | 4 | -25/+43 |
| | | | | | | | | | | | | without flow control | ||||
| | * | go to the correct state | Matt Ettus | 2010-10-08 | 1 | -3/+3 |
| | | | |||||
| | * | add a fifo to the end of the mux to help in timing. | Matt Ettus | 2010-10-08 | 1 | -6/+13 |
| | | | |||||
| | * | add trigger to makefile | Matt Ettus | 2010-10-08 | 1 | -0/+1 |
| | | | |||||
| | * | assign setting reg addresses | Matt Ettus | 2010-10-08 | 1 | -2/+2 |
| | | | |||||
| | * | declarations | Matt Ettus | 2010-10-08 | 1 | -2/+3 |
| | | | |||||
| | * | checkpoint in flow control packet generation | Matt Ettus | 2010-10-08 | 5 | -42/+147 |
| | | | |||||
| | * | revert unneeded changes and incorrect comments | Matt Ettus | 2010-10-07 | 3 | -38/+38 |
| | | | |||||
| | * | reconnect GPIOs, remove debug pins, meets timing now | Matt Ettus | 2010-10-06 | 1 | -5/+3 |
| | | | |||||
| | * | Merge branch 'ise12' into efifo_merge_dcm | Matt Ettus | 2010-10-06 | 3 | -29/+23 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | * ise12: fix timing problem on DAC output bus clean up DAC inversion and swapping to match schematics Clean up iq swapping on RX. It is now swapped in the top level. widened muxes to 4 bits to match tx side and handle more ADCs in future | ||||
| | | * | fix timing problem on DAC output bus | Matt Ettus | 2010-10-01 | 1 | -2/+2 |
| | | | | |||||
| | * | | Modified phase shift of DCM1 to -64 which is intended to give more timing ↵ | Ian Buckley | 2010-09-30 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | margin on reads from the SRAM at the expense of Writes to the SRAM. Tested to be at least as stable as a phase shift of 12 and beter looking timing on the logic analyzer. Signals driven by the FPGA are observed changing on the SRAM pins about 4 nS after the rising edge of the RAM clock. | ||||
| | * | | Enabled phase offset adjustment on DCM_INST1 which drives the external Fast ↵ | Ian Buckley | 2010-09-14 | 1 | -12/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SRAM clock. Set phase shift to -12 after experimentation using logic analyzer to see results. This value gives near optimum 1.5nS setup times on the source sync signals FPGA -> SRAM under lab conditions. | ||||
| | * | | Added to DCM's and some BUFG's to align the internal 125MHz clock edge with ↵ | Ian Buckley | 2010-09-01 | 4 | -5/+101 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | its presentation externally at the NoBL SRAM. Since we don't have a board level trace to use to estimate clock propigation delay we just loop through the I/O on the FPGA. This hasn't been verified as working on a USRP2 yet. | ||||
| | * | | Merge branch 'efifo_merge' of git@ettus.sourcerepo.com:ettus/fpgapriv into ↵ | Ian Buckley | 2010-09-01 | 5 | -47/+60 |
| | |\ \ | | | | | | | | | | | | | | | | efifo_merge | ||||
| | | * | | hangedddddddextrnal fifo size to use full NoBL SRAM | ianb | 2010-08-25 | 1 | -1/+1 |
| | | | | |