core960 ml605 sanity test rebuild, all OCCP workers on

ShepardSiegel · Sep 21, 2012 · 985b915 · 985b915
1 parent bf17978
commit 985b915
Show file tree

Hide file tree

Showing 124 changed files with 17,438 additions and 7,751 deletions.
diff --git a/bin/dmaTestBasic b/bin/dmaTestBasic
diff --git a/bin/dmaTestBasic-hunan3 b/bin/dmaTestBasic-hunan3
diff --git a/bin/dmaTestBasic4 b/bin/dmaTestBasic4
diff --git a/bin/dmaTestBasic4a b/bin/dmaTestBasic4a
diff --git a/bin/dmaTestBasic923 b/bin/dmaTestBasic923
diff --git a/bin/dmaTestBasic924 b/bin/dmaTestBasic924
diff --git a/bin/dmaTestBasic963 b/bin/dmaTestBasic963
diff --git a/bin/dmaTestBasic963a b/bin/dmaTestBasic963a
diff --git a/bin/dmaTestBasic964 b/bin/dmaTestBasic964
diff --git a/bin/dmaTestBasic980 b/bin/dmaTestBasic980
diff --git a/bin/dmaTestBasic984 b/bin/dmaTestBasic984
diff --git a/bin/dmaTestBasic985 b/bin/dmaTestBasic985
diff --git a/bin/dmaTestMostBasic b/bin/dmaTestMostBasic
diff --git a/bin/swctl b/bin/swctl
diff --git a/bin/test6d3 b/bin/test6d3
diff --git a/bin/testAXIS1 b/bin/testAXIS1
diff --git a/bin/testBWcommand b/bin/testBWcommand
diff --git a/bin/testBWcommand2 b/bin/testBWcommand2
diff --git a/bin/testBWcommand4 b/bin/testBWcommand4
diff --git a/bin/testBWcommand5 b/bin/testBWcommand5
diff --git a/bin/testBWcommand924 b/bin/testBWcommand924
diff --git a/bin/testBWcommand963 b/bin/testBWcommand963
diff --git a/bin/testBWcommand964 b/bin/testBWcommand964
diff --git a/bin/testBWcommand984 b/bin/testBWcommand984
diff --git a/bin/testBWcommand985 b/bin/testBWcommand985
diff --git a/bin/testBWcommandPIO b/bin/testBWcommandPIO
diff --git a/bin/testDMA b/bin/testDMA
diff --git a/bin/testDMA4 b/bin/testDMA4
diff --git a/bin/testDMAbw b/bin/testDMAbw
diff --git a/bin/testDMAminusp b/bin/testDMAminusp
diff --git a/bin/testRpl b/bin/testRpl
diff --git a/bin/testSeq0 b/bin/testSeq0
diff --git a/bin/testSeq0a b/bin/testSeq0a
diff --git a/bin/testSeq0b b/bin/testSeq0b
diff --git a/bin/testSeq0d b/bin/testSeq0d
diff --git a/bin/testSeq1 b/bin/testSeq1
diff --git a/bin/testSeq10 b/bin/testSeq10
diff --git a/bin/testSeq10a b/bin/testSeq10a
diff --git a/bin/testSeq10b b/bin/testSeq10b
diff --git a/bin/testSeq10c b/bin/testSeq10c
diff --git a/bin/testSeq11 b/bin/testSeq11
diff --git a/bin/testSeq11a b/bin/testSeq11a
diff --git a/bin/testSeq12 b/bin/testSeq12
diff --git a/bin/testSeq13a b/bin/testSeq13a
diff --git a/bin/testSeq13b b/bin/testSeq13b
diff --git a/bin/testSeq14a b/bin/testSeq14a
diff --git a/bin/testSeq14b b/bin/testSeq14b
diff --git a/bin/testSeq14c b/bin/testSeq14c
diff --git a/bin/testSeq15a b/bin/testSeq15a
diff --git a/bin/testSeq2 b/bin/testSeq2
diff --git a/bin/testSeq3 b/bin/testSeq3
diff --git a/bin/testSeq4 b/bin/testSeq4
diff --git a/bin/testSeq5 b/bin/testSeq5
diff --git a/bin/testSeq6 b/bin/testSeq6
diff --git a/bin/testSeq6a b/bin/testSeq6a
diff --git a/bin/testSeq6b b/bin/testSeq6b
diff --git a/bin/testSeq6c b/bin/testSeq6c
diff --git a/bin/testSeq6d b/bin/testSeq6d
diff --git a/bin/testSeq6d-adc40 b/bin/testSeq6d-adc40
diff --git a/bin/testSeq6d1 b/bin/testSeq6d1
diff --git a/bin/testSeq6d2 b/bin/testSeq6d2
diff --git a/bin/testSeq6e b/bin/testSeq6e
diff --git a/bin/testSeq6e-adc40 b/bin/testSeq6e-adc40
diff --git a/bin/testSeq6f b/bin/testSeq6f
diff --git a/bin/testSeq7 b/bin/testSeq7
diff --git a/bin/testSeq7a b/bin/testSeq7a
diff --git a/bin/testSeq8 b/bin/testSeq8
diff --git a/bin/testSeq8a b/bin/testSeq8a
diff --git a/bin/testSeq8a1 b/bin/testSeq8a1
diff --git a/bin/testSeq8a2 b/bin/testSeq8a2
diff --git a/bin/testSeq8b b/bin/testSeq8b
diff --git a/bin/testSeq9 b/bin/testSeq9
diff --git a/bin/testSeq9a b/bin/testSeq9a
diff --git a/bin/testSeq9a1 b/bin/testSeq9a1
diff --git a/bin/testSeq9b b/bin/testSeq9b
diff --git a/bin/testSeq9b1 b/bin/testSeq9b1
diff --git a/bin/testSeq9b2 b/bin/testSeq9b2
diff --git a/bin/testSeq9c b/bin/testSeq9c
diff --git a/bsv/inf/EDPServBC.bsv b/bsv/inf/EDPServBC.bsv
@@ -514,7 +514,7 @@ module mkEDPServBC#(Vector#(4,BRAMServer#(DPBufHWAddr,Bit#(32))) mem, PciId pciD
     if (hasEOP)  ackCount <= 1;    // To replace the 0 default used on the first frame
     if (hasEOP)  doorBell <= True; // To abstract the 0-nm message containing the flow control doorbell write 
     frmAckOK <= hasEOP;  // Blindly take ACK on EOP, assume 1
