diff options
| -rw-r--r-- | mpm/python/usrp_mpm/periph_manager/base.py | 6 | ||||
| -rw-r--r-- | mpm/python/usrp_mpm/periph_manager/x4xx.py | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/mpm/python/usrp_mpm/periph_manager/base.py b/mpm/python/usrp_mpm/periph_manager/base.py index ff4a358b3..729952c33 100644 --- a/mpm/python/usrp_mpm/periph_manager/base.py +++ b/mpm/python/usrp_mpm/periph_manager/base.py @@ -659,7 +659,7 @@ class PeriphManagerBase(object): self.dboards.append(db_class(dboard_idx, **dboard_info)) self.log.info("Initialized %d daughterboard(s).", len(self.dboards)) - def _add_public_methods(self, src, prefix="", filter_cb=None): + def _add_public_methods(self, src, prefix="", filter_cb=None, allow_overwrite=False): """ Add public methods (=API) of src to self. To avoid naming conflicts and make relations clear, all added method names are prefixed with 'prefix'. @@ -677,6 +677,8 @@ class PeriphManagerBase(object): :param prefix: method names in dest will be prefixed with prefix :param filter_cb: A callback that returns true if the method should be added. Defaults to always returning True + :param allow_overwrite: If True, then methods from src will overwrite + existing methods on self. Use with care. """ filter_cb = filter_cb or (lambda *args: True) assert callable(filter_cb) @@ -691,7 +693,7 @@ class PeriphManagerBase(object): and filter_cb(name, getattr(src, name)) ]: destname = prefix + name - if hasattr(self, destname): + if hasattr(self, destname) and not allow_overwrite: self.log.warn("Cannot add method {} because it would " "overwrite existing method.".format(destname)) else: diff --git a/mpm/python/usrp_mpm/periph_manager/x4xx.py b/mpm/python/usrp_mpm/periph_manager/x4xx.py index 7479874dc..e72b2e41e 100644 --- a/mpm/python/usrp_mpm/periph_manager/x4xx.py +++ b/mpm/python/usrp_mpm/periph_manager/x4xx.py @@ -484,7 +484,8 @@ class x4xx(ZynqComponents, PeriphManagerBase): self._add_public_methods( self._clk_mgr, prefix="", - filter_cb=lambda name, method: not hasattr(method, '_norpc') + filter_cb=lambda name, method: not hasattr(method, '_norpc'), + allow_overwrite=True ) # Overlay must be applied after clocks have been configured |