[Commit-gnuradio] r5594 - gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband

[gnychis]

Author: gnychis
Date: 2007-06-01 15:51:31 -0600 (Fri, 01 Jun 2007)
New Revision: 5594

Modified:
   
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/qa_inband_usrp_server.cc
Log:
Needed to pass PMT_NIL instead of PMT_F to usrp_server now in the make checks.

Likewise, a dictionary needed to be passed specifying the use of the stub for 
the packet tests.


Modified: 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/qa_inband_usrp_server.cc
===================================================================
--- 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/qa_inband_usrp_server.cc
   2007-06-01 21:45:18 UTC (rev 5593)
+++ 
gnuradio/branches/developers/gnychis/inband/usrp/host/lib/inband/qa_inband_usrp_server.cc
   2007-06-01 21:51:31 UTC (rev 5594)
@@ -99,7 +99,7 @@
   d_cs = define_port("cs", "usrp-server-cs", false, mb_port::INTERNAL);
 
   // Test the TX side
-  define_component("server", "usrp_server", PMT_F);
+  define_component("server", "usrp_server", PMT_NIL);
   connect("self", "tx0", "server", "tx0");
   connect("self", "rx0", "server", "rx0");
   connect("self", "cs", "server", "cs");
@@ -259,7 +259,7 @@
   d_cs = define_port("cs", "usrp-server-cs", false, mb_port::INTERNAL);
 
   // Test the TX side
-  define_component("server", "usrp_server", PMT_F);
+  define_component("server", "usrp_server", PMT_NIL);
   connect("self", "tx0", "server", "tx0");
   connect("self", "rx0", "server", "rx0");
   connect("self", "cs", "server", "cs");
@@ -469,7 +469,13 @@
   d_tx = define_port("tx0", "usrp-tx", false, mb_port::INTERNAL);
 
   // Test the TX side
-  define_component("server", "usrp_server", PMT_F);
+  
+  // Pass a dictionary to usrp_server which specifies which interface to use, 
the stub or USRP
+  pmt_t usrp_server_dict = pmt_make_dict();
+  pmt_dict_set(usrp_server_dict, pmt_intern("usrp-interface"), 
pmt_intern("usrp_usb_interface_stub"));
+  pmt_dict_set(usrp_server_dict, pmt_intern("usrp-interface-cs"), 
pmt_intern("usrp-usb-interface-cs"));
+
+  define_component("server", "usrp_server", pmt_list1(usrp_server_dict));
   connect("self", "tx0", "server", "tx0");
 }