-    if (hasPull && ptr>1) inProcF.enq(x);  // If receive message, drop frame header; but pass message and data to inProc
+    if (hasPull && igPtr>1) inProcF.enq(x);  // If receive message, drop frame header; but pass message and data to inProc
   endrule
 
   // hasPull Receive...

diff --git a/bsv/inf/OCCP.bsv b/bsv/inf/OCCP.bsv
@@ -120,12 +120,12 @@ module mkOCCP#(PciId pciDevice, Clock time_clk, Reset time_rst) (OCCPIfc#(Nwcit)
 
     //FIXME: Specalized for n210 platform development!
     //return (i<7||i>11) ? mkWciMasterNull : mkWciMaster;  
-    if (i==2 || i==3 || i==4 || i==7 || i==9 || i==10 || i==13 || i==14) return mkWciMaster;   // used for n210 bias loopback
+    //if (i==2 || i==3 || i==4 || i==7 || i==9 || i==10 || i==13 || i==14) return mkWciMaster;   // used for n210 bias loopback
     //if (i==5 || i==6 || i==7 || i==9 || i==10 || i==13) return mkWciMaster;   // used for CP + DP
     //if ( i==7 || i==9 ) return mkWciMaster;   // sls used with 20120908_1121 for emux debug testing
-    else return mkWciMasterNull;
+    //else return mkWciMasterNull;
 
-    //return  mkWciMaster; // all get WCI masters
+    return  mkWciMaster; // all get WCI masters
   endfunction
   Vector#(Nwcit,WciMasterIfc#(20,32)) wci <- genWithM(makeWciMaster);