diff options
| author | Josh Blum <josh@joshknows.com> | 2010-08-04 16:33:49 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-08-04 16:33:49 -0700 |
| commit | 8e1d51d628afb18dc9a36f268dda1e9f48a1c2ad (patch) | |
| tree | 9aea9b125848fa7fc3ea45c96bff27dde2c1e8fb /firmware/microblaze/apps/txrx_uhd.c | |
| parent | 702d5af8ca0bab8ef295c817017df5952f6aea51 (diff) | |
| parent | 70abdef8f6c6d24a99caf8d3668f32094b159903 (diff) | |
| download | uhd-8e1d51d628afb18dc9a36f268dda1e9f48a1c2ad.tar.gz uhd-8e1d51d628afb18dc9a36f268dda1e9f48a1c2ad.tar.bz2 uhd-8e1d51d628afb18dc9a36f268dda1e9f48a1c2ad.zip | |
Merge branch 'master' into codec_gains
Conflicts:
host/lib/CMakeLists.txt
host/lib/utils/gain_handler.cpp
Diffstat (limited to 'firmware/microblaze/apps/txrx_uhd.c')
| -rw-r--r-- | firmware/microblaze/apps/txrx_uhd.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/firmware/microblaze/apps/txrx_uhd.c b/firmware/microblaze/apps/txrx_uhd.c index f7f140121..092d216aa 100644 --- a/firmware/microblaze/apps/txrx_uhd.c +++ b/firmware/microblaze/apps/txrx_uhd.c @@ -41,7 +41,6 @@ #include <stdlib.h> #include <string.h> #include "clocks.h" -#include <vrt/bits.h> #include "usrp2/fw_common.h" #include <i2c.h> #include <ethertype.h> @@ -266,7 +265,7 @@ void handle_udp_ctrl_packet( * Peek and Poke Register ******************************************************************/ case USRP2_CTRL_ID_POKE_THIS_REGISTER_FOR_ME_BRO: - if (ctrl_data_in->data.poke_args.addr < 0xC000){ + if (0){//ctrl_data_in->data.poke_args.addr < 0xC000){ printf("error! tried to poke into 0x%x\n", ctrl_data_in->data.poke_args.addr); } else switch(ctrl_data_in->data.poke_args.num_bytes){ @@ -484,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'); } |