[Commit-gnuradio] r7181 - gnuradio/branches/features/inband-usb/usrp/host/apps-inband

[gnychis]

Author: gnychis
Date: 2007-12-14 13:09:25 -0700 (Fri, 14 Dec 2007)
New Revision: 7181

Modified:
   gnuradio/branches/features/inband-usb/usrp/host/apps-inband/gmac.cc
   gnuradio/branches/features/inband-usb/usrp/host/apps-inband/gmac.h
Log:
Merging -r7177:7180 from developers/gnychis/cs-fix


Modified: gnuradio/branches/features/inband-usb/usrp/host/apps-inband/gmac.cc
===================================================================
--- gnuradio/branches/features/inband-usb/usrp/host/apps-inband/gmac.cc 
2007-12-14 20:07:32 UTC (rev 7180)
+++ gnuradio/branches/features/inband-usb/usrp/host/apps-inband/gmac.cc 
2007-12-14 20:09:25 UTC (rev 7181)
@@ -359,7 +359,7 @@
   // Specify the RBF to use
   pmt_dict_set(usrp_dict,
                pmt_intern("rbf"),
-               pmt_intern("test2.rbf"));
+               pmt_intern("std_inband.rbf"));
 
   pmt_dict_set(usrp_dict,
                pmt_intern("interp-tx"),

Modified: gnuradio/branches/features/inband-usb/usrp/host/apps-inband/gmac.h
===================================================================
--- gnuradio/branches/features/inband-usb/usrp/host/apps-inband/gmac.h  
2007-12-14 20:07:32 UTC (rev 7180)
+++ gnuradio/branches/features/inband-usb/usrp/host/apps-inband/gmac.h  
2007-12-14 20:09:25 UTC (rev 7181)
@@ -58,8 +58,8 @@
   long d_cs_deadline;
 
   enum FPGA_REGISTERS {
-    REG_CS_THRESH = 1,
-    REG_CS_DEADLINE = 2
+    REG_CS_THRESH = 51,
+    REG_CS_DEADLINE = 52
   };
   
  public: