diff options
| author | Josh Blum <josh@joshknows.com> | 2010-10-15 11:22:25 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-10-15 11:22:25 -0700 |
| commit | 52229e99c90966c392f8ec74752912e3f00eec1d (patch) | |
| tree | c72cfdb388745c13c73859cd254bb2ae5d7fb804 /firmware/microblaze/usrp2 | |
| parent | 39ca8e25fc7f9b3170cb517b72640a62b15d253f (diff) | |
| parent | 26b7de0ac0cd64946582b2d52ab0bb3555156039 (diff) | |
| download | uhd-52229e99c90966c392f8ec74752912e3f00eec1d.tar.gz uhd-52229e99c90966c392f8ec74752912e3f00eec1d.tar.bz2 uhd-52229e99c90966c392f8ec74752912e3f00eec1d.zip | |
Merge branch 'flow_ctrl_with_fpga'
Diffstat (limited to 'firmware/microblaze/usrp2')
| -rw-r--r-- | firmware/microblaze/usrp2/Makefile.am | 3 | ||||
| -rw-r--r-- | firmware/microblaze/usrp2/memory_map.h | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/firmware/microblaze/usrp2/Makefile.am b/firmware/microblaze/usrp2/Makefile.am index 8da013980..ba426b75c 100644 --- a/firmware/microblaze/usrp2/Makefile.am +++ b/firmware/microblaze/usrp2/Makefile.am @@ -22,10 +22,11 @@ AM_CFLAGS = \ AM_LDFLAGS = \ $(COMMON_LFLAGS) \ - libusrp2.a \ -Wl,-defsym -Wl,_TEXT_START_ADDR=0x0050 \ -Wl,-defsym -Wl,_STACK_SIZE=3072 +LDADD = libusrp2.a + ######################################################################## # USRP2 specific library and programs ######################################################################## diff --git a/firmware/microblaze/usrp2/memory_map.h b/firmware/microblaze/usrp2/memory_map.h index 41a2820bc..e7f41bc8d 100644 --- a/firmware/microblaze/usrp2/memory_map.h +++ b/firmware/microblaze/usrp2/memory_map.h @@ -463,6 +463,9 @@ typedef struct { typedef struct { volatile uint32_t num_chan; volatile uint32_t clear_state; // clears out state machine, fifos, + volatile uint32_t report_sid; + volatile uint32_t policy; + volatile uint32_t cyc_per_up; } sr_tx_ctrl_t; #define sr_tx_ctrl ((sr_tx_ctrl_t *) _SR_ADDR(SR_TX_CTRL)) |