diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index 4ef92598..d68d4c03 100644 Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ diff --git a/BIN/ETCONFIG.S.txt b/BIN/ETCONFIG.S.txt index c3b3bd6a..acd77a09 100644 --- a/BIN/ETCONFIG.S.txt +++ b/BIN/ETCONFIG.S.txt @@ -25,6 +25,10 @@ pETKCFG .BS 2 ZPFrameBase .BS 2 ZPFramePtr .BS 2 BufPtr .BS 2 + +ProbeCnt .BS 1 +TimeOut .BS 1 +hFrame .BS 1 ZS.END .ED *-------------------------------------- * File Header (16 Bytes) @@ -70,7 +74,7 @@ L.MSG.CFG.OK .DA MSG.CFG.OK L.HOSTNAME .DA HOSTNAME L.CFG.DefaultHost .DA CFG.DefaultHost L.ETKCFG .DA ETKCFG -L.ETKCFG.OBJECT .DA ETKCFG+S.ETKCFG.OBJECT+1 +L.ETKCFG.OBJECT .DA ETKCFG+S.ETKCFG.OBJECT L.IOCTL .DA IOCTL *-------------------------------------- L.MSG.PROBE .DA MSG.PROBE @@ -270,11 +274,11 @@ CS.RUN.PROBE >LDYA L.MSG.PROBE dex bpl .20 - lda A2osX.RANDOM16 + lda #$FF sta AARP.PRB.SPA+2 sta AARP.PRB.TPA+2 - lda A2osX.RANDOM16+1 + lda #$FE sta AARP.PRB.SPA+1 sta AARP.PRB.TPA+1 @@ -292,7 +296,7 @@ CS.RUN.PROBE >LDYA L.MSG.PROBE sta AARP.PRB.TPA+3 lda #PROBE.MAX - >STA.G PROBE.CNT + sta ProbeCnt .3 >LDYA L.AARP.PRB >STYA IOCTL+S.IOCTL.BUFPTR @@ -305,7 +309,7 @@ CS.RUN.PROBE >LDYA L.MSG.PROBE >SYSCALL IOCTL >SLEEP - >DEC.G PROBE.CNT + dec ProbeCnt bne .3 lda AARP.PRB.SPA+2 @@ -335,8 +339,34 @@ CS.RUN.GETNETINFO >PUSHW L.IOCTL >SYSCALL IOCTL + lda #TIMEOUT.MAX + sta TimeOut + +.1 >SLEEP + + dec TimeOut + beq .9 + + >PUSHW ETKCFG+S.NETCFG.DevID + >PUSHBI IOCTL.READ + >PUSHW L.IOCTL + >SYSCALL IOCTL + bcs .1 + + sta hFrame + >SYSCALL GetMemPtr + >STYA ZPFrameBase + + + + lda hFrame + >SYSCALL FreeMem + >LDYA L.MSG.PROBE.OK >SYSCALL PutS + rts + +.9 sec CS.RUN.GETNETINFO.RTS rts *-------------------------------------- @@ -443,7 +473,9 @@ CFG.Read.Close php CFG.Read.Close2 lda CFG.hCfgFile beq .8 + >SYSCALL FClose + .8 pla plp rts @@ -456,10 +488,12 @@ CFG.Read.GetS >PUSHWI 255 *-------------------------------------- CS.DOEVENT lda (pEvent) bpl .9 is it a TIMER event? - >LDA.G TimeOut + + lda TimeOut beq .9 - dec - sta (pData),y + + dec TimeOut + .9 sec do not discard TIMER event rts *-------------------------------------- @@ -469,15 +503,6 @@ CS.QUIT lda hLIBETALK .8 clc rts *-------------------------------------- -Init.Timeout ldy #TimeOut - lda #TIMEOUT.MAX - sta (pData),y - rts -*-------------------------------------- -Wait.TimeOut ldy #TimeOut - lda (pData),y - rts -*-------------------------------------- CS.END LIBETALK .AZ "libetalk" hLIBETALK .BS 1 @@ -575,8 +600,6 @@ IOCTL .BS S.IOCTL DS.START DIB .BS S.DIB DCB.NIC .BS S.DCB.NIC -PROBE.CNT .BS 1 -TimeOut .BS 1 DS.END .ED *-------------------------------------- MAN diff --git a/SYS/KERNEL.S.txt b/SYS/KERNEL.S.txt index dc3003f0..86ab3050 100644 --- a/SYS/KERNEL.S.txt +++ b/SYS/KERNEL.S.txt @@ -120,7 +120,6 @@ A2osX.E0.B .PH $E000 .INB usr/src/sys/kernel.s.slist .INB usr/src/sys/kernel.s.mem -* go to A2osX.D1 DevMgr.Timer .BS 1 DevMgr.Stat .DA DevMgr.FreeMem