diff options
| author | Josh Blum <josh@joshknows.com> | 2010-06-19 01:31:40 +0000 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-06-19 01:31:40 +0000 |
| commit | a9319441d688620e18d5621cc59b98769e670468 (patch) | |
| tree | 834918c47d69808ca163746788c7a1e0a14462aa /firmware | |
| parent | 2f9b6d5530df140a5a03120adc98a5ad32a69cc4 (diff) | |
| parent | 1c1d967ec73906d50ee6e7257a4153db4ab9c507 (diff) | |
| download | uhd-a9319441d688620e18d5621cc59b98769e670468.tar.gz uhd-a9319441d688620e18d5621cc59b98769e670468.tar.bz2 uhd-a9319441d688620e18d5621cc59b98769e670468.zip | |
Merge branch 'master' of ettus.sourcerepo.com:ettus/uhdpriv into usrp_e
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/microblaze/apps/txrx_uhd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/firmware/microblaze/apps/txrx_uhd.c b/firmware/microblaze/apps/txrx_uhd.c index 7ad4ab110..45e5ff5fe 100644 --- a/firmware/microblaze/apps/txrx_uhd.c +++ b/firmware/microblaze/apps/txrx_uhd.c @@ -100,7 +100,7 @@ typedef struct{ #define MK_RX_CTRL_WORD(num_words) (((num_words)*sizeof(uint32_t)) | (1 << 16)) // DSP Rx writes ethernet header words -#define DSP_RX_FIRST_LINE 1 //1 = number of control words (see above) +#define DSP_RX_FIRST_LINE ((offsetof(rx_dsp_buff_t, vrt_header))/sizeof(uint32_t)) // receive from DSP buf_cmd_args_t dsp_rx_recv_args = { @@ -423,7 +423,7 @@ fw_sets_seqno_inspector(dbsm_t *sm, int buf_this) // returns false { // insert the correct length into the control word and vrt header rx_dsp_buff_t *buff = (rx_dsp_buff_t*)buffer_ram(buf_this); - size_t vrt_len = buffer_pool_status->last_line[buf_this]-1; + size_t vrt_len = buffer_pool_status->last_line[buf_this]-DSP_RX_FIRST_LINE; buff->control_word = MK_RX_CTRL_WORD(vrt_len); buff->vrt_header[0] = (buff->vrt_header[0] & ~VRTH_PKT_SIZE_MASK) | (vrt_len & VRTH_PKT_SIZE_MASK); |