dumb mistake on dbgRcvCP.py fixed

ShepardSiegel · Aug 25, 2012 · d0245cd · d0245cd
1 parent 704c4d0
commit d0245cd
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 27 deletions.
diff --git a/bin/dbgRcvCP.py b/bin/dbgRcvCP.py
@@ -28,7 +28,7 @@ def main(argv):
     gbeWrkNum = 9   # GBE
     dp0WrkNum = 13  # dgdp dp0
 
-    workerList = [5,6,9,13]
+    workerList = [5,6,7,9,10,13]
 
     print 'Reset cycling each worker...'
     for w in workerList:
@@ -40,11 +40,15 @@ def main(argv):
     testAdminReg(dev0, 0x20)
     testAdminReg(dev0, 0x24)
 
+    print 'Probing Worker Control Status ahead of init...'
+    for w in workerList:
+      rwsr(dev0, w)
+
     print 'Initializing each worker...'
     for w in workerList:
-      wwctl(dev0, w, 'initialize')
+      wop(dev0, w, 'initialize')
 
-    print 'Probing Worker Control Status...'
+    print 'Probing Worker Control Status after init...'
     for w in workerList:
       rwsr(dev0, w)
 

diff --git a/bin/ocpihdl.py b/bin/ocpihdl.py
@@ -69,12 +69,13 @@ def wwctl(device, workerNum, wdata):
   cmdout = subprocess.check_output(cmd, stderr=subprocess.STDOUT)
   #return(int(cmdout, 0))
 
-
 def rwsr(device, workerNum):
   wpone = (workerNum + 1) & 0xF
   addr = (wpone<<16) | 0xFFE0
   wsr = radmin(device, addr)
-  print 'Worker: ' + str(workerNum) + ' WSR: ' + hex(wsr)
+  addr = (wpone<<16) | 0xFFE4
+  wcr = radmin(device, addr)
+  print 'Worker: ' + str(workerNum) + ' WSR: ' + hex(wsr) + '  WCR: ' + hex(wcr)
 
 
 # Functions that build off of primitives above...
@@ -98,6 +99,7 @@ def testScratchReg(device, workerNum, offset):
     gval = wread(device, workerNum, offset)
     if (tval != gval):
       print 'Mismatch worker: ' + str(workerNum) + ' Expected: ' + hex(tval) + ' Got: ' + hex(gval)
+      break
   wwrite(device, workerNum, offset, origValue)
 
 

diff --git a/bin/ocpihdl.pyc b/bin/ocpihdl.pyc
diff --git a/bin/timeData.raw b/bin/timeData.raw
@@ -1,22 +0,0 @@
-<EventData>
-  <Descriptors>
-  </Descriptors>
-  <Owners>
-    <Owner id="0" name="Transport::1" parent="-1"/>
-    <Owner id="1" name="Circuit::1" parent="0"/>
-    <Owner id="2" name="PortSet::1" parent="1"/>
-    <Owner id="3" name="Port::1" parent="2"/>
-    <Owner id="4" name="PortSet::2" parent="1"/>
-    <Owner id="5" name="Port::2" parent="4"/>
-    <Owner id="6" name="Buffer::1" parent="5"/>
-    <Owner id="7" name="Buffer::2" parent="5"/>
-    <Owner id="8" name="Buffer::3" parent="5"/>
-    <Owner id="9" name="Buffer::4" parent="5"/>
-    <Owner id="10" name="Buffer::5" parent="5"/>
-    <Owner id="11" name="Buffer::6" parent="5"/>
-    <Owner id="12" name="Buffer::7" parent="5"/>
-    <Owner id="13" name="Buffer::8" parent="5"/>
-    <Owner id="14" name="Buffer::9" parent="5"/>
-    <Owner id="15" name="Buffer::10" parent="5"/>
-  </Owners>
-</EventData>