diff options
| author | Martin Braun <martin.braun@ettus.com> | 2017-04-27 14:32:24 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2017-12-22 15:03:52 -0800 |
| commit | c0fa47a970856892335aa4316c1540a4a4391d34 (patch) | |
| tree | d035f5eb944b9f102e615265c442fb7426daa996 | |
| parent | af6d2409499da5ffb0da1cb4d3d50293774937e8 (diff) | |
| download | uhd-c0fa47a970856892335aa4316c1540a4a4391d34.tar.gz uhd-c0fa47a970856892335aa4316c1540a4a4391d34.tar.bz2 uhd-c0fa47a970856892335aa4316c1540a4a4391d34.zip | |
n3xx: Moved Mykonos reset to UIO
Note: This requires a new FPGA image, or Mykonos simply won't reset.
| -rw-r--r-- | mpm/python/usrp_mpm/dboard_manager/magnesium.py | 10 | ||||
| -rw-r--r-- | mpm/python/usrp_mpm/nijesdcore.py | 6 |
2 files changed, 7 insertions, 9 deletions
diff --git a/mpm/python/usrp_mpm/dboard_manager/magnesium.py b/mpm/python/usrp_mpm/dboard_manager/magnesium.py index 9d645a354..f6db4885c 100644 --- a/mpm/python/usrp_mpm/dboard_manager/magnesium.py +++ b/mpm/python/usrp_mpm/dboard_manager/magnesium.py @@ -86,7 +86,7 @@ class Magnesium(DboardManagerBase): self.jesdcore.init() self.log.trace("Resetting Mykonos...") - self.reset_mykonos() #not sure who owns the reset + self.jesdcore.reset_mykonos() #not sure who owns the reset self.log.trace("Initializing Mykonos...") self.mykonos.begin_initialization() @@ -112,14 +112,6 @@ class Magnesium(DboardManagerBase): #if (!self.mykonos.get_deframer_status()) # raise Exception('Mykonos Deframer is not synced!') - def reset_mykonos(self): - " Toggle reset line on Mykonos " - # SUPER GHETTO FIXME - import os - os.system('devmem2 0x4001000C w 2') # Active low reset - time.sleep(0.001) - os.system('devmem2 0x4001000C w 10') - def read_eeprom_v1(self, data): """ read eeprom data version 1 diff --git a/mpm/python/usrp_mpm/nijesdcore.py b/mpm/python/usrp_mpm/nijesdcore.py index 60888a5c1..d4c8d40b9 100644 --- a/mpm/python/usrp_mpm/nijesdcore.py +++ b/mpm/python/usrp_mpm/nijesdcore.py @@ -142,3 +142,9 @@ class NIMgJESDCore(object): if rb & 0xF != 0x2: raise Exception("GT PLL failed to lock!") + def reset_mykonos(self): + " Toggle reset line on Mykonos " + self.regs.poke32(0x0008, 0) # Active low reset + time.sleep(0.001) + self.regs.poke32(0x0008, 1) # No longer in reset + |