diff options
author | Eric Blossom | 2009-09-04 15:47:32 -0700 |
---|---|---|
committer | Eric Blossom | 2009-09-04 15:47:32 -0700 |
commit | 6528672f2db205b6127f05ad7c7b9da66661b498 (patch) | |
tree | 8a2816fca91454865481b901bfa41791389cdadb | |
parent | 49a17dca1ee9cf7c0fd02b6baf83814a68c4e5e8 (diff) | |
download | gnuradio-6528672f2db205b6127f05ad7c7b9da66661b498.tar.gz gnuradio-6528672f2db205b6127f05ad7c7b9da66661b498.tar.bz2 gnuradio-6528672f2db205b6127f05ad7c7b9da66661b498.zip |
remove special last_line adjustment from ethernet port
-rw-r--r-- | usrp2/firmware/apps/app_common_v2.c | 2 | ||||
-rw-r--r-- | usrp2/firmware/lib/dbsm.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/usrp2/firmware/apps/app_common_v2.c b/usrp2/firmware/apps/app_common_v2.c index 1568ca70b..67cccd53b 100644 --- a/usrp2/firmware/apps/app_common_v2.c +++ b/usrp2/firmware/apps/app_common_v2.c @@ -600,7 +600,7 @@ bool eth_pkt_inspector(dbsm_t *sm, int bufno) { u2_eth_packet_t *pkt = (u2_eth_packet_t *) buffer_ram(bufno); - size_t byte_len = (buffer_pool_status->last_line[bufno] - 3) * 4; + size_t byte_len = (buffer_pool_status->last_line[bufno] - 1) * 4; //static size_t last_len = 0; diff --git a/usrp2/firmware/lib/dbsm.c b/usrp2/firmware/lib/dbsm.c index 8f774d916..96484d577 100644 --- a/usrp2/firmware/lib/dbsm.c +++ b/usrp2/firmware/lib/dbsm.c @@ -62,7 +62,8 @@ dbsm_init(dbsm_t *sm, int buf0, // How much to adjust the last_line register. // It's 1 for everything but the ethernet. - sm->last_line_adj = recv->port == PORT_ETH ? 3 : 1; + //sm->last_line_adj = recv->port == PORT_ETH ? 3 : 1; + sm->last_line_adj = 1; buffer_state[sm->buf0] = BS_EMPTY; buffer_state[sm->buf0 ^ 1] = BS_EMPTY; |