Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | b100/e100: bump compat for inversion fix on master | Josh Blum | 2012-10-05 | 1 | -1/+1 |
| | |||||
* | e1x0: fix RX ADC I and Q inversion | Josh Blum | 2012-10-05 | 1 | -1/+10 |
| | |||||
* | Merge branch 'maint' | Josh Blum | 2012-10-05 | 1 | -4/+4 |
|\ | | | | | | | | | | | | | Conflicts: usrp2/top/B100/u1plus_core.v usrp2/top/E1x0/E1x0.v usrp2/top/E1x0/u1e_core.v | ||||
| * | b100/e100: bump compat minor for inversion fix | Josh Blum | 2012-10-05 | 2 | -2/+2 |
| | | |||||
| * | e1x0: fix RX ADC I and Q inversion | Josh Blum | 2012-10-05 | 1 | -2/+13 |
| | | |||||
| * | b100: fix RX ADC I and Q inversion | Josh Blum | 2012-10-05 | 1 | -4/+4 |
| | | |||||
* | | b100: fpga makefile for 2rx no tx | Josh Blum | 2012-09-01 | 4 | -1/+134 |
| | | |||||
* | | e100: tighten timing - less routing on EM_A | Josh Blum | 2012-07-19 | 2 | -2/+2 |
| | | | | | | | | | | There were a few places it was ok to use addr over EM_A. This makes routing sligtly easier for GPMC signals. | ||||
* | | u1plus: added sr misc hook for clock sync | Josh Blum | 2012-07-18 | 1 | -1/+8 |
| | | |||||
* | | e100: renamed top level for E100/E110 to E1x0 | Josh Blum | 2012-07-17 | 5 | -9/+9 |
| | | | | | | | | Some minor tweaks to gpmc_to_fifo + timing | ||||
* | | E100: squash E100/E110 top level work | Josh Blum | 2012-07-16 | 6 | -531/+84 |
| | | | | | | | | | | | | Implements timed commands and FIFO control. Uses control and data FIFOs for GPMC. Uses the common core for E100/B100. | ||||
* | | gpmc: tighter timing constraints and easier to route gpmc to fifo | Josh Blum | 2012-07-16 | 1 | -15/+11 |
| | | |||||
* | | Merge branch 'master' into next | Josh Blum | 2012-07-16 | 1 | -1/+1 |
|\ \ | |||||
| * | | Merge branch 'maint' | Josh Blum | 2012-07-16 | 1 | -1/+1 |
| |\| | | | | | | | | | | | | | Conflicts: usrp2/top/E1x0/u1e_core.v | ||||
| | * | e100: offset gpmc to fifo writes by 2 transfers | Josh Blum | 2012-07-15 | 1 | -1/+1 |
| | | | | | | | | | | | | This effectivly works around bus initial transaction issues. | ||||
* | | | B100: squash B100 top level work | Josh Blum | 2012-07-02 | 4 | -406/+348 |
|/ / | | | | | | | | | | | Implements timed commands and FIFO control. Uses control and data FIFOs for GPIF. Implements a common core for E100/B100. | ||||
* | | b100: removed unused proto files | Josh Blum | 2012-06-13 | 3 | -390/+0 |
| | | |||||
* | | Merge branch 'maint' | Josh Blum | 2012-05-10 | 1 | -1/+1 |
|\| | | | | | | | | | Conflicts: usrp2/top/E1x0/u1e_core.v | ||||
| * | e100: bump compat minor for xclock reader fix | Josh Blum | 2012-05-10 | 1 | -1/+1 |
| | | |||||
* | | e100/b100: bumped compat number for timed commands merge | Josh Blum | 2012-04-25 | 2 | -2/+2 |
| | | | | | | | | | | There were common FPGA changes and an incompatibility. This should have been done before the merge anyhow. | ||||
* | | b100: implement packet-end/flush cycle timeout | Josh Blum | 2012-04-24 | 1 | -1/+1 |
| | | |||||
* | | N2x0: updated the bootloader w/ latest from fw | Josh Blum | 2012-04-20 | 1 | -390/+390 |
| | | |||||
* | | usrp2: remove settings_fifo_ctrl, meets timing | Josh Blum | 2012-04-20 | 1 | -2/+11 |
| | | |||||
* | | usrp: work on meeting timing constraints | Josh Blum | 2012-04-10 | 2 | -16/+16 |
| | | | | | | | | | | | | * 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 | ||||
* | | Merge branch 'master' into next | Josh Blum | 2012-04-09 | 3 | -2/+62 |
|\ \ | | | | | | | | | | | | | | | | Conflicts: usrp2/top/N2x0/u2plus_core.v usrp2/top/USRP2/u2_core.v | ||||
| * | | Merge branch 'maint' | Josh Blum | 2012-04-09 | 4 | -5/+5 |
| |\| | |||||
| | * | vita: moved clear register to overlap with nchan register | Josh Blum | 2012-04-09 | 4 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the bug where setting the format clears the vita RX. This is only an issue when the noclear option is set by UHD, because the format register is always so, so it always clears. Note: noclear is there to support the backwards compat API (pre streamer). Now, numchans and clear overlap. This is ok because in the host code, clear and numchans are always used together. All timing meets on N2xx and USRP2. | ||||
| * | | Merge branch 'maint' | Josh Blum | 2012-04-02 | 1 | -1/+1 |
| |\| | |||||
| | * | b100: fix slave fifo data xfer exit condition | Josh Blum | 2012-04-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | When exiting the read/write data state, when the transfer count maxes out/peaks, the fifo read/write signals were getting this condition the cycle after with the state change. | ||||
| * | | fpga: extract usage summary from map file | Josh Blum | 2012-03-27 | 1 | -0/+60 |
| |/ | |||||
* | | Merge branch 'master' into next | Josh Blum | 2012-03-26 | 1 | -1/+1 |
|\| | |||||
| * | b100: slave fifo fix for dst/src ready signals | Josh Blum | 2012-03-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Some of the changes my be overkill, but the idea is to be more careful about allowing FIFO IO to occur on transitions. The cal app was able to complete successfully. | ||||
* | | fifo ctrl: parameterize having a proto header | Josh Blum | 2012-03-16 | 2 | -2/+2 |
| | | |||||
* | | fifo ctrl: rename fifo ctrl module and add sid ack param | Josh Blum | 2012-03-16 | 2 | -28/+28 |
| | | |||||
* | | fifo ctrl: minor fixes for spi core, swap time define | Josh Blum | 2012-03-16 | 3 | -3/+3 |
| | | |||||
* | | fifo ctrl: simplified perfs, added spi clock idle phase | Josh Blum | 2012-03-16 | 3 | -320/+320 |
| | | |||||
* | | fifo ctrl: minor fixes from last commit | Josh Blum | 2012-03-16 | 3 | -366/+366 |
| | | |||||
* | | fifo ctrl: spi core work, fifo ctrl perifs, usrp2 support | Josh Blum | 2012-03-16 | 3 | -351/+394 |
| | | | | | | | | | | | | | | | | Continued work on simple spi core. Added peripherals input to fifo ctrl so perifs can backpressure fifo ctrl. Copied the implementation into usrp2 core. | ||||
* | | spi: created simple spi core (sr based) | Josh Blum | 2012-03-16 | 2 | -383/+397 |
| | | |||||
* | | fifo_ctrl: switched to medfifo and separate result fifo | Josh Blum | 2012-03-16 | 2 | -2/+2 |
| | | |||||
* | | fifo_ctrl: clear settings reg, and flow control | Josh Blum | 2012-03-16 | 1 | -5/+10 |
| | | |||||
* | | srb: created command queue, in and out state machines | Josh Blum | 2012-03-16 | 2 | -4/+2 |
| | | |||||
* | | usrp2: first pass implementation of fifo control | Josh Blum | 2012-03-16 | 1 | -4/+38 |
|/ | |||||
* | fpga: force -include_global for custom sources | Josh Blum | 2012-03-12 | 9 | -13/+16 |
| | | | | | | | | ISE will not recognize custom sources as part of the hierarchy, and thus will not compile (unless its the first macro...). Remove custom sources from the source list, and specially add them with the -include_global option. | ||||
* | fpga: fix custom defs in some top level makefiles | Josh Blum | 2012-03-08 | 4 | -101/+3 |
| | |||||
* | usrp2/nseries: added churn to meet timing | Josh Blum | 2012-02-18 | 2 | -2/+4 |
| | | | | | Added churn to readback mux on nseries to make n200r4 meet timing. Also added churn to usrp2 for parallelism, but assigned to zero. | ||||
* | dsp rework: implement 64 bit ticks no seconds | Josh Blum | 2012-02-06 | 4 | -4/+4 |
| | |||||
* | B100: External FPGA reset from FX2 reuses fpga_cfg_cclk. | Nick Foster | 2012-02-06 | 2 | -2/+6 |
| | |||||
* | dsp rework: pass vita clears into dsp modules, unified fifo clears | Josh Blum | 2012-02-04 | 4 | -62/+51 |
| | |||||
* | b100: timing constraints on GPIF lines | Josh Blum | 2012-02-04 | 1 | -0/+9 |
| |