summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-06-18 10:52:24 -0700
committerJosh Blum <josh@joshknows.com>2010-06-18 10:52:24 -0700
commita950a544f5c3beb7430a0748b7e76fd6cb713514 (patch)
treebe03e3edbc733decea5fd8f9adcc7e17a31f0125 /firmware
parente2bde1a9a38be9ca6c3bf3979d31c6a67904ab9a (diff)
downloaduhd-a950a544f5c3beb7430a0748b7e76fd6cb713514.tar.gz
uhd-a950a544f5c3beb7430a0748b7e76fd6cb713514.tar.bz2
uhd-a950a544f5c3beb7430a0748b7e76fd6cb713514.zip
usrp2 mb: replace hard coded constants with macros for rx offset
Diffstat (limited to 'firmware')
-rw-r--r--firmware/microblaze/apps/txrx_uhd.c4
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);