diff --git a/A2OSX.BOOT.po b/A2OSX.BOOT.po index 496c71a0..25d49970 100644 Binary files a/A2OSX.BOOT.po and b/A2OSX.BOOT.po differ diff --git a/A2OSX.SRC.po b/A2OSX.SRC.po index 1b1ece81..46ee1d34 100644 Binary files a/A2OSX.SRC.po and b/A2OSX.SRC.po differ diff --git a/BIN/ARP.S.txt b/BIN/ARP.S.txt index 7d98ada2..8c6fdc6e 100644 --- a/BIN/ARP.S.txt +++ b/BIN/ARP.S.txt @@ -10,7 +10,6 @@ AUTO 6 *-------------------------------------- .INB INC/MACROS.I .INB INC/A2OSX.I - .INB INC/LIBSTR.I .INB INC/LIBTCPIP.I *-------------------------------------- TIMEOUT.MAX .EQ 40 40*100ms = 4 sec. @@ -35,7 +34,6 @@ CS.START cld .DA CS.RUN .DA CS.DOEVENT .DA CS.QUIT -L.LIBSTR .DA LIBSTR L.LIBTCPIP .DA LIBTCPIP L.SSCANF.IP .DA SSCANF.IP L.DST.IP .DA DST.IP @@ -45,11 +43,7 @@ L.MSG1 .DA MSG1 L.MSG2 .DA MSG2 .DA 0 *-------------------------------------- -CS.INIT >LDYA L.LIBSTR - >SYSCALL SYS.LoadLibYA - sta hLIBSTR - - >LDYA L.LIBTCPIP +CS.INIT >LDYA L.LIBTCPIP >SYSCALL SYS.LoadLibYA sta hLIBTCPIP @@ -57,15 +51,12 @@ CS.INIT >LDYA L.LIBSTR cmp #1 beq CS.INIT.DUMP - lda #1 - >SYSCALL SYS.GetArgA - pha >PUSHW L.DST.IP >PUSHW L.SSCANF.IP - pla - >SYSCALL SYS.GetMemPtrA + lda #1 + >SYSCALL SYS.GetArgA >PUSHYA - >LIBCALL hLIBSTR,LIBSTR.SSCANF + >SYSCALL SYS.SSCANF bcs .9 @@ -83,10 +74,11 @@ CS.INIT >LDYA L.LIBSTR *-------------------------------------- CS.INIT.DUMP >LIBCALL hLIBTCPIP,LIBTCPIP.ARP.GETCACHE >STYA ZPPTR1 - >PUSHW L.MSG0 - >LIBCALL hLIBSTR,LIBSTR.PRINTF + >LDYA L.MSG0 + >SYSCALL SYS.PRINTFYA - ldx #K.ARPCACHE.SIZE + ldx #K.ARPCACHE.SIZE + .1 lda (ZPPTR1) beq .4 @@ -109,9 +101,9 @@ CS.INIT.DUMP >LIBCALL hLIBTCPIP,LIBTCPIP.ARP.GETCACHE >PUSHB (ZPPTR1) - >PUSHW L.MSG1 + >LDYA L.MSG1 phx - >LIBCALL hLIBSTR,LIBSTR.PRINTF + >SYSCALL SYS.PRINTFYA plx .4 lda ZPPTR1 @@ -153,8 +145,10 @@ CS.RUN jsr Init.Timeout dex bpl .4 - >PUSHW L.MSG2 - >LIBCALL hLIBSTR,LIBSTR.PRINTF + >LDYA L.MSG2 + >SYSCALL SYS.PRINTFYA + + lda #0 .9 sec rts @@ -195,8 +189,6 @@ CS.DOEVENT lda (pEvent) rts *-------------------------------------- CS.QUIT lda hLIBTCPIP - >SYSCALL SYS.UnloadLibA - lda hLIBSTR >SYSCALL SYS.UnloadLibA clc rts @@ -217,7 +209,6 @@ Wait.TimeOut sec .9 rts *-------------------------------------- CS.END -LIBSTR >PSTRING "libstr.o" LIBTCPIP >PSTRING "libtcpip.o" SSCANF.IP >PSTRING "%d.%d.%d.%d" MSG0 >CSTRING "STS TTL MAC Address IP Address\n" @@ -225,7 +216,6 @@ MSG1 >CSTRING "$%h %5D %h:%h:%h:%h:%h:%h %d.%d.%d.%d\n" MSG2 >CSTRING "%d.%d.%d.%d is at %h:%h:%h:%h:%h:%h\n" *-------------------------------------- DS.START -hLIBSTR .BS 1 hLIBTCPIP .BS 1 DST.IP .BS 4 DST.MAC .BS 6 diff --git a/BIN/DNSINFO.S.txt b/BIN/DNSINFO.S.txt index a26bd19f..556d967c 100644 --- a/BIN/DNSINFO.S.txt +++ b/BIN/DNSINFO.S.txt @@ -10,7 +10,6 @@ AUTO 6 *-------------------------------------- .INB INC/MACROS.I .INB INC/A2OSX.I - .INB INC/LIBSTR.I .INB INC/LIBTCPIP.I *-------------------------------------- ZPPTR1 .EQ ZPBIN @@ -34,7 +33,6 @@ CS.START cld .DA CS.RUN .DA CS.EVENT .DA CS.QUIT -L.LIBSTR .DA LIBSTR L.LIBTCPIP .DA LIBTCPIP L.SSCANF.IP .DA SSCANF.IP L.IP .DA IP @@ -42,11 +40,7 @@ L.MSG0 .DA MSG0 L.MSG1 .DA MSG1 .DA 0 *-------------------------------------- -CS.INIT >LDYA L.LIBSTR - >SYSCALL SYS.LoadLibYA - sta hLIBSTR - - >LDYA L.LIBTCPIP +CS.INIT >LDYA L.LIBTCPIP >SYSCALL SYS.LoadLibYA sta hLIBTCPIP @@ -62,7 +56,7 @@ CS.INIT.ADD cmp #3 lda #3 >SYSCALL SYS.GetArgA >PUSHYA - >LIBCALL hLIBSTR,LIBSTR.SSCANF + >SYSCALL SYS.SSCANF bcs .9 >PUSHW L.IP @@ -82,8 +76,8 @@ CS.INIT.ADD cmp #3 *-------------------------------------- CS.INIT.DUMP >LIBCALL hLIBTCPIP,LIBTCPIP.DNS.GETCACHE >STYA ZPPTR1 - >PUSHW L.MSG0 - >LIBCALL hLIBSTR,LIBSTR.PRINTF + >LDYA L.MSG0 + >SYSCALL SYS.PRINTFYA lda #K.DNSCACHE.SIZE sta EntryCount @@ -117,8 +111,8 @@ CS.INIT.DUMP >LIBCALL hLIBTCPIP,LIBTCPIP.DNS.GETCACHE >PUSHB (ZPPTR1) Entry Status - >PUSHW L.MSG1 - >LIBCALL hLIBSTR,LIBSTR.PRINTF + >LDYA L.MSG1 + >SYSCALL SYS.PRINTFYA .2 lda ZPPTR1 clc @@ -139,19 +133,15 @@ CS.EVENT clc rts *-------------------------------------- CS.QUIT lda hLIBTCPIP - >SYSCALL SYS.UnloadLibA - lda hLIBSTR >SYSCALL SYS.UnloadLibA clc rts *-------------------------------------- CS.END -LIBSTR >PSTRING "libstr.o" LIBTCPIP >PSTRING "libtcpip.o" SSCANF.IP >PSTRING "%d.%d.%d.%d" MSG0 >CSTRING "STS TR.ID Hostname IP Address TTL\n" MSG1 >CSTRING "$%h $%H %32S %03d.%03d.%03d.%03d %L\n" -hLIBSTR .BS 1 hLIBTCPIP .BS 1 IP .BS 4 diff --git a/BIN/LS.S.txt b/BIN/LS.S.txt index 42dd808b..406a87a8 100644 --- a/BIN/LS.S.txt +++ b/BIN/LS.S.txt @@ -377,7 +377,7 @@ PRODOS.FT.TXT >PSTRING "TXT" >PSTRING "ATK" >PSTRING "SYS" PRODOS.FT.DFLT >PSTRING "$ " -TIME.Format >PSTRING "%d-%b-%Y %H:%M" +TIME.Format >PSTRING "%d-%b-%y %H:%M" TIME.Create .BS 20 TIME.Mod .BS 20 HEXDIGIT .AS '0123456789ABCDEF' diff --git a/BIN/MOUNT.S.txt b/BIN/MOUNT.S.txt deleted file mode 100644 index 96189fef..00000000 --- a/BIN/MOUNT.S.txt +++ /dev/null @@ -1,92 +0,0 @@ -PR#3 -PREFIX /A2OSX.SRC -NEW -INC 1 -AUTO 6 - .LIST OFF - .OP 65C02 - .OR $2000 - .TF /A2OSX.BOOT/BIN/MOUNT -*-------------------------------------- - .INB INC/MACROS.I - .INB INC/A2OSX.I - .INB INC/LIBSTR.I - .INB INC/LIBTCPIP.I -*-------------------------------------- -ZPFrameBase1 .EQ ZPBIN -*-------------------------------------- -* File Header (16 Bytes) -*-------------------------------------- -CS.START cld - jmp (.1,x) - .DA #$61 6502,Level 1 (65c02) - .DA #1 BIN Layout Version 1 - .DA 0 - .DA CS.END-CS.START Code Length To Relocate - .DA DS.END-DS.START Data Segment to Allocate - .DA 0 - .DA 0 -*-------------------------------------- -.1 .DA CS.INIT - .DA CS.RUN - .DA CS.DOEVENT - .DA CS.QUIT -L.LIBSTR .DA LIBSTR -L.LIBTCPIP .DA LIBTCPIP - .DA 0 -*-------------------------------------- -CS.INIT ldy #S.PS.hARGS - lda (pPs),y - bne .1 - lda #SYSMGR.ERRSYN - sec - rts - -.1 >LDYA L.LIBSTR - >SYSCALL SYS.LoadLibYA - sta hLIBSTR - - >LDYA L.LIBTCPIP - >SYSCALL SYS.LoadLibYA - sta hLIBTCPIP - - lda (pPs) - ora #S.PS.F.EVENT Now accept events - sta (pPs) - clc -.9 rts -*-------------------------------------- -CS.RUN -CS.RUN.ERROR sec - rts -*-------------------------------------- -CS.DOEVENT -.8 clc - rts - -.9 sec - rts -*-------------------------------------- -CS.QUIT lda hLIBTCPIP - >SYSCALL SYS.UnloadLibA - lda hLIBSTR - >SYSCALL SYS.UnloadLibA - clc - rts -*-------------------------------------- -CS.END -LIBSTR >PSTRING "libstr.o" -LIBTCPIP >PSTRING "libtcpip.o" -hLIBSTR .BS 1 -hLIBTCPIP .BS 1 -*-------------------------------------- - .DUMMY - .OR 0 -DS.START -bCTRLC .BS 1 -DS.END - .ED -*-------------------------------------- -MAN -SAVE BIN/MOUNT.S -ASM diff --git a/BIN/X.CPLSMVRM.S.txt b/BIN/X.CPLSMVRM.S.txt new file mode 100644 index 00000000..a2c04e14 --- /dev/null +++ b/BIN/X.CPLSMVRM.S.txt @@ -0,0 +1,10 @@ +PR#3 +PREFIX /A2OSX.SRC +NEW +INC 1 +AUTO 6 + .LIST OFF +*-------------------------------------- +*-------------------------------------- +MAN +SAVE BIN/X.CPLSMVRM.S.txt diff --git a/DRV/X.NET.DRV.S.txt b/DRV/X.NET.DRV.S.txt index d3487f16..39c0a251 100644 --- a/DRV/X.NET.DRV.S.txt +++ b/DRV/X.NET.DRV.S.txt @@ -1,6 +1,6 @@ PR#3 PREFIX /A2OSX.SRC -LOMEM $C00 +NEW INC 1 AUTO 6 .LIST OFF