From f6cdf228ed60e540a36f97a2fc6f4f5fa9c1838d Mon Sep 17 00:00:00 2001 From: burniouf Date: Thu, 15 Jun 2023 19:15:36 +0200 Subject: [PATCH] IPCONFIG:retry fix --- .Floppies/A2OSX.BUILD.po | Bin 33553920 -> 33553920 bytes BIN/IPCONFIG.S.DHCP.txt | 32 ++++++++++++++++---------------- BIN/IPCONFIG.S.txt | 4 ++-- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index 015771097f4e41293d91124eb53077cb1020b35b..e23463c55cc8f99274e7c150bd0e4a5cb155ceda 100644 GIT binary patch delta 6200 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 Q2k9#5PvLE3Kf%lPA2j!Y@c;k- diff --git a/BIN/IPCONFIG.S.DHCP.txt b/BIN/IPCONFIG.S.DHCP.txt index 61ec7859..00693fcf 100644 --- a/BIN/IPCONFIG.S.DHCP.txt +++ b/BIN/IPCONFIG.S.DHCP.txt @@ -1,9 +1,14 @@ NEW AUTO 3,1 *-------------------------------------- +DHCP.INIT.OK >LDYA L.MSG.DHCP.NA + >SYSCALL PutS + sec + rts + DHCP.INIT lda IPCFG+S.NETCFG.STATUS and #S.IPCFG.STATUS.OK - bne .99 Already Configured, exit + bne DHCP.INIT.OK Already Configured, exit ldx #3 @@ -21,25 +26,12 @@ DHCP.INIT lda IPCFG+S.NETCFG.STATUS dex bpl .2 - clc - rts - -.99 >LDYA L.MSG.DHCP.NA - - >SYSCALL PutS - sec - rts -*-------------------------------------- -DHCP.RUN stz IPCFG+S.NETCFG.STATUS - >PUSHBI S.SOCKET.T.DGRAM >PUSHBI 0 no protocol >LIBCALL hLIBTCPIP,LIBTCPIP.Socket - bcc .1 + bcs .9 -.9 jmp DHCP.RUN.KO - -.1 sta hSocket + sta hSocket >PUSHA >PUSHW L.SA.LOCAL >LIBCALL hLIBTCPIP,LIBTCPIP.Bind @@ -58,6 +50,12 @@ DHCP.RUN stz IPCFG+S.NETCFG.STATUS >LDYA L.MSG.DHCP.CFG1 >SYSCALL PutS + + rts + +.9 jmp DHCP.RUN.KO +*-------------------------------------- +DHCP.RUN stz IPCFG+S.NETCFG.STATUS >SLEEP @@ -253,6 +251,7 @@ CheckDHCPOffer jsr CheckDHCPXID php lda hFrame >SYSCALL FreeMem + stz hFrame plp rts *-------------------------------------- @@ -343,6 +342,7 @@ CheckDHCPAck jsr CheckDHCPXID php lda hFrame >SYSCALL FreeMem + stz hFrame plp rts *-------------------------------------- diff --git a/BIN/IPCONFIG.S.txt b/BIN/IPCONFIG.S.txt index 6f42eabe..6b0bdfdb 100644 --- a/BIN/IPCONFIG.S.txt +++ b/BIN/IPCONFIG.S.txt @@ -200,7 +200,7 @@ CS.RUN.SETUP jsr ETC.ReadFiles .6 lda bDHCP - bpl .8 + bpl .80 jsr DHCP.INIT bcs CS.RUN.SETUP.RTS @@ -222,7 +222,7 @@ CS.RUN.SETUP .8 jsr DHCP.QUIT - lda #0 +.80 lda #0 sec CS.RUN.SETUP.RTS