From d0245cd8cd7a1f1d47d47f43346ee3c0c630285c Mon Sep 17 00:00:00 2001
From: Shepard Siegel <shepard.siegel@atomicrules.com>
Date: Sat, 25 Aug 2012 12:07:16 -0400
Subject: [PATCH] dumb mistake on dbgRcvCP.py fixed

---
 bin/dbgRcvCP.py  |  10 +++++++---
 bin/ocpihdl.py   |   6 ++++--
 bin/ocpihdl.pyc  | Bin 5184 -> 5259 bytes
 bin/timeData.raw |  22 ----------------------
 4 files changed, 11 insertions(+), 27 deletions(-)

diff --git a/bin/dbgRcvCP.py b/bin/dbgRcvCP.py
index 1d6784df..ea1c649f 100755
--- 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
index ef7892d6..c414e687 100755
--- 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
index 2e6af99a5afa6c06360b6516489023aefd866f47..3f98b22a2cc269d7cc2df47d7dc5aaf6ce9f9b22 100644
GIT binary patch
delta 430
zcmXYtzfZzY5XbLYpe?riXa~@VM3I8Oa8bjc37E)aw3skyf)=9~m9$MTrnoRVnfDJk
z8aKn>WWwg3;6LE*;OL-tVBWjW``)|Uy}LKE?~983ZN#OojThxfPs9K~CaaP8J@KY5
z?}ie%GHkk0sP<(D07BX_3?%4B!Hq$H5F!i^GOhxdK!Pwb@zjYI9eX=<7ocHlB4K2=
z&Od*tyh?90uf2=5SIPPOaIV>KNGdFI%^GQ&dvP>IoRKEjF>zqnYQUl1i6<UY>)8lt
zujhMpI(?l0n4py$z8klQ4N*;&^3Qbp-#v9K!9WI@=jM(FaK{5|A9lq<vV(i#hd3ur
zQ-xHXvYdHFfnkf0SrH#8bLNO#-y{H<XknbpL>(7U9by_K><HPa$Cfy0MeJK^<yn?R
pMv1XX2)OTVD>w`IFOFM&`>J)>cFG)I6t7ljM71eex@JvN?LTFxO-=v+

delta 364
zcmeCyJfOkO{F#^Q&~x*R>??TqSQ!`?n1R?Ch>LwD@8!|UOkrgxVPvRbWN2n&5Km!a
z5HDe3s9^!~+&xkl7=ks}fr|Yy8G&RbKZp<j5fA<YP2d2s!t;x=Q;Vz=irIi1h4A1Y
zD+LXZ6+xUJf(t|l0tpS)$rE@rCLiFn=kWw`!CDy@`8M<ORWULKP442?Qe6oYFJWM)
z0V1G-m>8Ow8ETmsDr!OQO98vjB{qNZP5!LOE&^GM%9Ga%s0*lo%vS{wY9K;=ass#I
zWO+ehiC7@F801n0Mj=LFMlK*0V&q{o+Uz69$i$d2*-zMmO$Ve!Z}J>rGXo_MQv*b3
wf(Qd3QNjWw3KB~)N<iLBN-R#zOUz9T(g(?FPi7LS;br6G<m3iIVM(CL070lgS^xk5

diff --git a/bin/timeData.raw b/bin/timeData.raw
index 363e1225..e69de29b 100644
--- 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>