From 92c76e574773e99d1bfb5c3a833217b8644779f4 Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Fri, 15 Jan 2010 15:45:33 -0800
Subject: Dboard base class that is no longer also the xcvr. The xcvr base
 inherits from this (as does rx and tx base).

Added m4 macro to check for compiler flags.
The configure checks flags and headers.

Merged the register subdev static methods into one method
that associates a dboard id with a dboard constructor.
The manager code is responsible for checking this association
and creating the correct subdev instances.
---
 lib/usrp/dboard/base.cpp | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

(limited to 'lib/usrp/dboard/base.cpp')

diff --git a/lib/usrp/dboard/base.cpp b/lib/usrp/dboard/base.cpp
index 4fbe4df8c..d8a6e66c2 100644
--- a/lib/usrp/dboard/base.cpp
+++ b/lib/usrp/dboard/base.cpp
@@ -7,30 +7,40 @@
 using namespace usrp_uhd::usrp::dboard;
 
 /***********************************************************************
- * xcvr dboard base class
+ * base dboard base class
  **********************************************************************/
-xcvr_base::xcvr_base(ctor_args_t const& args)
+base::base(ctor_args_t const& args)
  : _subdev_index(args.get<0>()), _dboard_interface(args.get<1>()){
     /* NOP */
 }
 
-xcvr_base::~xcvr_base(void){
+base::~base(void){
     /* NOP */
 }
 
-size_t xcvr_base::get_subdev_index(void){
+size_t base::get_subdev_index(void){
     return _subdev_index;
 }
 
-interface::sptr xcvr_base::get_interface(void){
+interface::sptr base::get_interface(void){
     return _dboard_interface;
 }
 
+/***********************************************************************
+ * xcvr dboard base class
+ **********************************************************************/
+xcvr_base::xcvr_base(ctor_args_t const& args) : base(args){
+    /* NOP */
+}
+
+xcvr_base::~xcvr_base(void){
+    /* NOP */
+}
+
 /***********************************************************************
  * rx dboard base class
  **********************************************************************/
-rx_base::rx_base(ctor_args_t const& args)
-: xcvr_base(args){
+rx_base::rx_base(ctor_args_t const& args) : base(args){
     /* NOP */
 }
 
@@ -49,8 +59,7 @@ void rx_base::tx_set(const wax::type &, const wax::type &){
 /***********************************************************************
  * tx dboard base class
  **********************************************************************/
-tx_base::tx_base(ctor_args_t const& args)
-: xcvr_base(args){
+tx_base::tx_base(ctor_args_t const& args) : base(args){
     /* NOP */
 }
 
-- 
cgit v1.2.3