[Commit-gnuradio] r8660 - usrp2/branches/features/host-ng/host-ng/lib

[jcorgan]

Author: jcorgan
Date: 2008-06-22 18:35:04 -0600 (Sun, 22 Jun 2008)
New Revision: 8660

Modified:
   usrp2/branches/features/host-ng/host-ng/lib/usrp2_impl.cc
   usrp2/branches/features/host-ng/host-ng/lib/usrp2_impl.h
Log:
cleanup

Modified: usrp2/branches/features/host-ng/host-ng/lib/usrp2_impl.cc
===================================================================
--- usrp2/branches/features/host-ng/host-ng/lib/usrp2_impl.cc   2008-06-23 
00:26:25 UTC (rev 8659)
+++ usrp2/branches/features/host-ng/host-ng/lib/usrp2_impl.cc   2008-06-23 
00:35:04 UTC (rev 8660)
@@ -42,6 +42,8 @@
 
 namespace usrp2 {
 
+  static const double DEF_CMD_TIMEOUT = 0.1;
+
   std::string
   opcode_to_string(int opcode)
   {

Modified: usrp2/branches/features/host-ng/host-ng/lib/usrp2_impl.h
===================================================================
--- usrp2/branches/features/host-ng/host-ng/lib/usrp2_impl.h    2008-06-23 
00:26:25 UTC (rev 8659)
+++ usrp2/branches/features/host-ng/host-ng/lib/usrp2_impl.h    2008-06-23 
00:35:04 UTC (rev 8660)
@@ -25,9 +25,6 @@
 #include "control.h"
 #include <string>
 
-#define NRIDS 256
-#define DEF_CMD_TIMEOUT 0.1 // seconds
-
 namespace usrp2 {
   
   class eth_buffer;
@@ -38,6 +35,8 @@
 
   class usrp2::impl : public data_handler
   {
+    static const size_t NRIDS = 256;
+
     eth_buffer   *d_buffer;
     pktfilter    *d_pf;
     std::string   d_addr;