diff options
| author | Nick Foster <nick@nerdnetworks.org> | 2010-07-29 18:12:20 -0700 |
|---|---|---|
| committer | Nick Foster <nick@nerdnetworks.org> | 2010-07-29 18:12:20 -0700 |
| commit | 90a5d84a18aaa338092e572ff257aab1fdcc8e6b (patch) | |
| tree | d31806e064b1b12a21b2245bec2c9251537a6083 /firmware | |
| parent | f39c4538a3ca25c79f6b793ee0b6448051dcd751 (diff) | |
| parent | 1cddf89b0ea0b509418ea9a817bd1cebbdfdb118 (diff) | |
| download | uhd-90a5d84a18aaa338092e572ff257aab1fdcc8e6b.tar.gz uhd-90a5d84a18aaa338092e572ff257aab1fdcc8e6b.tar.bz2 uhd-90a5d84a18aaa338092e572ff257aab1fdcc8e6b.zip | |
Merge branch 'master' of git@ettus.sourcerepo.com:ettus/uhdpriv into usrp2p
Conflicts:
host/lib/usrp/usrp2/mboard_impl.cpp
host/lib/usrp/usrp2/usrp2_regs.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 4e03bc869..092d216aa 100644 --- a/firmware/microblaze/apps/txrx_uhd.c +++ b/firmware/microblaze/apps/txrx_uhd.c @@ -483,7 +483,7 @@ main(void) int pending = pic_regs->pending; // poll for under or overrun if (pending & PIC_UNDERRUN_INT){ - dbsm_handle_tx_underrun(&dsp_tx_sm); + //dbsm_handle_tx_underrun(&dsp_tx_sm); pic_regs->pending = PIC_UNDERRUN_INT; // clear interrupt putchar('U'); } |