From 5ad6ebc0c4d5b92e4f5a58bb1f3be060a6b7d297 Mon Sep 17 00:00:00 2001
From: MHeinrichs <matthias_heinrichs@yahoo.com>
Date: Wed, 18 Jan 2017 22:53:10 +0100
Subject: [PATCH] Better functions to InitLAN

---
 Driver/Init/InitLAN   | Bin 7204 -> 7476 bytes
 Driver/Init/InitLAN.c | 148 ++++++++++++++++++++++++++++++------------
 Driver/Init/InitLAN.h |   3 +
 Driver/Init/InitLAN.o | Bin 1484 -> 1796 bytes
 4 files changed, 111 insertions(+), 40 deletions(-)

diff --git a/Driver/Init/InitLAN b/Driver/Init/InitLAN
index 4adf9f86d4ef452227ab655f993e125333111883..4caedc99701fc0cf7be0138e01d045097765dd11 100644
GIT binary patch
delta 842
zcmX|<Ur1AN6vxlqpS!iDj%9OBshcdZwC-F`V_Ysa)Go4Yt+G`hzZ-McWV&%zwq$H;
zJq$v+$%P&xB=99dGNM4jhlr4b9wdCzhoV22nMCxEu5&l*<@`Rs@BN<h`~A*64}DMl
zck8Ma0ALb8{{?_vm~cPl>XR|2kOr#v1wj33L@BTDVg?cPe*#m1DIr}d{rlDy&+E$k
zxg3|&YAT~M-dD#dx6YVWpHR(JHMZsiI5Us|V)m;Ox?MRx?K?u?d6(q&7=$?%JjQaQ
zg}IM;A!P<3ezQXay8qO7u!W0fyJs^5hUXbmaM`@xdrkP%4om`U3=6d~WWf!izZP#v
z0Jn#lE*7NdkPRb$z94m;DM&#A@EF&~xq{S>Jc-_%X3h**Lj{RkC`d7s$1fF7lTT}L
z6!#gPs{t91(mbaJFK5*_&T|Ijoj?fB8IdeN`go2;+5sfUb7mwHkN}T+FY3g{qsNP0
za+t?FFXj_B&to|+mL)Ept3uKNvGH6r5(R{=9Nm5*x7L0<H<E<lGK_1lHfepV9Rqch
z+MBbBU~Ja<GustgI+g)jZiM4pAi`FkzcuTc@AhCfSrF1$SEai`JpVxi!^U>b`z)S>
z?v`*dSwCGI`N_3r9q4v!=f(4H(ESSC)}HPdl;nzk^LM!Tau&c!!SIGw7=Ou%x~8jZ
zcqT%fC!`$c$lH4!<?T`vOS7iH6slg8(eI|#)uZ}Dxs8Z&5R&@oV$8|50#1~5C8D$e
zvKe_%`^p+wyjUq3QrsPkMGCSOO~LDr;rxBou8*_1kF|)fc`u}B>sBG6v;b>B&t>$y
zuBe;N|7s_y(;<b}9NVQFC_K>K7F@RCM9nPee^69pX5Q$t>b|Ya80_=r#*+iX3Hb(-
l6jP~zD0BVF)j?)|lo^oagq%{}x(3xd4QVypz^QcOp1+(b`7!_i

