aboutsummaryrefslogtreecommitdiffstats
path: root/mpm
diff options
context:
space:
mode:
authorBrent Stapleton <brent.stapleton@ettus.com>2018-01-18 16:18:09 -0800
committerMartin Braun <martin.braun@ettus.com>2018-01-19 17:10:09 -0800
commitba4d59d7f2f3079369b392c23313ce144d0e280f (patch)
treee86cf1de4425b646046a0e2cf7d2d552de0a8b34 /mpm
parent15e36d8c36685d11fc6b55744ed73078746e100b (diff)
downloaduhd-ba4d59d7f2f3079369b392c23313ce144d0e280f.tar.gz
uhd-ba4d59d7f2f3079369b392c23313ce144d0e280f.tar.bz2
uhd-ba4d59d7f2f3079369b392c23313ce144d0e280f.zip
n310: Update the dboard UIO usage
Updating the UIO usage in the debug functions in magnesium.py. Somehow this didn't get updated before.
Diffstat (limited to 'mpm')
-rw-r--r--mpm/python/usrp_mpm/dboard_manager/magnesium.py47
1 files changed, 22 insertions, 25 deletions
diff --git a/mpm/python/usrp_mpm/dboard_manager/magnesium.py b/mpm/python/usrp_mpm/dboard_manager/magnesium.py
index 5c6047a21..4bca40f7a 100644
--- a/mpm/python/usrp_mpm/dboard_manager/magnesium.py
+++ b/mpm/python/usrp_mpm/dboard_manager/magnesium.py
@@ -1035,38 +1035,35 @@ class Magnesium(DboardManagerBase):
def dump_jesd_core(self):
" Debug method to dump all JESD core regs "
- dboard_ctrl_regs = UIO(
- label="dboard-regs-{}".format(self.slot_idx),
- read_only=False
- )
- for i in range(0x2000, 0x2110, 0x10):
- print(("0x%04X " % i), end=' ')
- for j in range(0, 0x10, 0x4):
- print(("%08X" % dboard_ctrl_regs.peek32(i + j)), end=' ')
- print("")
- dboard_ctrl_regs = None
+ with open_uio(
+ label="dboard-regs-{}".format(self.slot_idx),
+ read_only=False
+ ) as dboard_ctrl_regs:
+ for i in range(0x2000, 0x2110, 0x10):
+ print(("0x%04X " % i), end=' ')
+ for j in range(0, 0x10, 0x4):
+ print(("%08X" % dboard_ctrl_regs.peek32(i + j)), end=' ')
+ print("")
def dbcore_peek(self, addr):
"""
Debug for accessing the DB Core registers via the RPC shell.
"""
- dboard_ctrl_regs = UIO(
- label="dboard-regs-{}".format(self.slot_idx),
- read_only=False
- )
- rd_data = dboard_ctrl_regs.peek32(addr)
- self.log.trace("DB Core Register 0x{:04X} response: 0x{:08X}".format(addr, rd_data))
- dboard_ctrl_regs = None
- return rd_data
+ with open_uio(
+ label="dboard-regs-{}".format(self.slot_idx),
+ read_only=False
+ ) as dboard_ctrl_regs:
+ rd_data = dboard_ctrl_regs.peek32(addr)
+ self.log.trace("DB Core Register 0x{:04X} response: 0x{:08X}".format(addr, rd_data))
+ return rd_data
def dbcore_poke(self, addr, data):
"""
Debug for accessing the DB Core registers via the RPC shell.
"""
- dboard_ctrl_regs = UIO(
- label="dboard-regs-{}".format(self.slot_idx),
- read_only=False
- )
- self.log.trace("Writing DB Core Register 0x{:04X} with 0x{:08X}...".format(addr, data))
- dboard_ctrl_regs.poke32(addr, data)
- dboard_ctrl_regs = None
+ with open_uio(
+ label="dboard-regs-{}".format(self.slot_idx),
+ read_only=False
+ ) as dboard_ctrl_regs:
+ self.log.trace("Writing DB Core Register 0x{:04X} with 0x{:08X}...".format(addr, data))
+ dboard_ctrl_regs.poke32(addr, data)