diff --git a/.A2osX Issue List.xlsx b/.A2osX Issue List.xlsx index a0c4183b..59142c05 100644 Binary files a/.A2osX Issue List.xlsx and b/.A2osX Issue List.xlsx differ diff --git a/.Floppies/A2OSX.B800.po b/.Floppies/A2OSX.B800.po index 0a0368b7..813afca4 100644 Binary files a/.Floppies/A2OSX.B800.po and b/.Floppies/A2OSX.B800.po differ diff --git a/.Floppies/A2OSX.BOOT.po b/.Floppies/A2OSX.BOOT.po index 9d5800b7..90f611e7 100644 Binary files a/.Floppies/A2OSX.BOOT.po and b/.Floppies/A2OSX.BOOT.po differ diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index c1d8cf60..8a18438f 100644 Binary files a/.Floppies/A2OSX.BUILD.po and b/.Floppies/A2OSX.BUILD.po differ diff --git a/BIN/DNSINFO.S.txt b/BIN/DNSINFO.S.txt index a5f64814..7a0f9e82 100644 --- a/BIN/DNSINFO.S.txt +++ b/BIN/DNSINFO.S.txt @@ -11,8 +11,12 @@ AUTO 4,1 .INB INC/ETH.I .INB INC/LIBTCPIP.I *-------------------------------------- + .DUMMY + .OR ZPBIN +ZS.START ZPPTR1 .EQ ZPBIN -ZPPTR2 .EQ ZPBIN+2 +ZS.END + .ED *-------------------------------------- * File Header (16 Bytes) *-------------------------------------- @@ -20,11 +24,12 @@ 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 0 No Data Segment to Allocate - .DA #16 SS - .DA #4 ZP + .DA #0 S.PS.F.EVENT + .DA #0 + .DA CS.END-CS.START Code Size (without Constants) + .DA DS.END-DS.START Data SegmentSize + .DA #32 Stack Size + .DA #ZS.END-ZS.START Zero Page Size .DA 0 *-------------------------------------- * Relocation Table @@ -38,6 +43,9 @@ L.MSG.IPKO .DA MSG.IPKO L.SSCANF.IP .DA SSCANF.IP L.MSG0 .DA MSG0 L.MSG1 .DA MSG1 +L.MSG1.Status .DA MSG1.S + .DA MSG1.P + .DA MSG1.D L.MSG.USAGE .DA MSG.USAGE .DA 0 *-------------------------------------- @@ -111,25 +119,25 @@ CS.RUN.DUMP >LIBCALL hLIBTCPIP,LIBTCPIP.DNS.GetCache lda #K.DNSCACHE.SIZE >STA.G EntryCount - + .1 lda (ZPPTR1) - beq .2 + beq .6 ldy #S.DNSCACHE.TTL+4 -.6 dey +.2 dey lda (ZPPTR1),y >PUSHA cpy #S.DNSCACHE.TTL - bne .6 + bne .2 ldy #S.DNSCACHE.IP+4 -.5 dey +.3 dey lda (ZPPTR1),y >PUSHA cpy #S.DNSCACHE.IP - bne .5 + bne .3 ldy #S.DNSCACHE.hNAME lda (ZPPTR1),y @@ -140,26 +148,34 @@ CS.RUN.DUMP >LIBCALL hLIBTCPIP,LIBTCPIP.DNS.GetCache >PUSHB (ZPPTR1),y iny >PUSHB (ZPPTR1),y + + ldx #0 - >PUSHB (ZPPTR1) Entry Status + lda (ZPPTR1) Entry Status + bmi .5 - >PUSHBI 13 + asl + tax + +.5 >PUSHW L.MSG1.Status,x + >PUSHBI 14 >LDYA L.MSG1 >SYSCALL printf -.2 lda ZPPTR1 +.6 lda ZPPTR1 clc adc #S.DNSCACHE sta ZPPTR1 - bcc .3 + bcc .7 inc ZPPTR1+1 -.3 >DEC.G EntryCount - bne .1 - -.8 lda #0 tell TSKMGR that all done ok, but - sec we do not want to stay in memory +.7 >DEC.G EntryCount + + bne .8 + sec rts + +.8 jmp .1 *-------------------------------------- CS.EVENT sec rts @@ -176,8 +192,11 @@ LIBTCPIP .AZ "libtcpip" hLIBTCPIP .BS 1 MSG.IPKO .AZ "TCP/IP Not Loaded/Configured." SSCANF.IP .AZ "%d.%d.%d.%d" -MSG0 .AZ "STS TR.ID Hostname IP Address TTL" -MSG1 .AZ "$%h $%H %32s %03d.%03d.%03d.%03d %u\r\n" +MSG0 .AZ "Status TR.ID Hostname IP Address TTL" +MSG1 .AZ "%7s $%H %32s %03d.%03d.%03d.%03d %u\r\n" +MSG1.S .AZ "Static" +MSG1.P .AZ "Pending" +MSG1.D .AZ "Dynamic" MSG.USAGE .AS "Usage : Add a static entry, DNSINFO \r\n" .AZ " Dump DNS Cache, DNSINFO\r\n" *-------------------------------------- diff --git a/BIN/SHELL.S.CL.txt b/BIN/SHELL.S.CL.txt index c1a249b5..6feda6cb 100644 --- a/BIN/SHELL.S.CL.txt +++ b/BIN/SHELL.S.CL.txt @@ -138,14 +138,25 @@ CL.Insert >LDA.G CL.Len CL.CLR lda (ZPCLBuf) beq CL.RESET.1 - ldy #0 +.1 >LDA.G CL.Ptr + >CMP.G CL.Len + beq .2 + + inc + >STA.G CL.Ptr + + lda #C.FS + >SYSCALL PutChar + bra .1 -.1 lda #$7F +.2 ldy #0 + +.3 lda #C.DEL sta (ZPCLBuf),y iny lda (ZPCLBuf),y - bne .1 + bne .3 jsr CL.PrintCmdBuf *-------------------------------------- diff --git a/BIN/SHELL.S.CMD.txt b/BIN/SHELL.S.CMD.txt index 0e573f86..8a8eb868 100644 --- a/BIN/SHELL.S.CMD.txt +++ b/BIN/SHELL.S.CMD.txt @@ -79,9 +79,11 @@ Cmd.Exec jsr CMD.StkGet IF,WHILE,FOR ? .4 >SLEEP Suspend this PID + sec ldy #S.PS.RC CPID will update S.PS.RC lda (pPs),y - + bne .9 + .8 clc .9 rts