delta 554
zcmdmDwZvkAIBzEd1H&Q)2IiLx3~ZefRo2-^B&11rR4_35?POq(xD(M2rVpgCBr-6)
zaa!)Q+@s?Ef0&$3P6HE|eFIFMn9Rpm!^F}zxrb4Oi6vw5CPp<Mc>%S22AL`b^BO*e
z`gi6vj12X8Ha0>g=5BRjR@!x925cS&^cg&|fh<-qE2q&fk%2YN|2>1i9@n%R<~0lg
zARST+iSs7sF-wRwDgdQ*VA6FA32ccB|BEKiVV0<G1Ui!CA5e<N%Po!Je+g95DX4wl
z9tH+RhTKmz3<(?-Z02nV3?XiNY7&4Vbqqi;0}D1Y;{=9nF6k-;%pg}7uz*RR+nzRf
z6mu|m<TRWBn!N~QZBRQ@?<swDp!h1FcvnC_(DkebeC~7nn0${}TzW<#gSbFIzotWj
zkk^_9p>!pEHhp%d<v>xP$pS2*j29-WvFO%cis;v3C}7^uo+hEM%>Z;f&w+@39R?tq
z1IXS2lGSI`2l+20pkKv7fh%20p9>@cv^FM@f%z23Ir?0Q4F9wu`ZXBzS%Bg$K=Dlh
z{Rsk4bz(q1$k{wT_jx|}mHHKWJZCnt(`S(K3*G#Q<vAl`#pYXV7CcPvK5P~dKE*Nl
Yk96APd(v`~Z^_t9PLipZEG8=l0C_U1_y7O^

diff --git a/Driver/Init/InitLAN.c b/Driver/Init/InitLAN.c
index 7adbb60..ff50f54 100644
--- a/Driver/Init/InitLAN.c
+++ b/Driver/Init/InitLAN.c
@@ -27,18 +27,117 @@ WORD delayShort(){
     return (CHP_TST);
 }
 
+int TestMemory(APTR *BaseAddress){
+        int i;
+        WORD w=0;
+        WORD wTestWriteData, wTestReadData;
 
+        // Generate and write pattern
+        for(w = 0; w < ENC100_RAM_SIZE; w += sizeof(wTestWriteData))
+        {
+                wTestWriteData = w;
+                WRITEREG(BaseAddress, w, w);
+        }
+
+        // Read back and verify random pattern
+				i=0;
+        for(w = 0; w < ENC100_RAM_SIZE; w += sizeof(wTestWriteData))
+        {
+                wTestWriteData = w;
+                wTestReadData = READREG(BaseAddress,w);
+
+                // See if the data matches.  If your application gets stuck here,
+                // it means you have a hardware failure.  Check all of your PSP
+                // address and data lines.
+                if(wTestWriteData != wTestReadData){
+                	printf("Error checking memory at adress %lx! Expected %x - got %x\n",(BaseAddress+w),wTestWriteData,wTestReadData);
+                	++i;
+                }
+        }
+        return i;
+}
+
+int SetClock(APTR *BaseAddress,int Clock){
+	WORD s=0,c=0;
+	
+	switch(Clock){
+		case 0:
+			//disable clock
+			c=(ECON2_COCON3|ECON2_COCON2|ECON2_COCON1|ECON2_COCON0);
+			s=0;
+			break;
+		case 3:
+			//3.125Mhz
+			c=(ECON2_COCON1|ECON2_COCON0);
+			s=(ECON2_COCON3|ECON2_COCON2);
+			break;
+		case 4:
+			//4Mhz
+			c=(ECON2_COCON2);
+			s=(ECON2_COCON3|ECON2_COCON1|ECON2_COCON0);
+			break;
+		case 5:
+			//5Mhz
+			c=(ECON2_COCON2|ECON2_COCON0);
+			s=(ECON2_COCON3|ECON2_COCON1);
+			break;
+		case 6:
+			//6.25Mhz
+			c=(ECON2_COCON2|ECON2_COCON1);
+			s=(ECON2_COCON3|ECON2_COCON0);
+			break;
+		case 8:
+			//8.333Mhz
+			c=(ECON2_COCON3);
+			s=(ECON2_COCON2|ECON2_COCON1|ECON2_COCON0);
+			break;
+		case 10:
+			//10Mhz
+			c=(ECON2_COCON3|ECON2_COCON0);
+			s=(ECON2_COCON2|ECON2_COCON1);
+			break;
+		case 12:
+			//12.5Mhz
+			c=(ECON2_COCON3|ECON2_COCON1);
+			s=(ECON2_COCON2|ECON2_COCON0);
+			break;
+		case 16:
+			//16.667Mhz
+			c=(ECON2_COCON3|ECON2_COCON1|ECON2_COCON0);
+			s=(ECON2_COCON2);
+			break;
+		case 20:
+			//20Mhz
+			c=(ECON2_COCON3|ECON2_COCON2);
+			s=(ECON2_COCON1|ECON2_COCON0);
+			break;
+		case 25:
+			//25Mhz
+			c=(ECON2_COCON3|ECON2_COCON2|ECON2_COCON0);
+			s=(ECON2_COCON1);
+			break;
+		case 33:
+			//33.333Mhz
+			c=(ECON2_COCON3|ECON2_COCON2|ECON2_COCON1);
+			s=(ECON2_COCON0);
+			break;
+		default: 
+			//disable clock
+			c=(ECON2_COCON3|ECON2_COCON2|ECON2_COCON1|ECON2_COCON0);
+			s=0;
+			break;
+	}	
+
+  CLRREG(BaseAddress,ECON2, c);
+  SETREG(BaseAddress,ECON2, s);
+
+	return 0;
+}
 
 int SoftReset(APTR *BaseAddress){
         int i;
         WORD w,v=0;
-        WORD wTestWriteData, wTestReadData;
         // Perform a reset via the PSP interface
-				//set the clock to 33mhz: COCON[3..0] = "0001"
-        CLRREG(BaseAddress,ECON2, (ECON2_COCON3|ECON2_COCON2|ECON2_COCON1));
-        SETREG(BaseAddress,ECON2, ECON2_COCON0);
-				
-
         do
         {
 
@@ -90,40 +189,6 @@ int SoftReset(APTR *BaseAddress){
         for(i=0; i<256; ++i){
         	delayCIA();
         }
-
-
-
-        // If using PSP, verify all address and data lines are working
-				// Parallel direct addressing
-
-        // Initialize RAM contents with a random pattern and read back to verify
-        // This step is critical if using a PSP interface since some functionality
-        // may appear to work while a solder bridge or disconnect will cause
-        // certain memory ranges to fail.
-
-        // Generate and write pattern
-        for(w = 0; w < ENC100_RAM_SIZE; w += sizeof(wTestWriteData))
-        {
-                wTestWriteData = w;
-                WRITEREG(BaseAddress, w, w);
-        }
-
-        // Read back and verify random pattern
-				i=0;
-        for(w = 0; w < ENC100_RAM_SIZE; w += sizeof(wTestWriteData))
-        {
-                wTestWriteData = w;
-                wTestReadData = READREG(BaseAddress,w);
-
-                // See if the data matches.  If your application gets stuck here,
-                // it means you have a hardware failure.  Check all of your PSP
-                // address and data lines.
-                if(wTestWriteData != wTestReadData){
-                	printf("Error checking memory at adress %lx! Expected %x - got %x\n",(BaseAddress+w),wTestWriteData,wTestReadData);
-                	++i;
-                }
-        }
-        printf("Memory passed with %d errors\n",i);
         return v;
 }
 
@@ -178,8 +243,11 @@ main(int argc, char *argv[])
     APTR board = LocateBoard(manufactor,product);
     if(board){
         printf("Found board for manufactor/product %d/%d at address 0x%lx.\n",manufactor,product, board);
+        SetClock(board,33);
         v=SoftReset(board);
         printf("SoftReset returned %X\n",v);
+        v=TestMemory(board);
+        printf("Memory passed with %d errors\n",v);
     }else{
         printf("No board found for manufactor/product %d/%d.\n",manufactor,product);
     }
diff --git a/Driver/Init/InitLAN.h b/Driver/Init/InitLAN.h
index 526a19a..2f942c1 100644
--- a/Driver/Init/InitLAN.h
+++ b/Driver/Init/InitLAN.h
@@ -19,7 +19,10 @@
 
 struct Library *ExpansionBase=NULL;
 unsigned long hex2int(char *a);
+int SetClock(APTR *BaseAddress,int Clock);
 int SoftReset(APTR *BaseAddress);
+int TestMemory(APTR *BaseAddress);
+
 APTR LocateBoard(int manufactor, int product);
 
 /**
diff --git a/Driver/Init/InitLAN.o b/Driver/Init/InitLAN.o
index a3baa2358dbd6ea73ce853f4228887fcde8df798..e09ff43df2addde4e46d24f00e39f5fb5b0115c4 100644
GIT binary patch
delta 890
zcmYk3Ur19?9LIn6?vFO74id8=w8Cs4cy&RET`pv~hOD${W`Ah+=I-X!w!7|@%@~_p
zg+WOwH=^f=o+5mb2nnBh5a~fed<cx9^2tIZe9`(|r_|wo&iS72`JVH;_uR#b@v5m4
z%-Xbjs<PVAs8C&wawL|w>vx%hg?4M(Ns-=kMjBeozIl#XEW5qcH~($amo6t?oN1Pb
zsQV{50>wV>Tu!9Kf~(BGTK?<OJ>QR3aw+6+aa5yHo*HQQ_s6ja(ZkrW>sllfbD$Tl
zYLWB3TEs6By~a3jMT^{mevWLx2<Kw<9xWnX(;{Km6E`$?>Sd!J#yltR)ua+sR^UzK
z;q8Ww3%nV+f<#f^El@TR`vu+#b$~>_z?Vank=P+%?tw413CMVm6`KX@^I*T&AP6|l
zgJVUfz*j=CBsv7X3W_1oS}NUop|IY1wvbGbf0ZVTuP!t0vE~6yFCHn-{`JgthF4DK
z$Wci0yc6zDe|uBjx!`TVWpd=p=AEU>^~GuFzdg%&6hhh^D5eh26qB2LQ@$4I+P!^o
zn%zs=yS!ogqn7g9TY=)cIU+kli4Egm{E^T42j&p-LjTT8p7C=w&cazyY-qojFH1)`
zn?&1BdnS!>M;n-Q6K6)I$H<i2?K=H2>*k3}Tk!0F0ZT-z4G16(UV#<x7R(~+1u-xR
zru0qLbISAtavUT<7h);U0jhA^@)*oucS=tBqqkK_9VwMzXY`vUXMuf>WpnUcTuICS
z*7qWxu*L?Zj1q-`X2RnJ^}vQ#WrGPRikfKb8s?^;Um27#a)%<RA$ZSry<R1p3CL+V
zW8|1GB~Q+v<lvoJ!y{VXHT&dr=AxWX)Diuw=}~=2x>8a)Er(q9qnRPs@sLYaRYgtf
Sar2PgY{}{yW?p}3Y5WUp?&HV+

delta 574
zcmYk0%WD%+6voe;$2HUvf{SQ^SP+S&Dic&XL4u1uLMWk?R9v{3x!Q>arx~5hCNfOK
zmUd@bE{M1g5fT4_u0kmyT@=^Fm97LAr9yF$mGzq;MKAm==X~FJEvLVnT))WPZ;Y<j
zMluDD&ORkGOjGy33>kG><?^ZPW+lqrxD;iJyt-{r^${XHiCk6|L^St{GQH`>S2Ltc
z+>s~oM$Rf{vMl|-9g)oi9r-d;a^1s$Gdxpi&`~h(ChDtOJt9VnhauUi5;s?Dx?Smo
zHk62<6-#{lnoXNi4=xnd_=uvG{5b8$vuZm<RhKr8x7Jq&y}QN<=&xe^)>?eLR{Ngn
z%Pr+JTakOpT5il3GIWEZXy&-t7!venOukh|Z_Yj;Qu}Bg1`K=xzY(4X5qJsWyMKaR
zutTKW0WA<oO}jd-JV)q*yRcsa<g9=(@z|Xu%(vzqJFQyto-h0kG^}CU($(@^wg+3Y
zCS9-X{PPDT`|uP?1YQ#Yo{F>tE`vN~DAuBA;tV|2N3L2m@4g6}2~YS7&^{*Gyw?co
qPTL8R!WW6Q;JBhQ|Im|H^p5<jH{=KXoP5X2GT=Em$u0Sf7ybfmMUc(_