diff options
| author | Josh Blum <josh@joshknows.com> | 2010-06-18 17:24:39 -0700 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2010-06-18 17:24:39 -0700 |
| commit | 2d7c3f4cc38627a8f0243b78c3c10adc6f1cda46 (patch) | |
| tree | 906ef314d0a401377a2bde4b83e116710f4194eb /host/include | |
| parent | f58cf8f6dc0b0bae5b7644a03aa30a57e99e595a (diff) | |
| parent | e3058c022e4d71401a073fdaa16a97808977e23b (diff) | |
| download | uhd-2d7c3f4cc38627a8f0243b78c3c10adc6f1cda46.tar.gz uhd-2d7c3f4cc38627a8f0243b78c3c10adc6f1cda46.tar.bz2 uhd-2d7c3f4cc38627a8f0243b78c3c10adc6f1cda46.zip | |
Merge branch 'burn_dbid' into pre_merge
Diffstat (limited to 'host/include')
| -rw-r--r-- | host/include/uhd/usrp/dboard_manager.hpp | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/host/include/uhd/usrp/dboard_manager.hpp b/host/include/uhd/usrp/dboard_manager.hpp index b84fee4e7..e5831d4cf 100644 --- a/host/include/uhd/usrp/dboard_manager.hpp +++ b/host/include/uhd/usrp/dboard_manager.hpp @@ -40,7 +40,7 @@ public: typedef dboard_base::sptr(*dboard_ctor_t)(dboard_base::ctor_args_t); /*! - * Register a dboard into the system. + * Register a rx or tx dboard into the system. * For single subdevice boards, omit subdev_names. * \param dboard_id the dboard id (rx or tx) * \param dboard_ctor the dboard constructor function pointer @@ -48,7 +48,24 @@ public: * \param subdev_names the names of the subdevs on this dboard */ static void register_dboard( - dboard_id_t dboard_id, + const dboard_id_t &dboard_id, + dboard_ctor_t dboard_ctor, + const std::string &name, + const prop_names_t &subdev_names = prop_names_t(1, "") + ); + + /*! + * Register an xcvr dboard into the system. + * For single subdevice boards, omit subdev_names. + * \param rx_dboard_id the rx unit dboard id + * \param tx_dboard_id the tx unit dboard id + * \param dboard_ctor the dboard constructor function pointer + * \param name the canonical name for the dboard represented + * \param subdev_names the names of the subdevs on this dboard + */ + static void register_dboard( + const dboard_id_t &rx_dboard_id, + const dboard_id_t &tx_dboard_id, dboard_ctor_t dboard_ctor, const std::string &name, const prop_names_t &subdev_names = prop_names_t(1, "") |