diff options
| author | Josh Blum <josh@joshknows.com> | 2010-10-21 15:32:20 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-10-21 15:32:20 -0700 |
| commit | 2628d78e0d0348001cb8428c8064cd1e3179afc8 (patch) | |
| tree | fa2064b84926751c9e4f4532e07f76a76340e751 /firmware | |
| parent | 1e57eec9999e1a9d0a735c04173c78164ce8afcd (diff) | |
| parent | bd59192bd4eceaf86b60d91651e6b0bf11c2274e (diff) | |
| download | uhd-2628d78e0d0348001cb8428c8064cd1e3179afc8.tar.gz uhd-2628d78e0d0348001cb8428c8064cd1e3179afc8.tar.bz2 uhd-2628d78e0d0348001cb8428c8064cd1e3179afc8.zip | |
Merge branch 'usrp2_overflow' into flow_ctrl
Conflicts:
host/lib/usrp/usrp2/usrp2_impl.hpp
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/microblaze/apps/txrx_uhd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/firmware/microblaze/apps/txrx_uhd.c b/firmware/microblaze/apps/txrx_uhd.c index e38eb621d..4765fa006 100644 --- a/firmware/microblaze/apps/txrx_uhd.c +++ b/firmware/microblaze/apps/txrx_uhd.c @@ -536,7 +536,7 @@ main(void) } if (pending & PIC_OVERRUN_INT){ - dbsm_handle_rx_overrun(&dsp_rx_sm); + //dbsm_handle_rx_overrun(&dsp_rx_sm); pic_regs->pending = PIC_OVERRUN_INT; // clear pending interrupt // FIXME Figure out how to handle this robustly. |