Revision d9035414 host/include/uhd/usrp/dboard_manager.hpp

b/host/include/uhd/usrp/dboard_manager.hpp
20 20

  
21 21
#include <uhd/config.hpp>
22 22
#include <uhd/property_tree.hpp>
23
#include <uhd/utils/props.hpp>
24 23
#include <uhd/usrp/dboard_base.hpp>
25 24
#include <uhd/usrp/dboard_id.hpp>
26 25
#include <boost/utility.hpp>
27 26
#include <boost/shared_ptr.hpp>
27
#include <string>
28
#include <vector>
28 29

  
29 30
namespace uhd{ namespace usrp{
30 31

  
......
37 38
public:
38 39
    typedef boost::shared_ptr<dboard_manager> sptr;
39 40

  
40
    //! It does what it says...
41
    static void populate_prop_tree_from_subdev(
42
        property_tree::sptr subtree, wax::obj subdev
43
    );
44

  
45 41
    //dboard constructor (each dboard should have a ::make with this signature)
46 42
    typedef dboard_base::sptr(*dboard_ctor_t)(dboard_base::ctor_args_t);
47 43

  
......
57 53
        const dboard_id_t &dboard_id,
58 54
        dboard_ctor_t dboard_ctor,
59 55
        const std::string &name,
60
        const prop_names_t &subdev_names = prop_names_t(1, "0")
56
        const std::vector<std::string> &subdev_names = std::vector<std::string>(1, "0")
61 57
    );
62 58

  
63 59
    /*!
......
74 70
        const dboard_id_t &tx_dboard_id,
75 71
        dboard_ctor_t dboard_ctor,
76 72
        const std::string &name,
77
        const prop_names_t &subdev_names = prop_names_t(1, "0")
73
        const std::vector<std::string> &subdev_names = std::vector<std::string>(1, "0")
78 74
    );
79 75

  
80 76
    /*!
81 77
     * Make a new dboard manager.
82 78
     * \param rx_dboard_id the id of the rx dboard
83 79
     * \param tx_dboard_id the id of the tx dboard
80
     * \param gdboard_id the id of the grand-dboard
84 81
     * \param iface the custom dboard interface
82
     * \param subtree the subtree to load with props
85 83
     * \return an sptr to the new dboard manager
86 84
     */
87 85
    static sptr make(
88 86
        dboard_id_t rx_dboard_id,
89 87
        dboard_id_t tx_dboard_id,
90
        dboard_iface::sptr iface
88
        dboard_id_t gdboard_id,
89
        dboard_iface::sptr iface,
90
        property_tree::sptr subtree
91 91
    );
92

  
93
    //dboard manager interface
94
    virtual prop_names_t get_rx_subdev_names(void) = 0;
95
    virtual prop_names_t get_tx_subdev_names(void) = 0;
96
    virtual wax::obj get_rx_subdev(const std::string &subdev_name) = 0;
97
    virtual wax::obj get_tx_subdev(const std::string &subdev_name) = 0;
98 92
};
99 93

  
100 94
}} //namespace

Also available in: Unified diff