From 7962934a3fcaf1ffd9d6adffe2ede7ff224bc6ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20GIBERT?= <burniouf@users.noreply.github.com>
Date: Tue, 5 Apr 2016 17:46:11 +0200
Subject: [PATCH] UTHERNETII:Debugging session #3

---
 DRV/UTHER2.AI.DRV.S.txt | 30 ++++++++++--------------------
 DRV/UTHERNET2.DRV.S.txt | 13 +++++--------
 2 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/DRV/UTHER2.AI.DRV.S.txt b/DRV/UTHER2.AI.DRV.S.txt
index d1c4893f..55b1c674 100644
--- a/DRV/UTHER2.AI.DRV.S.txt
+++ b/DRV/UTHER2.AI.DRV.S.txt
@@ -64,8 +64,8 @@ W5100.AR.S0.RX.RSR	.EQ $0426
 W5100.AR.S0.RX.RD	.EQ $0428
 W5100.DR		.EQ	$C087
 *--------------------------------------
-RX.BASE				.EQ $4000
-TX.BASE				.EQ $6000
+TX.BASE				.EQ $4000
+RX.BASE				.EQ $6000
 RXTX.MASK			.EQ $1FFF
 *--------------------------------------
 *			File Header (16 Bytes)
@@ -235,28 +235,19 @@ GETEVENT.RxOK	>AR.SELECT S0.RX.RD
 				lda W5100.DR,x
 				sta RX.IP+3
 				
-				lda W5100.DR,x		get RX.Size HI
-				sta RXTX.Size+1
-				tay
+				ldy W5100.DR,x		get RX.Size HI
+				sty RXTX.Size+1
 				lda W5100.DR,x		get RX.Size LO
 				sta RXTX.Size
 				
 				clc
-				adc #S.IP-2
-				sta FRAMELEN
+				adc #S.IP
 				pha
 				tya
-				adc /S.IP-2
-				sta FRAMELEN+1
+				adc /S.IP
 				ply
-				iny
-				bne .10
-				inc 
-.10				iny
-				bne .11
-				inc
-				
-.11				>PUSHYA
+
+				>PUSHYA
 				>PUSHBI 0
 				>SYSCALL SYS.GetMem
 				bcs GETEVENT.Err
@@ -265,11 +256,11 @@ GETEVENT.RxOK	>AR.SELECT S0.RX.RD
 				ldy #S.EVT.DATALO
 				sta (pEvent),y
 				
-				lda FRAMELEN
+				lda RXTX.Size
 				sta (ZPTmpPTR)
 				
 				ldy #1
-				lda FRAMELEN+1
+				lda RXTX.Size+1
 				sta (ZPTmpPTR),y
 				
 				lda #S.EVT.F.NET+S.EVT.F.hMEM1
@@ -499,7 +490,6 @@ Reset			ldx DEVSLOTx0
 *--------------------------------------
 DRV.CS.END
 DEVSLOTx0		.BS 1
-FRAMELEN		.BS 2
 RX.IP			.BS 4
 RXTX.Size		.BS 2
 Counter			.BS 2
diff --git a/DRV/UTHERNET2.DRV.S.txt b/DRV/UTHERNET2.DRV.S.txt
index b53bc919..418a2129 100644
--- a/DRV/UTHERNET2.DRV.S.txt
+++ b/DRV/UTHERNET2.DRV.S.txt
@@ -64,8 +64,8 @@ W5100.AR.S0.RX.RSR	.EQ $0426
 W5100.AR.S0.RX.RD	.EQ $0428
 W5100.DR		.EQ	$C087
 *--------------------------------------
-RX.BASE				.EQ $4000
-TX.BASE				.EQ $6000
+TX.BASE				.EQ $4000
+RX.BASE				.EQ $6000
 RXTX.MASK			.EQ $1FFF
 *--------------------------------------
 *			File Header (16 Bytes)
@@ -207,7 +207,7 @@ OPEN			jsr Reset
 				lda #4					MACRAW
 				sta W5100.DR,x
 
-				>AR.SELECT SHAR			Implicit, next to SUBR
+				>AR.SELECT SHAR
 				
 				ldy	#0
 .1				lda MAC,y
@@ -245,11 +245,8 @@ GETEVENT.RxOK	>AR.SELECT S0.RX.RD
 				
 				lda W5100.DR,x		get RX.Size HI
 				sta RXTX.Size+1
-				pha
-				lda W5100.DR,x		get RX.Size LO
-				sta RXTX.Size
-				tay
-				pla
+				ldy W5100.DR,x		get RX.Size LO
+				sty RXTX.Size
 				
 				iny
 				bne .10