[Commit-gnuradio] r3496 - gnuradio/branches/developers/eb/mb/mblock/src/lib

[eb]

Author: eb
Date: 2006-09-07 17:12:50 -0600 (Thu, 07 Sep 2006)
New Revision: 3496

Modified:
   gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_mblock_impl.cc
   gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_port.cc
   gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_port.h
Log:
work-in-progress

Modified: gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_mblock_impl.cc
===================================================================
--- gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_mblock_impl.cc 
2006-09-07 06:59:47 UTC (rev 3495)
+++ gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_mblock_impl.cc 
2006-09-07 23:12:50 UTC (rev 3496)
@@ -41,6 +41,9 @@
                            bool conjugated,
                            mb_port_class::port_type_t port_type)
 {
+  if (port_type == mb_port_class::RELAY)
+    throw pmt_unimplemented("mb_block_impl::define_port: RELAY ports are not 
implemented", port_name);
+  
   if (lookup_port(port_name))
     throw pmt_exception("mb_mblock_impl::define_port: port_name already 
defined", port_name);
 

Modified: gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_port.cc
===================================================================
--- gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_port.cc        
2006-09-07 06:59:47 UTC (rev 3495)
+++ gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_port.cc        
2006-09-07 23:12:50 UTC (rev 3496)
@@ -33,7 +33,8 @@
                 bool conjugated,
                 mb_port_class::port_type_t port_type)
   : d_port_class(mb_make_port_class(port_name, protocol_class_name,
-                                   conjugated, port_type))
+                                   conjugated, port_type)),
+    d_remote_port_name(PMT_NIL)
 {
 }
 

Modified: gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_port.h
===================================================================
--- gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_port.h 2006-09-07 
06:59:47 UTC (rev 3495)
+++ gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_port.h 2006-09-07 
23:12:50 UTC (rev 3496)
@@ -31,8 +31,11 @@
 class mb_port
 {
   mb_port_class_sptr   d_port_class;
-  // FIXME add internals...
 
+  // These are only valid if this port is connected
+  mb_mblock_sptr       d_remote_mblock;        // mblock bound to other end 
this port
+  pmt_t                        d_remote_port_name;     // port_name on other 
end of this port
+
 public:
   mb_port(pmt_t port_name,
          const std::string &protocol_class_name,
@@ -41,7 +44,9 @@
 
   ~mb_port();
 
-  mb_port_class_sptr        port_class() const { return d_port_class; }
+  mb_port_class_sptr   port_class() const { return d_port_class; }
+  mb_mblock_sptr       remote_mblock() const { return d_remote_mblock; }
+  pmt_t                        remote_port_name() const { return 
d_remote_port_name; }
 
   // delegations to d_port_class