From a0079c010814880537ac68280366b2b10ab96fa5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20GIBERT?= <burniouf@users.noreply.github.com>
Date: Mon, 11 Apr 2016 08:40:17 +0200
Subject: [PATCH] UTHERNET2 drivers optimisation/bugfix

---
 A2OSX.BOOT.po           | Bin 143360 -> 143360 bytes
 A2OSX.SRC.po            | Bin 819200 -> 819200 bytes
 DRV/UTHERNET2.DRV.S.txt |  35 ++++++++++++++++++++++++++++++-----
 3 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/A2OSX.BOOT.po b/A2OSX.BOOT.po
index b055443466bc18bb3739e76fc7a45f7a597e47d9..16b0f6302ac168ac1f9da73dde48d52b33c73b88 100644
GIT binary patch
delta 409
zcmXYr&r1SP5Xbjz7FLo{9u~D+8IbZEUF#I3n9-qb;U%bp{S8mZOYta;c$Pk0W3!f8
z(K>i3_bSoBKcIsUc!)IVDrL_f12cSQhWUI4*Uh+YE?${TC$iW4lrimX+3rV#UV!i+
z$o=WePUi=?sMU{leJRinJvFZ;5EV2txdH8+<Uwy$f?pMK3&HOSxr1P{LNrSK$Zu7l
zTEcQiE>6v=z*O4yqwLr<2!foT7Xh@0RQeh~PLwJ)0%%E`Wbo28NE)OAkxn>7*LFD;
zJ;KL|7<Xv)ghNk50<U*T1{9<-i1&0B3Mr_zGEf_BWua~1fH<z!T8(J!Q!}w&Lz`!R
z#&g%;3n`L@wPb|R%MG-=ngA)RpLrfmJyQ759>WbguTfqx|6u4+!i4p7-(`T4IgYb9
z@huHaM(0AvJ)MIj9}@)>arg=ig^<&yK+jUoL4?7Adwhj;jeVX265=PC%v&j3NKqw(
M!sj;8lHWx2e+@IbYXATM

delta 417
zcmXYr&r1S96vuZq3;RJv2`yT=@*=Erc&$^|iWwd17G8on*xxWhUWB2PVl2=+rK7H_
zT6n4TD$!y8fDS_7A=0F)l+CIG@A3G&;q!gCX~j*ec4x7~WMQ$IwwxTy)y4$#f$$;7
z1G;e3`#~ORQ_%577SwaMvBm_V0ke`auy;}cwW9~VbW(-Dw@w}*(ALQlr3zAP8Z^pS
z?#bHhvIZ%Qb`^9#Q364b)AYuVHjzeO{m6;3wU!@w#c2jF{W{5kbSBa%hq!cDi$*SR
zEF;Dp%${(lIY{8$KFLD{sSM)gT!2y*8l5~C<DCL@XSg7a8%C!UF+Q0k^;>72)L;F%
zU*`)coC9An%;@bN+S*Bj6jHC;#Y?vos@S8rW#>J@JLVURQp%Vxa~`A&bu!m+7dO7;
zpv~w?5V_`6NODYykP%0x&|nZby+tr1RTaVv)?Jg^zM*54e?Cq12Q?&!6DD&cg-Tg^
L9YmpreboF1bmYQ!

diff --git a/A2OSX.SRC.po b/A2OSX.SRC.po
index 961634564c37c27407ece823a151b987b5cab141..758e4aa895d0b13dac7f9cb594601f238a030fcf 100644
GIT binary patch
delta 1617
zcmZWp>r)$56h9YPyPE(_vLu91YavXhwYY@XIvqy~A=#9c@XAJ@)qYs=utA#8Bs}7y
z<QAH$pp;T_*;*g<fp0~tK!YFp$<O`^j$i!fKj4gavmp(TnLCp`_xyh6+;e{CWHQc7
z#<`xXteih`lzlK&xlm=8e;U-E9sZsOsMcBDc#}6GdMfC7f}YAv-pH(;)U#)hGJaVG
zYda!K9SmRP0k(sh#$-6;BLC&NI`VIxt2A^LZEmC_Q!*aPdYP>E$*lK4*2}JWx!(Ax
zHitv-_*<rDrxMXr82kEw@gN1vB2vz{{DLI<M0Ws74#DjQlNTvtAsO47PdeuOqI(ed
zvqj<(4=`O6ZaJrVrm<ZT#6Xwekpev~H<-^a|8<QwG2PTd??b}rwp=up26GR&e}}7`
z=|xI#d=KWtDX{b*Wh55H)cr;@g2jOr?3SQm04dQ}Fxwo7;FoY`A})u5ax#V6+o8%&
z0pY6@-~_8gNymcOSUiPgJhI~kOn~NKc$wzl%xO<@R5^ehL`ou_0Lu{RSmDgJVeNIt
z#>L5SEOopkeI1w!6llFj;wxNT<15rXl?3)x^vt89&jNo5xqW?-xHy_jV1GCnPLcN4
zb+(EIncUmvY_^d?F2Dvg7#AwQ=D->ze{OSiQiM|TuW2<tcCkNjWxPM&KMtnLS{nZ0
zz_1`i-v~o>6e;0&f;J)&0mG<v?T$~xQsD&X$BMOY1M?Lk=eXML*dBrtZBQLAqcDx{
zqM+BzRho+_p)yTlk2om#`U2CZp*~3-<v8ns6uoVpKm@y(TJn!ySJOYK1sy60AxouX
zn$lYOIP=<R8fhemOBNc7Pt$${lUNdaJ%V3!c`ktMO)@~ZddpkXI~)Y|ZLMO=H5#{R
zhGYoWh%)3zo-;FD=fH-^L6I@PNF(ysks`-JxU~?V$0c=xaTY1@gp6Bh^*UXW2#4mh
z*J`=CRPhfb)>gU0P3i<tKI09|p)V4lJ){}3S)`=WG9121S~s|-LhqE{1M@D;O8;K5
z>P}$h)!Ho}!AYn>aj7rw7j^s`m=+7--MOL>^tX023(OLQ*WD)T8=U3*a(SxioC14C
z#il{OQlxVNpVR1eB%|_?(k-(}`D_X?Y;yH8cj<rjLrsSV@2M%vSbHXzKBA=ym9+*8
z9~ZVvHYrbPo8c3RHhx-;qM>T<@4-<U|JnXFd`{a?v#SqZJl<5?m&HxBrrH{;U(rbB
zulMhu>=ri!rf;+q?9EQcoT?h&zujM_?~2p*eQ`*C(1x_`M^qTi#ofxb{6v<vbmp1$
za-yC>!GA6i{Gt)mJU|}*px~yfO^y63Dvigy&?#a1_}@@T-UX8rj2oyZgWIZ)6AYV3
zEBgo9H@l^gSJ)qtcwX1km{)1NKG#`kLGZY+-2v6xh%V8b>i;}k`kjnE)a8~96)$A-
Ky0yIikN*KGHt{t8

delta 1681
zcmZuxYf~F#6h1Fy+uZ~-7eWH9wIz&$r7j`14l|C0kZelZK$zWdX=|$?*;tS!kff9_
zTG)bVZL!)Gv#i#;;+3|xDiplX5Bkj+{RxhLz+ceuY~Da3H8bx__C4o3=kh%7nVND>
zO}THU%F8e90{h*w<+By0Umpkk=Y+qX4e7VjR`Ug`ncykIvjtE2lGV)2?{k<A5N+gC
zIGYNO$x6o|U|NX=jy9rRZDXtzK43j)9}dHgcJ=oq&aSR4aphaQM9cb_tbc3Pzb)%$
z7yMk;*1VHXciMhjKn$CoXa_tZF9`v`8&V_}?-jvvkZ8lvu;Q%W=b8}(Z!cIoh?Yu+
zmA?JWE*I|;_l^T|2*axn>z*0KDe*$6gZD|HPLCICN3Q>M&f3ZZ(8JhC_?G6}U_1l1
zE~16wQKjKncj)v;cSwA4Zw4GeqD4kFAvErX>TdP^9A|3~i8dIIWb0!w<vFE2nFvQC
z;Z#~_ZG{SnXan-7!ne4=5mFz_arVg`%xLPxjP4w5z~utAk7&t65~}-)wf2U1pC{zO
zNmd=Doi&UIV{$x=C7lQ67{WM?lRfj1;Yc<zEQgbFR2j%9Vo(J3d4x-+fIUI>tUd7*
zSWgmfASelM4yBTHiYTY#G_WsVQ^OHpU!=ZVIPW_H+XvJet6Xhuq+pL0>~g{Gh^c?9
za(3w@EWmn-vQQisSO#gaVt=Tgmj)+fs2n1ioJb;7u^5<Mre<&AOgt?o!FamRaWmNB
zIweC@iA?~F%}_Z~0$~~b4+NT-B-Ua{=}6;>Pw15b!O(aM)TB2H2TSrxA~0vrzkW>p
zGsih6&(Z>lvdIR5U>T>B7rUs+VAg?%vT=iXtrJLZB&A3~myZ_(kMAhdzCtJB6hx87
zQuwZ5dyn5QAStgRfQ$n_M+eGGVi9#yYD(pH6Gh#%!r2%kyY{?#OXX@Br>PK|^7%SF
z(h)Gv5G|1mD^1u%yGIgW$7^&D3-jF0CR)D-Wk21Q98Bk*pgBt&g0UD<js>$9h?dTT
zVdq74V$twe^z~9ZFqg0*<K+S&ZeV8hvA#igw~G2!HYmG-UB_jGe;O=r<)y!F!VJc%
z>xu{F8iw1is}B|p)raS3rs9-=eOr&sfH7BqbAwf-aO;mx$D7}<G8*F5zN4PJX{hOW
z7yq+2s6-!qkItO736}S9bkP!~!1O`MYC?9I4>8*OQE3#Ws`^+RUE-|bCl62l(@m3S
zKg$CGvw%R3&;LheeMtBhg@yNJap9GHMY7A>Ho6GE&hNPXZxF+_xEVv=aW@NEs&~6)
zbd7=a*281GU3jP87T)|F`sVF-)wX3rHTh2c=Z?WP`F&|%r@kE79|{3WG~khC;uCv$
zFRn>F(>=2BkS_D>l7ebqAsgb)U%A1&N(!pDru(?T^dq4xT%q6WPZYe&`Lmi>G1Tq;
oMThkVJO`y&TyKig1(j<A7jjPbe+Ew6S6%lEx$KHzVa52{zo^#)=Kufz

diff --git a/DRV/UTHERNET2.DRV.S.txt b/DRV/UTHERNET2.DRV.S.txt
index 13a90fd2..879028c5 100644
--- a/DRV/UTHERNET2.DRV.S.txt
+++ b/DRV/UTHERNET2.DRV.S.txt
@@ -46,6 +46,14 @@ W5100.AR.PMAGIC		.EQ $0029
 W5100.AR.UIPR		.EQ $002A
 W5100.AR.UPORT		.EQ $002E
 W5100.AR.S0.MR		.EQ $0400
+W5100.AR.S0.MR.MULTI	.EQ $80
+W5100.AR.S0.MR.MF		.EQ $40
+W5100.AR.S0.MR.NDMC		.EQ $20
+W5100.AR.S0.MR.TCP		.EQ $01
+W5100.AR.S0.MR.UDP		.EQ $02
+W5100.AR.S0.MR.IPRAW	.EQ $03
+W5100.AR.S0.MR.MACRAW	.EQ $04
+W5100.AR.S0.MR.PPPOE	.EQ $05
 W5100.AR.S0.CR		.EQ $0401
 W5100.AR.S0.IR		.EQ $0402
 W5100.AR.S0.SR		.EQ $0403
@@ -204,7 +212,7 @@ OPEN			jsr Reset
 				sta W5100.DR,x		...for Socket0 TX Buffer
 
 				>AR.SELECT S0.MR
-				lda #4					MACRAW
+				lda #W5100.AR.S0.MR.MACRAW+W5100.AR.S0.MR.MF
 				sta W5100.DR,x
 
 				>AR.SELECT SHAR
@@ -283,7 +291,7 @@ GETEVENT.RxOK	>AR.SELECT S0.RX.RD
 				
 				ldx DEVSLOTx8
 
-				ldy #2
+				iny
 				
 .2				inc Counter
 				bne .3
@@ -307,8 +315,7 @@ GETEVENT.RxOK	>AR.SELECT S0.RX.RD
 				adc RXTX.Size+1
 				and /RXTX.MASK
 				ora /RX.BASE
-				pha						save HI
-				
+				pha
 				>AR.SELECT S0.RX.RD
 				pla
 				sta W5100.DR,x			write HI
@@ -318,7 +325,25 @@ GETEVENT.RxOK	>AR.SELECT S0.RX.RD
 				>AR.SELECT S0.CR
 				lda #$40				RECV
 				sta W5100.DR,x
-				clc
+				
+				ldy #S.ETH.DSTMAC
+				lda (ZPTmpPTR),y
+				
+.81				iny
+				and (ZPTmpPTR),y
+				cpy #S.ETH.DSTMAC+5
+				bne .81					if EQ, CS
+
+				inc						$ff = Broadcast ??
+				beq .82
+				clc						not a broadcast
+				
+.82				lda #$00
+				ror
+				ldy #S.EVT.DATAHI
+				sta (pEvent),y		
+				
+*				clc						cleared by ROR
 				rts
 *--------------------------------------
 CLOSE			jsr Reset