diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index 82614921..cd869466 100644 Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ diff --git a/.Floppies/A2OSX.SRC.po b/.Floppies/A2OSX.SRC.po index a8f478df..fcb32f1d 100644 Binary files a/.Floppies/A2OSX.SRC.po and b/.Floppies/A2OSX.SRC.po differ diff --git a/BIN/DNSINFO.S.txt b/BIN/DNSINFO.S.txt index a2f06990..75979f49 100644 --- a/BIN/DNSINFO.S.txt +++ b/BIN/DNSINFO.S.txt @@ -145,7 +145,7 @@ CS.END LIBTCPIP >CSTR "libtcpip.o" SSCANF.IP >CSTR "%d.%d.%d.%d" MSG0 >CSTR "STS TR.ID Hostname IP Address TTL\r\n" -MSG1 >CSTR "$%h $%H %32s %03d.%03d.%03d.%03d %L\r\n" +MSG1 >CSTR "$%h $%H %32s %03d.%03d.%03d.%03d %u\r\n" hLIBTCPIP .BS 1 IP .BS 4 diff --git a/DRV/X.NET.DRV.S.txt b/DRV/X.NET.DRV.S.txt index 781ce7c2..7d0ee07b 100644 --- a/DRV/X.NET.DRV.S.txt +++ b/DRV/X.NET.DRV.S.txt @@ -53,7 +53,7 @@ Asc2NibbleA cmp #'0' bcs .99 sbc #$36 -* clc + clc rts .9 sec @@ -61,3 +61,5 @@ Asc2NibbleA cmp #'0' *-------------------------------------- MAN SAVE /A2OSX.SRC/DRV/X.NET.DRV.S +LOAD /A2OSX.SRC/DRV/UTHERNET.DRV.S +ASM diff --git a/LIB/LIBTCPIP.S.DNS.txt b/LIB/LIBTCPIP.S.DNS.txt index fc823e2d..ef1c3da7 100644 --- a/LIB/LIBTCPIP.S.DNS.txt +++ b/LIB/LIBTCPIP.S.DNS.txt @@ -198,6 +198,7 @@ DNS.FIND.BY.NAME >SYSCALL GetMemPtr.A >PUSHYA >PUSHW ZPPtrDNS + >SYSCALL StrICmp bcc .8 @@ -496,6 +497,7 @@ DNS.CSTR2DNS lda (ZPPtrDNS) sta DNS.HostName+1,y ldx #0 + dey .1 lda (ZPPtrDNS),y and #$7f @@ -514,9 +516,10 @@ DNS.CSTR2DNS lda (ZPPtrDNS) .2 txa ldx #0 -.3 sta DNS.HostName,y +.3 sta DNS.HostName+1,y dey - bne .1 + bpl .1 + stx DNS.HostName clc diff --git a/SYS/KERNEL.S.BIN.txt b/SYS/KERNEL.S.BIN.txt index 9f986f67..3c320991 100644 --- a/SYS/KERNEL.S.BIN.txt +++ b/SYS/KERNEL.S.BIN.txt @@ -1,8 +1,6 @@ -PR#3 +NEW PREFIX /A2OSX.BUILD -LOMEM $A00 -INC 1 -AUTO 6 +AUTO 4,1 *-------------------------------------- * K.LoadLib.YA * in : @@ -10,10 +8,10 @@ AUTO 6 * out : * A = hMem To loaded LIB *-------------------------------------- -K.LoadLib.YA jsr BIN.FindLIB +K.LoadLib.YA jsr BIN.FindLIB.YA bcs .9 - jsr BIN.Load.YA Y,A=filename full path + jsr BIN.Load.YA Y,A = "/PATH/BIN" bcs .9 stx .8+1 @@ -73,29 +71,30 @@ K.UnloadLib.A pha * out : * none *-------------------------------------- -K.LoadDrv.YA jsr BIN.FindDRV +K.LoadDrv.YA >STYA .2+1 Save "BIN\0ARGS\0\0" + + jsr BIN.FindDRV.YA bcs .9 - jsr BIN.Load.YA Y,A =filename full path + jsr BIN.Load.YA Y,A = "/PATH/BIN" bcs .9 >STYA pDrv stx .97+1 - >LDYA BIN.CmdLine - >STYA ZPPtr1 - -.1 lda (ZPPtr1) Advance to ARG[1] - pha - inc ZPPtr1 - bne .2 - inc ZPPtr1+1 - -.2 pla + ldx #$ff + +.1 inx Skip "BIN" +.2 lda $ffff,x bne .1 - >LDYA ZPPtr1 - + txa + sec + adc .2+1 + tay + lda #0 + adc .2+2 + jsr .88 call Dev.Detect bcs .96 @@ -118,9 +117,10 @@ K.LoadDrv.YA jsr BIN.FindDRV .88 jmp (pDrv) *-------------------------------------- -BIN.FindLIB clc +BIN.FindLIB.YA clc .HS B0 bcs -BIN.FindDRV sec +BIN.FindDRV.YA sec + >STYA BIN.CmdLine >LDYAI BIN.Find.ENV.LIB @@ -129,12 +129,14 @@ BIN.FindDRV sec .1 jsr K.GetEnv.YA get value for Search Path bcs .9 + >PUSHYA >PUSHW BIN.CmdLine jsr K.FileSearch.I find LIB/DRV in Search bcs .9 + >LDYAI K.Buf256 - + clc .9 rts */-------------------------------------- * # FileSearch @@ -181,7 +183,7 @@ K.FileSearch.I >PULLW .4+1 Filename stz .1+1 -.1 ldy #$ff Self Modified Index in Search list string +.1 ldy #$0 Self Modified Index in Search list string ldx #$0 @@ -201,16 +203,14 @@ K.FileSearch.I >PULLW .4+1 Filename ldy #$0 -.4 lda $ffff,y Self Modified, Append Fiename... +.4 lda $ffff,y Self Modified, Append Filename... sta K.Buf256,x beq .5 iny inx bra .4 -.5 stz K.Buf256+1,x set string ending 0 - - >PUSHWI K.S.STAT +.5 >PUSHWI K.S.STAT >PUSHWI K.Buf256 >SYSCALL STAT -> BNK1 bcs .1 Failed...retry next path... @@ -235,7 +235,7 @@ BIN.Find.ENV.LIB >CSTR "LIB" *-------------------------------------- * BIN.Load.YA * in : -* A = hMem of FilePath (PSTR) +* Y,A = /BIN/PATH (CSTR) * out : * Y,A = MEMPTR * X = hMem of Code Segment @@ -360,9 +360,7 @@ BIN.Load.YA.1 >PUSHWI K.S.STAT lda BIN.hMem tax return hMEM to Caller... - jsr K.GetMemPtr.A - clc ...and Y,A=PTR to CS - rts + jmp K.GetMemPtr.A ...and Y,A=PTR to CS .98 pha lda BIN.hMem diff --git a/SYS/KERNEL.S.STRING.txt b/SYS/KERNEL.S.STRING.txt index 1a29618b..3bd6f97a 100644 --- a/SYS/KERNEL.S.STRING.txt +++ b/SYS/KERNEL.S.STRING.txt @@ -205,7 +205,7 @@ K.StrICmp clc .1 lda (ZPPtr1),y beq .7 jsr K.StrICmp.toUpper - sta .2 + sta .2+1 lda (ZPPtr2),y beq .9