From be9465cd025652d75917d187fbf02b1d1490cbf8 Mon Sep 17 00:00:00 2001
From: David Schmenk <dschmenk@gmail.com>
Date: Sat, 21 Apr 2018 19:05:37 -0700
Subject: [PATCH] Try different fixes

---
 src/libsrc/apple/uthernet.pla | 29 +++++++++++++++--------------
 src/libsrc/inet.pla           |  4 +---
 src/samplesrc/tftpd.pla       |  2 +-
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/libsrc/apple/uthernet.pla b/src/libsrc/apple/uthernet.pla
index 9a0c7b8..f16d447 100644
--- a/src/libsrc/apple/uthernet.pla
+++ b/src/libsrc/apple/uthernet.pla
@@ -42,7 +42,7 @@ end
 //
 // Uthernet I/O functions
 //
-asm _pokeiow(val)
+asm _pokeiow(val)#0
     LDA    ESTKL,X
 end
 asm _pokeiowl
@@ -51,13 +51,14 @@ asm _pokeiowl
 end
 asm _pokeiowh
     STA    $C000
+    INX
     RTS
 end
 //
 // PEEK BYTE FROM I/O SPACE
 // _peekio()
 //
-asm _peekio
+asm _peekio#1
     DEX
 end
 asm _peekiol
@@ -71,7 +72,7 @@ end
 // PEEK WORD FROM I/O SPACE
 // _peekiow()
 //
-asm _peekiow
+asm _peekiow#1
     DEX
 end
 asm _peekiowl
@@ -87,7 +88,7 @@ end
 // WRITE FRAME DATA INTO I/O SPACE
 // pokefrm(BUF, LEN)
 //
-asm pokefrm(buf, len)
+asm pokefrm(buf, len)#1
     LDY    #$00
     LDA    ESTKL+1,X
     STA    SRCL
@@ -126,7 +127,7 @@ end
 // READ FRAME DATA FROM I/O SPACE
 // peekfrm(BUF, LEN)
 //
-asm peekfrm(buf, len)
+asm peekfrm(buf, len)#1
     LDY    #$00
     LDA    ESTKL+1,X
     STA    DSTL
@@ -161,32 +162,32 @@ asm _peekfrmh
 EXPSW    INX
     RTS
 end
-def pokeiow(io, data)
+def pokeiow(io, data)#0
     _pokeiowl.1 = io
     _pokeiowh.1 = io+1
-    return _pokeiow(data)
+    _pokeiow(data)
 end
-def peekio(io)
+def peekio(io)#1
     _peekiol.1 = io
     return _peekio()
 end
-def peekiow(io)
+def peekiow(io)#1
     _peekiowl.1 = io
     _peekiowh.1 = io+1
     return _peekiow()
 end
-def pokepreg(reg, data)
+def pokepreg(reg, data)#0
     pokeiow(pregidx, reg)
-    return pokeiow(pregdata, data)
+    pokeiow(pregdata, data)
 end
-def peekpreg(reg)
+def peekpreg(reg)#1
     pokeiow(pregidx, reg)
     return peekiow(pregdata)
 end
 //
 // Set the length of the next packet to send and wait for data space availability
 //
-def pokefrmlen(len)
+def pokefrmlen(len)#1
     pokeiow(txcmd, $C0)
     pokeiow(txlen, len)
     repeat; until peekpreg($0138) & $0100
@@ -195,7 +196,7 @@ end
 //
 // Return the length of awaiting packet, 0 otherwise
 //
-def peekfrmlen
+def peekfrmlen#1
     word len
     len = 0
     if peekiow(isq) & $3F == $04
diff --git a/src/libsrc/inet.pla b/src/libsrc/inet.pla
index 1c10cff..9289351 100644
--- a/src/libsrc/inet.pla
+++ b/src/libsrc/inet.pla
@@ -199,13 +199,11 @@ def iNetResolve(namestr, ipaddr)
 end
 
 def iNetInit
-word retcode
     //
     // Look for net hardware
     //
     while ^driver
-        retcode = cmdsys:modexec(driver)
-        if retcode >= 0
+        if cmdsys:modexec(driver) >= 0
             //
             // Get an IP address
             //
diff --git a/src/samplesrc/tftpd.pla b/src/samplesrc/tftpd.pla
index d539691..d5f7a50 100644
--- a/src/samplesrc/tftpd.pla
+++ b/src/samplesrc/tftpd.pla
@@ -339,7 +339,7 @@ end
 if !iNet:initIP()
     return -1
 fin
-puts("TFTP Daemon Version 0.1\n")
+puts("TFTP Server Version 0.1\n")
 portTFTP = iNet:openUDP(TFTP_PORT, @servUDP, 0)
 //
 // Alloc aligned file/io buffers