[Commit-gnuradio] r7422 - usrp2/trunk/firmware/lib

[eb]

Author: eb
Date: 2008-01-13 18:10:08 -0700 (Sun, 13 Jan 2008)
New Revision: 7422

Modified:
   usrp2/trunk/firmware/lib/Makefile.am
   usrp2/trunk/firmware/lib/eth_mac.c
Log:
cleanup

Modified: usrp2/trunk/firmware/lib/Makefile.am
===================================================================
--- usrp2/trunk/firmware/lib/Makefile.am        2008-01-13 23:12:30 UTC (rev 
7421)
+++ usrp2/trunk/firmware/lib/Makefile.am        2008-01-14 01:10:08 UTC (rev 
7422)
@@ -35,7 +35,7 @@
        nonstdio.c \
        pic.c \
        print_mac_addr.c \
-       print_rom_regs.c \
+       print_rmon_regs.c \
        printf.c \
        spi.c \
        u2_init.c       

Modified: usrp2/trunk/firmware/lib/eth_mac.c
===================================================================
--- usrp2/trunk/firmware/lib/eth_mac.c  2008-01-13 23:12:30 UTC (rev 7421)
+++ usrp2/trunk/firmware/lib/eth_mac.c  2008-01-14 01:10:08 UTC (rev 7422)
@@ -81,7 +81,7 @@
   while(eth_mac->rmon_rd_grant == 0)
     ;
 
-  t = (eth_mac->rmon_rd_dout_hi << 16) | eth_mac->rmon_rd_dout_lo;
+  t = (eth_mac->rmon_rd_dout_hi << 16) | (eth_mac->rmon_rd_dout_lo & 0xffff);
   eth_mac->rmon_rd_apply = 0;
   return t;
 }