diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index a5e398b4..1cf6c22b 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 36902d80..aacee02c 100644 Binary files a/.Floppies/A2OSX.SRC.po and b/.Floppies/A2OSX.SRC.po differ diff --git a/A2osX.S.txt b/A2osX.S.txt index b572000d..925a7733 100644 --- a/A2osX.S.txt +++ b/A2osX.S.txt @@ -6,14 +6,14 @@ AUTO 8 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/A2OSX.SYSTEM,TSYS + .TF A2OSX.SYSTEM,TSYS *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I - .INB /A2OSX.BUILD/INC/IO.I - .INB /A2OSX.BUILD/INC/MONITOR.I - .INB /A2OSX.BUILD/INC/PRODOS.I - .INB /A2OSX.BUILD/INC/MLI.ERR.I + .INB INC/MACROS.I + .INB INC/A2OSX.I + .INB INC/IO.I + .INB INC/MONITOR.I + .INB INC/PRODOS.I + .INB INC/MLI.ERR.I *-------------------------------------- TmpPtr1 .EQ $0 main & aux ZP TmpPtr2 .EQ $2 main & aux ZP diff --git a/BIN/ARP.S.txt b/BIN/ARP.S.txt index 475e536c..d47281a7 100644 --- a/BIN/ARP.S.txt +++ b/BIN/ARP.S.txt @@ -4,11 +4,12 @@ AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/BIN/ARP + .TF BIN/ARP *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I - .INB /A2OSX.BUILD/INC/LIBTCPIP.I + .INB INC/MACROS.I + .INB INC/A2OSX.I + .INB INC/ETH.I + .INB INC/LIBTCPIP.I *-------------------------------------- TIMEOUT.MAX .EQ 40 40*100ms = 4 sec. *-------------------------------------- diff --git a/BIN/ASM.S.txt b/BIN/ASM.S.txt index 93b84625..915ae9ec 100644 --- a/BIN/ASM.S.txt +++ b/BIN/ASM.S.txt @@ -6,8 +6,8 @@ AUTO 4,1 .OR $2000 .TF /A2OSX.BUILD/BIN/DEV/ASM *--------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I + .INB INC/MACROS.I + .INB INC/A2OSX.I *--------------------------------------- ZPPtr1 .EQ ZPBIN ZPPtr2 .EQ ZPBIN+2 @@ -364,13 +364,13 @@ CS.QUIT jsr FIO.FileClose .8 clc rts *--------------------------------------- - .INB /A2OSX.BUILD/BIN/DEV/ASM.S.DIR - .INB /A2OSX.BUILD/BIN/DEV/ASM.S.EXP - .INB /A2OSX.BUILD/BIN/DEV/ASM.S.FIO - .INB /A2OSX.BUILD/BIN/DEV/ASM.S.MAC - .INB /A2OSX.BUILD/BIN/DEV/ASM.S.OUT - .INB /A2OSX.BUILD/BIN/DEV/ASM.S.SRC - .INB /A2OSX.BUILD/BIN/DEV/ASM.S.SYM + .INB BIN/DEV/ASM.S.DIR + .INB BIN/DEV/ASM.S.EXP + .INB BIN/DEV/ASM.S.FIO + .INB BIN/DEV/ASM.S.MAC + .INB BIN/DEV/ASM.S.OUT + .INB BIN/DEV/ASM.S.SRC + .INB BIN/DEV/ASM.S.SYM *--------------------------------------- CS.END T.DIRECTIVES >PSTR "AC" diff --git a/BIN/ASM.T.6502.S.txt b/BIN/ASM.T.6502.S.txt index 64d64d93..fda15c9b 100644 --- a/BIN/ASM.T.6502.S.txt +++ b/BIN/ASM.T.6502.S.txt @@ -3,14 +3,14 @@ PREFIX /A2OSX.BUILD AUTO 4,1 .LIST OFF .OR $0 - .TF /A2OSX.BUILD/BIN/DEV/ASM.T.6502 + .TF BIN/DEV/ASM.T.6502 *--------------------------------------- .DA T.ADDR.MODES .DA T.REGISTERS .DA T.OPCODES *--------------------------------------- - .INB /A2OSX.BUILD/BIN/DEV/ASM.T.6502.O - .INB /A2OSX.BUILD/BIN/DEV/ASM.T.6502.A + .INB BIN/DEV/ASM.T.6502.O + .INB BIN/DEV/ASM.T.6502.A *--------------------------------------- MAN SAVE /A2OSX.BUILD/BIN/DEV/ASM.T.6502.S diff --git a/BIN/ASM.T.65816.S.txt b/BIN/ASM.T.65816.S.txt index c9b8d080..f6ffa555 100644 --- a/BIN/ASM.T.65816.S.txt +++ b/BIN/ASM.T.65816.S.txt @@ -3,14 +3,14 @@ PREFIX /A2OSX.BUILD AUTO 4,1 .LIST OFF .OR $0 - .TF /A2OSX.BUILD/BIN/DEV/ASM.T.65816 + .TF BIN/DEV/ASM.T.65816 *--------------------------------------- .DA T.ADDR.MODES .DA T.REGISTERS .DA T.OPCODES *--------------------------------------- - .INB /A2OSX.BUILD/BIN/DEV/ASM.T.65816.O - .INB /A2OSX.BUILD/BIN/DEV/ASM.T.65816.A + .INB BIN/DEV/ASM.T.65816.O + .INB BIN/DEV/ASM.T.65816.A *--------------------------------------- MAN SAVE /A2OSX.BUILD/BIN/DEV/ASM.T.65816.S diff --git a/BIN/ASM.T.65C02.S.txt b/BIN/ASM.T.65C02.S.txt index 2f61a681..f6f80755 100644 --- a/BIN/ASM.T.65C02.S.txt +++ b/BIN/ASM.T.65C02.S.txt @@ -3,14 +3,14 @@ PREFIX /A2OSX.BUILD AUTO 4,1 .LIST OFF .OR $0 - .TF /A2OSX.BUILD/BIN/DEV/ASM.T.65C02 + .TF BIN/DEV/ASM.T.65C02 *--------------------------------------- .DA T.ADDR.MODES .DA T.REGISTERS .DA T.OPCODES *--------------------------------------- - .INB /A2OSX.BUILD/BIN/DEV/ASM.T.65C02.O - .INB /A2OSX.BUILD/BIN/DEV/ASM.T.65C02.A + .INB BIN/DEV/ASM.T.65C02.O + .INB BIN/DEV/ASM.T.65C02.A *--------------------------------------- MAN SAVE /A2OSX.BUILD/BIN/DEV/ASM.T.65C02.S diff --git a/BIN/ASM.T.65R02.S.txt b/BIN/ASM.T.65R02.S.txt index 7e84a291..ed26ea40 100644 --- a/BIN/ASM.T.65R02.S.txt +++ b/BIN/ASM.T.65R02.S.txt @@ -3,14 +3,14 @@ PREFIX /A2OSX.BUILD AUTO 4,1 .LIST OFF .OR $0 - .TF /A2OSX.BUILD/BIN/DEV/ASM.T.65R02 + .TF BIN/DEV/ASM.T.65R02 *--------------------------------------- .DA T.ADDR.MODES .DA T.REGISTERS .DA T.OPCODES *--------------------------------------- - .INB /A2OSX.BUILD/BIN/DEV/ASM.T.65R02.O - .INB /A2OSX.BUILD/BIN/DEV/ASM.T.65R02.A + .INB BIN/DEV/ASM.T.65R02.O + .INB BIN/DEV/ASM.T.65R02.A *--------------------------------------- MAN SAVE /A2OSX.BUILD/BIN/DEV/ASM.T.65R02.S diff --git a/BIN/ASM.T.SW16.S.txt b/BIN/ASM.T.SW16.S.txt index 9f1786fc..9bf81445 100644 --- a/BIN/ASM.T.SW16.S.txt +++ b/BIN/ASM.T.SW16.S.txt @@ -3,14 +3,14 @@ PREFIX /A2OSX.BUILD AUTO 4,1 .LIST OFF .OR $0 - .TF /A2OSX.BUILD/BIN/DEV/ASM.T.SW16 + .TF BIN/DEV/ASM.T.SW16 *--------------------------------------- .DA T.ADDR.MODES .DA T.REGISTERS .DA T.OPCODES *--------------------------------------- - .INB /A2OSX.BUILD/BIN/DEV/ASM.T.SW16.O - .INB /A2OSX.BUILD/BIN/DEV/ASM.T.SW16.A + .INB BIN/DEV/ASM.T.SW16.O + .INB BIN/DEV/ASM.T.SW16.A *--------------------------------------- MAN SAVE /A2OSX.BUILD/BIN/DEV/ASM.T.SW16.S diff --git a/BIN/ASM.T.Z80.S.txt b/BIN/ASM.T.Z80.S.txt index 356d9474..08772d71 100644 --- a/BIN/ASM.T.Z80.S.txt +++ b/BIN/ASM.T.Z80.S.txt @@ -3,14 +3,14 @@ PREFIX /A2OSX.BUILD AUTO 4,1 .LIST OFF .OR $0 - .TF /A2OSX.BUILD/BIN/DEV/ASM.T.Z80 + .TF BIN/DEV/ASM.T.Z80 *--------------------------------------- .DA T.ADDR.MODES .DA T.REGISTERS .DA T.OPCODES *--------------------------------------- - .INB /A2OSX.BUILD/BIN/DEV/ASM.T.Z80.O - .INB /A2OSX.BUILD/BIN/DEV/ASM.T.Z80.A + .INB BIN/DEV/ASM.T.Z80.O + .INB BIN/DEV/ASM.T.Z80.A *--------------------------------------- MAN SAVE /A2OSX.BUILD/BIN/DEV/ASM.T.Z80.S diff --git a/BIN/ATBROWSE.S.txt b/BIN/ATBROWSE.S.txt index 81d92b05..575f6f7b 100644 --- a/BIN/ATBROWSE.S.txt +++ b/BIN/ATBROWSE.S.txt @@ -4,13 +4,13 @@ AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/BIN/ATK/ATBROWSE + .TF BIN/ATK/ATBROWSE *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I - .INB /A2OSX.BUILD/INC/PRODOS.I - .INB /A2OSX.BUILD/INC/MLI.ERR.I - .INB /A2OSX.BUILD/INC/APPLETALK.I + .INB INC/MACROS.I + .INB INC/A2OSX.I + .INB INC/PRODOS.I + .INB INC/MLI.ERR.I + .INB INC/APPLETALK.I *-------------------------------------- ZPPTR1 .EQ ZPBIN ZPPTR2 .EQ ZPBIN+2 diff --git a/BIN/ATLOGON.S.txt b/BIN/ATLOGON.S.txt index 5311a460..26b56e6b 100644 --- a/BIN/ATLOGON.S.txt +++ b/BIN/ATLOGON.S.txt @@ -4,13 +4,13 @@ AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/BIN/ATK/ATLOGON + .TF BIN/ATK/ATLOGON *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I - .INB /A2OSX.BUILD/INC/PRODOS.I - .INB /A2OSX.BUILD/INC/MLI.ERR.I - .INB /A2OSX.BUILD/INC/APPLETALK.I + .INB INC/MACROS.I + .INB INC/A2OSX.I + .INB INC/PRODOS.I + .INB INC/MLI.ERR.I + .INB INC/APPLETALK.I *-------------------------------------- ZPPTR1 .EQ ZPBIN ZPPTR2 .EQ ZPBIN+2 diff --git a/BIN/CAT.S.txt b/BIN/CAT.S.txt index 1a25d369..ef6bb975 100644 --- a/BIN/CAT.S.txt +++ b/BIN/CAT.S.txt @@ -4,11 +4,11 @@ AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/BIN/CAT + .TF BIN/CAT *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I - .INB /A2OSX.BUILD/INC/MLI.ERR.I + .INB INC/MACROS.I + .INB INC/A2OSX.I + .INB INC/MLI.ERR.I *-------------------------------------- ZPPTR1 .EQ ZPBIN ZPBufPtr .EQ ZPBIN+2 diff --git a/BIN/CHTYP.S.txt b/BIN/CHTYP.S.txt index 89b9b285..49faa758 100644 --- a/BIN/CHTYP.S.txt +++ b/BIN/CHTYP.S.txt @@ -4,11 +4,11 @@ AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/BIN/CHTYP + .TF BIN/CHTYP *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I - .INB /A2OSX.BUILD/INC/MLI.ERR.I + .INB INC/MACROS.I + .INB INC/A2OSX.I + .INB INC/MLI.ERR.I *-------------------------------------- X.COPY.TO.DEST .EQ 0 X.DELETE.SOURCE .EQ 0 diff --git a/BIN/CP.S.txt b/BIN/CP.S.txt index f1f86225..a38c0ac1 100644 --- a/BIN/CP.S.txt +++ b/BIN/CP.S.txt @@ -4,11 +4,11 @@ AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/BIN/CP + .TF BIN/CP *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I - .INB /A2OSX.BUILD/INC/MLI.ERR.I + .INB INC/MACROS.I + .INB INC/A2OSX.I + .INB INC/MLI.ERR.I *-------------------------------------- X.COPY.TO.DEST .EQ 1 X.DELETE.SOURCE .EQ 0 diff --git a/BIN/DNSINFO.S.txt b/BIN/DNSINFO.S.txt index 40b85a13..0dbc4ca7 100644 --- a/BIN/DNSINFO.S.txt +++ b/BIN/DNSINFO.S.txt @@ -4,11 +4,11 @@ AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/BIN/DNSINFO + .TF BIN/DNSINFO *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I - .INB /A2OSX.BUILD/INC/LIBTCPIP.I + .INB INC/MACROS.I + .INB INC/A2OSX.I + .INB INC/LIBTCPIP.I *-------------------------------------- ZPPTR1 .EQ ZPBIN ZPPTR2 .EQ ZPBIN+2 diff --git a/BIN/EDIT.S.txt b/BIN/EDIT.S.txt index 69bd0b36..bc0cc03b 100644 --- a/BIN/EDIT.S.txt +++ b/BIN/EDIT.S.txt @@ -4,10 +4,10 @@ AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/BIN/EDIT + .TF BIN/EDIT *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I + .INB INC/MACROS.I + .INB INC/A2OSX.I *-------------------------------------- ZPPTR1 .EQ ZPBIN ZPPTR2 .EQ ZPBIN+2 diff --git a/BIN/FORMAT.S.txt b/BIN/FORMAT.S.txt index 0f92c4a3..2a08baf8 100644 --- a/BIN/FORMAT.S.txt +++ b/BIN/FORMAT.S.txt @@ -4,11 +4,11 @@ AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/BIN/FORMAT + .TF BIN/FORMAT *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I - .INB /A2OSX.BUILD/INC/LIBBLKDEV.I + .INB INC/MACROS.I + .INB INC/A2OSX.I + .INB INC/LIBBLKDEV.I *-------------------------------------- ZPPtr1 .EQ ZPBIN ZPPtr2 .EQ ZPBIN+2 diff --git a/BIN/IPCONFIG.S.txt b/BIN/IPCONFIG.S.txt index e954d7de..a19389e3 100644 --- a/BIN/IPCONFIG.S.txt +++ b/BIN/IPCONFIG.S.txt @@ -4,16 +4,16 @@ AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/BIN/IPCONFIG + .TF BIN/IPCONFIG *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I - .INB /A2OSX.BUILD/INC/NIC.I - .INB /A2OSX.BUILD/INC/LIBTCPIP.I + .INB INC/MACROS.I + .INB INC/A2OSX.I + .INB INC/NIC.I + .INB INC/ETH.I + .INB INC/LIBTCPIP.I *-------------------------------------- ZPIPCfgPtr .EQ ZPBIN ZPDevPtr .EQ ZPBIN+2 -ZPDevStatPtr .EQ ZPBIN+4 *-------------------------------------- * File Header (16 Bytes) *-------------------------------------- @@ -72,74 +72,80 @@ CS.RUN >LDYA L.MSG0 ldy #S.IPCFG.HDEV lda (ZPIPCfgPtr),y - bne CS.RUN.DUMPDEV + bne .1 >LDYA L.MSG0.NL >SYSCALL printf jmp CS.RUN.DONE -CS.RUN.DUMPDEV >STA.G DevID +.1 >STA.G DevID >SYSCALL GetDevByID - >STYA ZPDevPtr + >STYA ZPDevPtr S.FD + >PUSHEA.G DIB >LDA.G DevID >SYSCALL GetDevStatus - >STYA ZPDevStatPtr - >LDYA L.MSG0.L + >LEA.G DCB.NIC + >STYA IOCTL+S.IOCTL.BUFPTR + lda S.IOCTL.STATCODE.GETDCB + sta S.IOCTL.STATCODE + + >PUSHEA.G IOCTL + >PUSHBI IOCTL.STATUS + >LDA.G DevID + >SYSCALL IOCTL + +CS.RUN.DUMP >LDYA L.MSG0.L >SYSCALL printf - ldy #S.DIB.NIC.MAC+5 + ldy #5 -.1 >PUSHB (ZPDevStatPtr),y +.1 >PUSHB DCB.NIC+S.DCB.NIC.MAC,y dey - cpy #S.DIB.NIC.MAC-1 - bne .1 + bpl .1 - lda #S.DEV.NAME + >PUSHEA.G DIB+S.DIB.IDS + + lda #S.FD.DEV.NAME clc adc ZPDevPtr tay - lda /S.DEV.NAME + lda /S.FD.DEV.NAME adc ZPDevPtr+1 >PUSHYA - lda ZPDevStatPtr - clc - adc #S.DIB.IDS - tay - lda ZPDevStatPtr+1 - adc /S.DIB.IDS - >PUSHYA - >PUSHB.G DevID >LDYA L.MSG1.DEV >SYSCALL printf - ldy #S.DIB.NIC.FLAGS - lda (ZPDevStatPtr),y - and #S.DIB.NIC.FLAGS.ARPOFFLOAD + lda DCB.NIC+S.DCB.NIC.FLAGS + and #S.DCB.NIC.FLAGS.ARPOFFLOAD beq .2 + lda #1 + .2 >PUSHA >LDYA L.MSG1.DEV.ARP >SYSCALL printf - ldy #S.DIB.NIC.FLAGS - lda (ZPDevStatPtr),y - and #S.DIB.NIC.FLAGS.IPOFFLOAD + lda DCB.NIC+S.DCB.NIC.FLAGS + and #S.DCB.NIC.FLAGS.IPOFFLOAD + beq .3 + lda #1 -.3 >PUSHA +.3 + >PUSHA >LDYA L.MSG1.DEV.IP >SYSCALL printf - ldy #S.DIB.NIC.STATUS - lda (ZPDevStatPtr),y - and #S.DIB.NIC.STATUS.OK + lda DCB.NIC+S.DCB.NIC.LINK + and #S.DCB.NIC.LINK.OK bne CS.RUN.LINK + >PUSHW L.MSG1.LINK.KO >LDYA L.MSG1.LINK >SYSCALL printf @@ -152,8 +158,7 @@ CS.RUN.LINK >PUSHW L.MSG1.LINK.OK >LDYA L.MSG1.LINKSPEED >SYSCALL printf - ldy #S.DIB.NIC.STATUS - lda (ZPDevStatPtr),y + lda DCB.NIC+S.DCB.NIC.SPEED and #$0F tax @@ -164,12 +169,13 @@ CS.RUN.LINK >PUSHW L.MSG1.LINK.OK dex bne .4 - ldy #S.DIB.NIC.STATUS - lda (ZPDevStatPtr),y - and #S.DIB.NIC.STATUS.FD + lda DCB.NIC+S.DCB.NIC.LINK + and #S.DCB.NIC.LINK.FD bne .5 + >LDYA L.MSG1.DPLX.HD bra .6 + .5 >LDYA L.MSG1.DPLX.FD .6 >SYSCALL printf @@ -178,8 +184,10 @@ CS.RUN.DUMPIP >LDYA L.MSG2 lda (ZPIPCfgPtr) and #S.IPCFG.STATUS.OK beq .11 + >LDYA L.MSG2.C bra .10 + .11 >LDYA L.MSG2.U .10 >SYSCALL printf @@ -260,7 +268,11 @@ MSG0 .AZ "TCP/IP Status : " MSG0.L .AZ "Loaded\r\n" MSG0.NL .AZ "Not Loaded\r\n" *-------------------------------------- -MSG1.DEV .AZ "\r\nDevice Configuration :\r\n DevID : $%h\r\n Device Type : %S\r\n Device Name : %s\r\n HW Address : %02h:%02h:%02h:%02h:%02h:%02h\r\n" +MSG1.DEV .AS "\r\nDevice Configuration :\r\n" + .AS " DevID : $%h\r\n" + .AS " Device Name : %s\r\n" + .AS " Device Type : %S\r\n" + .AZ " HW Address : %02h:%02h:%02h:%02h:%02h:%02h\r\n" MSG1.DEV.ARP .AZ " ARP Offload : %d\r\n" MSG1.DEV.IP .AZ " IP Offload : %d\r\n" MSG1.LINK .AZ " Link Status : %s\r\n" @@ -277,13 +289,16 @@ MSG2.DHCPSRVR .AZ " DHCP Server : %d.%d.%d.%d\r\n" MSG2.IP .AZ " IP/Mask : %d.%d.%d.%d/%d.%d.%d.%d\r\n" MSG2.GW .AZ " Gateway : %d.%d.%d.%d\r\n" MSG2.DNS .AZ " DNS : %d.%d.%d.%d,%d.%d.%d.%d\r\n" -MSG2.HOSTNAME .AZ " Hostname : %S.%S\r\n" +MSG2.HOSTNAME .AZ " Hostname : %s.%s\r\n" hLIBTCPIP .BS 1 *-------------------------------------- .DUMMY .OR 0 DS.START DevID .BS 1 +IOCTL .BS S.IOCTL +DIB .BS S.DIB +DCB.NIC .BS S.DCB.NIC DS.END .ED *-------------------------------------- MAN diff --git a/BIN/LSDEV.S.txt b/BIN/LSDEV.S.txt index 52c9531c..634da5ec 100644 --- a/BIN/LSDEV.S.txt +++ b/BIN/LSDEV.S.txt @@ -4,11 +4,11 @@ AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/BIN/LSDEV + .TF BIN/LSDEV *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/PRODOS.I - .INB /A2OSX.BUILD/INC/A2OSX.I + .INB INC/MACROS.I + .INB INC/PRODOS.I + .INB INC/A2OSX.I *-------------------------------------- ZPPTR1 .EQ ZPBIN ZPPTR2 .EQ ZPBIN+2 diff --git a/BIN/MD.S.txt b/BIN/MD.S.txt index 6c401df2..269114d5 100644 --- a/BIN/MD.S.txt +++ b/BIN/MD.S.txt @@ -4,10 +4,10 @@ AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/BIN/MD + .TF BIN/MD *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I + .INB INC/MACROS.I + .INB INC/A2OSX.I *-------------------------------------- * File Header (16 Bytes) *-------------------------------------- diff --git a/BIN/MD5.S.txt b/BIN/MD5.S.txt index 491b6afe..8d7d13e4 100644 --- a/BIN/MD5.S.txt +++ b/BIN/MD5.S.txt @@ -4,12 +4,12 @@ AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/BIN/MD5 + .TF BIN/MD5 *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I - .INB /A2OSX.BUILD/INC/MLI.ERR.I - .INB /A2OSX.BUILD/INC/LIBCRYPT.I + .INB INC/MACROS.I + .INB INC/A2OSX.I + .INB INC/MLI.ERR.I + .INB INC/LIBCRYPT.I *-------------------------------------- FILEBUF.SIZE .EQ 4096 *-------------------------------------- diff --git a/BIN/MEM.S.txt b/BIN/MEM.S.txt index 4133f001..c8e6139a 100644 --- a/BIN/MEM.S.txt +++ b/BIN/MEM.S.txt @@ -4,10 +4,10 @@ AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/BIN/MEM + .TF BIN/MEM *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I + .INB INC/MACROS.I + .INB INC/A2OSX.I *-------------------------------------- PAGELEN .EQ 22 FOOTERLEN .EQ 8 diff --git a/BIN/MEMDUMP.S.txt b/BIN/MEMDUMP.S.txt index 47855e71..5bd13f56 100644 --- a/BIN/MEMDUMP.S.txt +++ b/BIN/MEMDUMP.S.txt @@ -4,10 +4,10 @@ AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/BIN/DEV/MEMDUMP + .TF BIN/DEV/MEMDUMP *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I + .INB INC/MACROS.I + .INB INC/A2OSX.I *-------------------------------------- PAGELEN .EQ 22 FOOTERLEN .EQ 8 diff --git a/BIN/MV.S.txt b/BIN/MV.S.txt index 3983f341..319823b5 100644 --- a/BIN/MV.S.txt +++ b/BIN/MV.S.txt @@ -4,11 +4,11 @@ AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/BIN/MV + .TF BIN/MV *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I - .INB /A2OSX.BUILD/INC/MLI.ERR.I + .INB INC/MACROS.I + .INB INC/A2OSX.I + .INB INC/MLI.ERR.I *-------------------------------------- X.COPY.TO.DEST .EQ 1 X.DELETE.SOURCE .EQ 1 diff --git a/BIN/NETSTAT.S.txt b/BIN/NETSTAT.S.txt index 5e4f4db8..89c5a1d5 100644 --- a/BIN/NETSTAT.S.txt +++ b/BIN/NETSTAT.S.txt @@ -4,11 +4,12 @@ AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/BIN/NETSTAT + .TF BIN/NETSTAT *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I - .INB /A2OSX.BUILD/INC/LIBTCPIP.I + .INB INC/MACROS.I + .INB INC/A2OSX.I + .INB INC/ETH.I + .INB INC/LIBTCPIP.I *-------------------------------------- ZPPTR1 .EQ ZPBIN *-------------------------------------- diff --git a/BIN/NFSMOUNT.S.txt b/BIN/NFSMOUNT.S.txt index 11f9d2dd..9b8a31de 100644 --- a/BIN/NFSMOUNT.S.txt +++ b/BIN/NFSMOUNT.S.txt @@ -6,11 +6,11 @@ AUTO 6 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/BIN/NFSMOUNT + .TF BIN/NFSMOUNT *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I - .INB /A2OSX.BUILD/INC/LIBTCPIP.I + .INB INC/MACROS.I + .INB INC/A2OSX.I + .INB INC/LIBTCPIP.I *-------------------------------------- TIMEOUT.MAX .EQ 40 40*100ms = 4 sec. *-------------------------------------- diff --git a/BIN/NSCUTIL.S.txt b/BIN/NSCUTIL.S.txt index bfb55253..cd552036 100644 --- a/BIN/NSCUTIL.S.txt +++ b/BIN/NSCUTIL.S.txt @@ -4,11 +4,11 @@ AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/BIN/NSCUTIL + .TF BIN/NSCUTIL *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I - .INB /A2OSX.BUILD/INC/MLI.ERR.I + .INB INC/MACROS.I + .INB INC/A2OSX.I + .INB INC/MLI.ERR.I *-------------------------------------- ZPPtr1 .EQ ZPBIN *-------------------------------------- diff --git a/BIN/PING.S.txt b/BIN/PING.S.txt index f9ef5ff1..07f7c37a 100644 --- a/BIN/PING.S.txt +++ b/BIN/PING.S.txt @@ -4,11 +4,12 @@ AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/BIN/PING + .TF BIN/PING *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I - .INB /A2OSX.BUILD/INC/LIBTCPIP.I + .INB INC/MACROS.I + .INB INC/A2OSX.I + .INB INC/ETH.I + .INB INC/LIBTCPIP.I *-------------------------------------- TIMEOUT.MAX .EQ 20 2 sec. *-------------------------------------- @@ -191,7 +192,7 @@ CS.RUN.WAIT.REPLY .1 ldy #hSocket lda (pData),y - >LIBCALL hLIBTCPIP,LIBTCPIP.SKT.ReadA + >LIBCALL hLIBTCPIP,LIBTCPIP.SKT.ReadFrame bcs .2 ldy #hFrame @@ -300,7 +301,7 @@ CS.QUIT ldy #hFrame .1 ldy #hSocket lda (pData),y >DEBUG - >LIBCALL hLIBTCPIP,LIBTCPIP.SKT.CLOSEA + >LIBCALL hLIBTCPIP,LIBTCPIP.SKT.Close lda hLIBTCPIP >SYSCALL UnloadLib diff --git a/BIN/PS.S.txt b/BIN/PS.S.txt index 39ccdfec..579edae1 100644 --- a/BIN/PS.S.txt +++ b/BIN/PS.S.txt @@ -4,11 +4,11 @@ AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/BIN/PS + .TF BIN/PS *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I - .INB /A2OSX.BUILD/INC/KERNEL.I + .INB INC/MACROS.I + .INB INC/A2OSX.I + .INB INC/KERNEL.I *-------------------------------------- ZPPtr .EQ ZPBIN *-------------------------------------- diff --git a/BIN/RM.S.txt b/BIN/RM.S.txt index 3a95117d..7573aad7 100644 --- a/BIN/RM.S.txt +++ b/BIN/RM.S.txt @@ -4,11 +4,11 @@ AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/BIN/RM + .TF BIN/RM *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I - .INB /A2OSX.BUILD/INC/MLI.ERR.I + .INB INC/MACROS.I + .INB INC/A2OSX.I + .INB INC/MLI.ERR.I *-------------------------------------- X.COPY.TO.DEST .EQ 0 X.DELETE.SOURCE .EQ 1 diff --git a/BIN/RPCDUMP.S.txt b/BIN/RPCDUMP.S.txt index 8a4513d3..12472bdb 100644 --- a/BIN/RPCDUMP.S.txt +++ b/BIN/RPCDUMP.S.txt @@ -4,11 +4,12 @@ AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/BIN/DEV/RPCDUMP + .TF BIN/DEV/RPCDUMP *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I - .INB /A2OSX.BUILD/INC/LIBTCPIP.I + .INB INC/MACROS.I + .INB INC/A2OSX.I + .INB INC/ETH.I + .INB INC/LIBTCPIP.I *-------------------------------------- TIMEOUT.MAX .EQ 40 40*100ms = 4 sec. *-------------------------------------- @@ -130,7 +131,7 @@ CS.RUN jsr Init.Timeout .5 ldy #hSocket lda (pData),y - >LIBCALL hLIBTCPIP,LIBTCPIP.SKT.ReadA + >LIBCALL hLIBTCPIP,LIBTCPIP.SKT.ReadFrame bcc .6 >SLEEP @@ -176,7 +177,7 @@ CS.QUIT ldy #hSocket lda (pData),y beq .1 - >LIBCALL hLIBTCPIP,LIBTCPIP.SKT.CLOSEA + >LIBCALL hLIBTCPIP,LIBTCPIP.SKT.Close .1 lda hLIBTCPIP beq .8 diff --git a/BMP2PIX.S.txt b/BMP2PIX.S.txt index 7e9e395f..8089ffb2 100644 --- a/BMP2PIX.S.txt +++ b/BMP2PIX.S.txt @@ -4,12 +4,12 @@ AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/ROOT/BMP2PIX + .TF ROOT/BMP2PIX *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I - .INB /A2OSX.BUILD/INC/GUI.I - .INB /A2OSX.BUILD/INC/LIBGUI.I + .INB INC/MACROS.I + .INB INC/A2OSX.I + .INB INC/GUI.I + .INB INC/LIBGUI.I *-------------------------------------- ZPPTR1 .EQ ZPBIN ZPInputBufPtr .EQ ZPBIN+2 @@ -323,7 +323,7 @@ CS.QUIT >LDA.G hBuf *-------------------------------------- CS.END *-------------------------------------- - .INB /A2OSX.BUILD/ROOT/X.TWIST.G + .INB ROOT/X.TWIST.G *-------------------------------------- OptionList >PSTR "Vv" OptionVars .DA #bVerbose,#bVerbose diff --git a/DRV/DHGR.DRV.S.txt b/DRV/DHGR.DRV.S.txt index fc4913bc..24d8ea94 100644 --- a/DRV/DHGR.DRV.S.txt +++ b/DRV/DHGR.DRV.S.txt @@ -4,16 +4,16 @@ AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/DRV/DHGR.DRV + .TF DRV/DHGR.DRV *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I - .INB /A2OSX.BUILD/INC/PRODOS.I - .INB /A2OSX.BUILD/INC/IO.I - .INB /A2OSX.BUILD/INC/GFX.I - .INB /A2OSX.BUILD/INC/GFX.EVE.I - .INB /A2OSX.BUILD/INC/GUI.I - .INB /A2OSX.BUILD/INC/LIBGUI.I + .INB INC/MACROS.I + .INB INC/A2OSX.I + .INB INC/PRODOS.I + .INB INC/IO.I + .INB INC/GFX.I + .INB INC/GFX.EVE.I + .INB INC/GUI.I + .INB INC/LIBGUI.I *-------------------------------------- ZPCmdPtr .EQ ZPDRV ZPBasePtr .EQ ZPDRV+2 diff --git a/DRV/LANCEGS.DRV.S.txt b/DRV/LANCEGS.DRV.S.txt index 1755898b..103e7e6a 100644 --- a/DRV/LANCEGS.DRV.S.txt +++ b/DRV/LANCEGS.DRV.S.txt @@ -4,14 +4,14 @@ AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/DRV/LANCEGS.DRV + .TF DRV/LANCEGS.DRV *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I - .INB /A2OSX.BUILD/INC/MLI.ERR.I - .INB /A2OSX.BUILD/INC/NIC.I - .INB /A2OSX.BUILD/INC/NIC.91C96.I - .INB /A2OSX.BUILD/INC/LIBTCPIP.I + .INB INC/MACROS.I + .INB INC/A2OSX.I + .INB INC/MLI.ERR.I + .INB INC/NIC.I + .INB INC/NIC.91C96.I + .INB INC/LIBTCPIP.I *-------------------------------------- ZPTmpPTR .EQ ZPDRV Size .EQ ZPDRV+2 diff --git a/DRV/MOUSE.DRV.S.txt b/DRV/MOUSE.DRV.S.txt index 088c210c..95adf151 100644 --- a/DRV/MOUSE.DRV.S.txt +++ b/DRV/MOUSE.DRV.S.txt @@ -4,13 +4,13 @@ AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/DRV/MOUSE.DRV + .TF DRV/MOUSE.DRV *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I - .INB /A2OSX.BUILD/INC/MLI.ERR.I - .INB /A2OSX.BUILD/INC/XY.MOUSE.I - .INB /A2OSX.BUILD/INC/LIBGUI.I + .INB INC/MACROS.I + .INB INC/A2OSX.I + .INB INC/MLI.ERR.I + .INB INC/XY.MOUSE.I + .INB INC/LIBGUI.I *-------------------------------------- ZPTmpPtr1 .EQ ZPDRV *-------------------------------------- diff --git a/DRV/PIC.DRV.S.txt b/DRV/PIC.DRV.S.txt index 3b861203..9a9adff4 100644 --- a/DRV/PIC.DRV.S.txt +++ b/DRV/PIC.DRV.S.txt @@ -6,11 +6,11 @@ AUTO 6 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/DRV/PIC.DRV + .TF DRV/PIC.DRV *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I - .INB /A2OSX.BUILD/INC/MLI.ERR.I + .INB INC/MACROS.I + .INB INC/A2OSX.I + .INB INC/MLI.ERR.I *-------------------------------------- ZPTmpPtr1 .EQ ZPDRV *-------------------------------------- diff --git a/DRV/SSC.DRV.S.txt b/DRV/SSC.DRV.S.txt index d43c85e6..9374323a 100644 --- a/DRV/SSC.DRV.S.txt +++ b/DRV/SSC.DRV.S.txt @@ -5,10 +5,10 @@ AUTO 4,1 *-------------------------------------- SSCIRQ .EQ 0 *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I - .INB /A2OSX.BUILD/INC/MLI.ERR.I - .INB /A2OSX.BUILD/INC/COM.6551.I + .INB INC/MACROS.I + .INB INC/A2OSX.I + .INB INC/MLI.ERR.I + .INB INC/COM.6551.I .INB /A2OSX.SRC/DRV/X.SSC.DRV.S *-------------------------------------- MAN diff --git a/DRV/SSC.I.DRV.S.txt b/DRV/SSC.I.DRV.S.txt index 5740003b..132d88a7 100644 --- a/DRV/SSC.I.DRV.S.txt +++ b/DRV/SSC.I.DRV.S.txt @@ -5,10 +5,10 @@ AUTO 4,1 *-------------------------------------- SSCIRQ .EQ 1 *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I - .INB /A2OSX.BUILD/INC/MLI.ERR.I - .INB /A2OSX.BUILD/INC/COM.6551.I + .INB INC/MACROS.I + .INB INC/A2OSX.I + .INB INC/MLI.ERR.I + .INB INC/COM.6551.I .INB /A2OSX.SRC/DRV/X.SSC.DRV.S *-------------------------------------- MAN diff --git a/DRV/UTHER2.AI.DRV.S.txt b/DRV/UTHER2.AI.DRV.S.txt index 7ef2f213..15e65d5d 100644 --- a/DRV/UTHER2.AI.DRV.S.txt +++ b/DRV/UTHER2.AI.DRV.S.txt @@ -4,14 +4,14 @@ AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/DRV/UTHER2.AI.DRV + .TF DRV/UTHER2.AI.DRV *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I - .INB /A2OSX.BUILD/INC/MLI.ERR.I - .INB /A2OSX.BUILD/INC/NIC.I - .INB /A2OSX.BUILD/INC/NIC.W5100.I - .INB /A2OSX.BUILD/INC/LIBTCPIP.I + .INB INC/MACROS.I + .INB INC/A2OSX.I + .INB INC/MLI.ERR.I + .INB INC/NIC.I + .INB INC/NIC.W5100.I + .INB INC/LIBTCPIP.I *-------------------------------------- ZPTmpPTR .EQ ZPDRV RXTX.Size .EQ ZPDRV+2 diff --git a/DRV/UTHERNET2.DRV.S.txt b/DRV/UTHERNET2.DRV.S.txt index f334d68c..e94b389f 100644 --- a/DRV/UTHERNET2.DRV.S.txt +++ b/DRV/UTHERNET2.DRV.S.txt @@ -4,14 +4,14 @@ AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/DRV/UTHERNET2.DRV + .TF DRV/UTHERNET2.DRV *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I - .INB /A2OSX.BUILD/INC/MLI.ERR.I - .INB /A2OSX.BUILD/INC/NIC.I - .INB /A2OSX.BUILD/INC/NIC.W5100.I - .INB /A2OSX.BUILD/INC/LIBTCPIP.I + .INB INC/MACROS.I + .INB INC/A2OSX.I + .INB INC/MLI.ERR.I + .INB INC/NIC.I + .INB INC/NIC.W5100.I + .INB INC/LIBTCPIP.I *-------------------------------------- ZPTmpPTR .EQ ZPDRV RXTX.Size .EQ ZPDRV+2 diff --git a/DRV/X.SSC.DRV.S.txt b/DRV/X.SSC.DRV.S.txt index 54635f7e..b44fe2c6 100644 --- a/DRV/X.SSC.DRV.S.txt +++ b/DRV/X.SSC.DRV.S.txt @@ -5,9 +5,9 @@ AUTO 4,1 .OR $2000 *-------------------------------------- .DO SSCIRQ=1 - .TF /A2OSX.BUILD/DRV/SSC.I.DRV + .TF DRV/SSC.I.DRV .ELSE - .TF /A2OSX.BUILD/DRV/SSC.DRV + .TF DRV/SSC.DRV .FIN *-------------------------------------- .DO SSCIRQ=1 diff --git a/FNT2FON.S.txt b/FNT2FON.S.txt index abffb5b5..2c7013cc 100644 --- a/FNT2FON.S.txt +++ b/FNT2FON.S.txt @@ -4,13 +4,13 @@ AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/ROOT/FNT2FON + .TF ROOT/FNT2FON *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I - .INB /A2OSX.BUILD/INC/GUI.I - .INB /A2OSX.BUILD/INC/LIBGUI.I - .INB /A2OSX.BUILD/ROOT/X.FNT.I + .INB INC/MACROS.I + .INB INC/A2OSX.I + .INB INC/GUI.I + .INB INC/LIBGUI.I + .INB ROOT/X.FNT.I *-------------------------------------- ZPPTR1 .EQ ZPBIN ZPInputBufPtr .EQ ZPBIN+2 @@ -808,7 +808,7 @@ CS.QUIT >LDA.G hOutPutBuf *-------------------------------------- CS.END *-------------------------------------- - .INB /A2OSX.BUILD/ROOT/X.TWIST.G + .INB ROOT/X.TWIST.G *-------------------------------------- OptionList >PSTR "NnVv" OptionVars .DA #bNoShrink,#bNoShrink,#bVerbose,#bVerbose diff --git a/INC/LIBTCPIP.I.txt b/INC/LIBTCPIP.I.txt index 65ed7c37..047956ac 100644 --- a/INC/LIBTCPIP.I.txt +++ b/INC/LIBTCPIP.I.txt @@ -1,8 +1,6 @@ -PR#3 -PREFIX /A2OSX.BUILD NEW -INC 1 -AUTO 6 +PREFIX /A2OSX.BUILD +AUTO 4,1 .LIST OFF .OP 65C02 *-------------------------------------- @@ -26,7 +24,7 @@ LIBTCPIP.SET.IPCFG .EQ 4 LIBTCPIP.GET.IPCFG .EQ 6 LIBTCPIP.POLL .EQ 8 -LIBTCPIP.PULSEA .EQ 10 +LIBTCPIP.PULSE .EQ 10 LIBTCPIP.ARP.Clear .EQ 12 LIBTCPIP.ARP.Query .EQ 14 @@ -42,20 +40,16 @@ LIBTCPIP.HST.GetByName .EQ 28 LIBTCPIP.HST.GetByAddr .EQ 30 LIBTCPIP.SKT.New .EQ 32 -LIBTCPIP.SKT.CloseA .EQ 34 +LIBTCPIP.SKT.Close .EQ 34 LIBTCPIP.SKT.GetTable .EQ 36 -LIBTCPIP.SKT.GetA .EQ 38 +LIBTCPIP.SKT.Get .EQ 38 -LIBTCPIP.SKT.AcceptA .EQ 40 -LIBTCPIP.SKT.MkNodA .EQ 42 +LIBTCPIP.SKT.Accept .EQ 40 +LIBTCPIP.SKT.MkNod .EQ 42 LIBTCPIP.SKT.Write .EQ 44 LIBTCPIP.SKT.Read .EQ 46 -LIBTCPIP.SKT.ReadA .EQ 48 -LIBTCPIP.SKT.PutC .EQ 50 -LIBTCPIP.SKT.PutS .EQ 52 -LIBTCPIP.SKT.GetC.A .EQ 54 -LIBTCPIP.SKT.GetS .EQ 56 +LIBTCPIP.SKT.ReadFrame .EQ 48 *-------------------------------------- ERR.SKT.OOS .EQ $BF ERR.SKT.BUSY .EQ $BE diff --git a/LIB/LIBCRYPT.S.txt b/LIB/LIBCRYPT.S.txt index 99a096c4..525bdd37 100644 --- a/LIB/LIBCRYPT.S.txt +++ b/LIB/LIBCRYPT.S.txt @@ -4,11 +4,11 @@ AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/LIB/LIBCRYPT.O + .TF LIB/LIBCRYPT.O *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I - .INB /A2OSX.BUILD/INC/LIBCRYPT.I + .INB INC/MACROS.I + .INB INC/A2OSX.I + .INB INC/LIBCRYPT.I *-------------------------------------- ZPCtxPtr .EQ ZPLIB ZPDataPtr .EQ ZPLIB+2 diff --git a/LIB/LIBGUI.S.txt b/LIB/LIBGUI.S.txt index 3b1cf14f..766bce02 100644 --- a/LIB/LIBGUI.S.txt +++ b/LIB/LIBGUI.S.txt @@ -4,13 +4,13 @@ AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/LIB/LIBGUI.O + .TF LIB/LIBGUI.O *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I - .INB /A2OSX.BUILD/INC/GUI.I - .INB /A2OSX.BUILD/INC/LIBGUI.I - .INB /A2OSX.BUILD/INC/GFX.I + .INB INC/MACROS.I + .INB INC/A2OSX.I + .INB INC/GUI.I + .INB INC/LIBGUI.I + .INB INC/GFX.I *-------------------------------------- WND.MAX .EQ 64 *-------------------------------------- diff --git a/LIB/LIBPAK.S.txt b/LIB/LIBPAK.S.txt index 45b1d419..a7f6090d 100644 --- a/LIB/LIBPAK.S.txt +++ b/LIB/LIBPAK.S.txt @@ -4,11 +4,11 @@ AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/LIB/LIBPAK.O + .TF LIB/LIBPAK.O *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I - .INB /A2OSX.BUILD/INC/LIBPAK.I + .INB INC/MACROS.I + .INB INC/A2OSX.I + .INB INC/LIBPAK.I *-------------------------------------- ZPSrcPtr .EQ ZPLIB ZPSrcWPtr .EQ ZPLIB+2 diff --git a/LIB/LIBTCPIP.S.ARP.txt b/LIB/LIBTCPIP.S.ARP.txt index ed23b74c..f090c0f0 100644 --- a/LIB/LIBTCPIP.S.ARP.txt +++ b/LIB/LIBTCPIP.S.ARP.txt @@ -166,7 +166,8 @@ ARP.IN.REQ ldy #S.ARP.SPA+3 bpl .2 >LDYA L.ARP.REP - jsr FRM.Send.YA + jsr ARP.Send.YA + bra ARP.IN.EXIT ARP.IN.REP lda #K.ARP.TTL @@ -221,7 +222,7 @@ ARP.QUERY.I jsr ARP.FIND.BY.IP bpl .4 >LDYA L.ARP.REQ - jsr FRM.Send.YA + jsr ARP.Send.YA bcs .99 lda #K.ARP.PENDING.TTL @@ -235,6 +236,12 @@ ARP.QUERY.I jsr ARP.FIND.BY.IP sec .99 rts *-------------------------------------- +ARP.Send.YA >STYA IOCTL+S.IOCTL.BUFPTR + >LDYAI S.ARP + >STYA IOCTL+S.IOCTL.BYTECNT + + jmp FRM.Send.IOCTL +*-------------------------------------- ARP.FIND.BY.IP >LDYA L.ARP.CACHE >STYA ZPCachePtr diff --git a/LIB/LIBTCPIP.S.CFG.txt b/LIB/LIBTCPIP.S.CFG.txt index 85fd2395..558c017f 100644 --- a/LIB/LIBTCPIP.S.CFG.txt +++ b/LIB/LIBTCPIP.S.CFG.txt @@ -5,7 +5,16 @@ AUTO 4,1 *-------------------------------------- * PULLW = PTR to S.IPCFG *-------------------------------------- -SET.IPCFG >PULLW ZPTmpPtr1 +SET.IPCFG >PULLW ZPTmpPtr1 IPCFG + + >LDYA L.DCB.NIC + >STYA IOCTL+S.IOCTL.BUFPTR + lda S.IOCTL.STATCODE.GETDCB + sta S.IOCTL.STATCODE + + ldx #IOCTL.STATUS + jsr SET.IPCFG.IOCTL + ldy #0 .1 lda (ZPTmpPtr1),y @@ -16,7 +25,8 @@ SET.IPCFG >PULLW ZPTmpPtr1 ldx #5 -.2 lda IPCFG+S.IPCFG.MAC,x +.2 lda DCB.NIC+S.DCB.NIC.MAC,x + sta IPCFG+S.IPCFG.MAC,x sta ARP.REQ.SRCMAC,x sta ARP.REQ.SHA,x sta ARP.REP.SRCMAC,x @@ -33,15 +43,6 @@ SET.IPCFG >PULLW ZPTmpPtr1 dex bpl .3 - >LDYA L.DCB.NIC - >STYA IOCTL+S.IOCTL.BUFPTR - lda S.IOCTL.STATCODE.GETDCB - sta S.IOCTL.STATCODE - - ldx IOCTL.STATUS - jsr SET.IPCFG.IOCTL - - >STYA ZPTmpPtr2 lda DCB.NIC+S.DCB.NIC.FLAGS and #S.DCB.NIC.FLAGS.ARPOFFLOAD beq .4 @@ -56,17 +57,17 @@ SET.IPCFG >PULLW ZPTmpPtr1 * lda S.IOCTL.CTRLCODE.SETDCB same as lda S.IOCTL.STATCODE.GETDCB * sta S.IOCTL.CTRLCODE same as sta S.IOCTL.STATCODE - lda IPCFG+S.IPCFG.HDEV + ldx #IOCTL.CONTROL jsr SET.IPCFG.IOCTL .4 lda hDNSSocket1 beq .41 - jsr SKT.CLOSEA + jsr SKT.Close stz hDNSSocket1 .41 lda hDNSSocket2 beq .42 - jsr SKT.CLOSEA + jsr SKT.Close stz hDNSSocket2 .42 lda IPCFG+S.IPCFG.DNS1 diff --git a/LIB/LIBTCPIP.S.DNS.txt b/LIB/LIBTCPIP.S.DNS.txt index 05deaa93..41cc5fb4 100644 --- a/LIB/LIBTCPIP.S.DNS.txt +++ b/LIB/LIBTCPIP.S.DNS.txt @@ -360,13 +360,13 @@ DNS.FREE ldy #S.DNSCACHE.hNAME DNS.POLL lda hDNSSocket1 beq .8 - jsr SKT.ReadA + jsr SKT.ReadFrame bcs .8 jsr DNS.DecodeMsg lda hDNSSocket2 beq .8 - jsr SKT.ReadA + jsr SKT.ReadFrame bcs .8 jsr DNS.DecodeMsg diff --git a/LIB/LIBTCPIP.S.FRM.txt b/LIB/LIBTCPIP.S.FRM.txt index 81a9039f..907d7bda 100644 --- a/LIB/LIBTCPIP.S.FRM.txt +++ b/LIB/LIBTCPIP.S.FRM.txt @@ -211,7 +211,7 @@ FRM.SendIP ldx #3 Copy SRC.IP even if IP offload bcs FRM.Queue .6 >LDYA ZPFrameOutPtr - jsr FRM.Send.YA + jsr FRM.Send.Out bcs FRM.Queue @@ -240,6 +240,10 @@ FRM.Queue ldy hFrameOut no hFrame, cannot queue for retry sta FRM.QUEUE.Retry,y lda hFrameOut sta FRM.QUEUE.hMem,y + lda ZPFrameOutLen + sta FRM.QUEUE.LenL,x + lda ZPFrameOutLen+1 + sta FRM.QUEUE.LenH,x clc rts @@ -253,6 +257,7 @@ FRM.Retry ldx FRM.QUEUE.Tail lda FRM.QUEUE.hMem,x >SYSCALL GetMemPtr >STYA ZPFrameOutPtr + >STYA IOCTL+S.IOCTL.BUFPTR ldx FRM.QUEUE.Tail lda FRM.QUEUE.State,x @@ -261,8 +266,12 @@ FRM.Retry ldx FRM.QUEUE.Tail jsr IP.SetDestMAC Err is ARP or higher, retry getting MAC bcs .2 still error getting dest MAC -.1 >LDYA ZPFrameOutPtr - jsr FRM.Send.YA try sending again to DRV +.1 lda FRM.QUEUE.LenL,x + sta IOCTL+S.IOCTL.BYTECNT + lda FRM.QUEUE.LenH,x + sta IOCTL+S.IOCTL.BYTECNT+1 + + jsr FRM.Send.IOCTL try sending again to DRV bcc .3 .2 ldx FRM.QUEUE.Tail save error... @@ -284,9 +293,12 @@ FRM.Retry ldx FRM.QUEUE.Tail .8 rts *-------------------------------------- -FRM.Send.YA *****>PUSHYA +FRM.Send.Out >LDYA ZPDataOutPtr + >STYA IOCTL+S.IOCTL.BUFPTR + >LDYA ZPDataOutLen + >STYA IOCTL+S.IOCTL.BYTECNT - >PUSHW L.IOCTL +FRM.Send.IOCTL >PUSHW L.IOCTL >PUSHBI IOCTL.WRITE lda IPCFG+S.IPCFG.HDEV diff --git a/LIB/LIBTCPIP.S.SKT.txt b/LIB/LIBTCPIP.S.SKT.txt index dbb532f4..3979f07b 100644 --- a/LIB/LIBTCPIP.S.SKT.txt +++ b/LIB/LIBTCPIP.S.SKT.txt @@ -120,13 +120,13 @@ SKT.New.Listen sec sec .99 rts */-------------------------------------- -* # SKT.CloseA +* # SKT.Close * Close socket * **In:** * A = hSocket * **Out:** *\-------------------------------------- -SKT.CloseA jsr SKT.GetA.I get SKT in ZPPtrSKT, S.SOCKET.SOCK in A +SKT.Close jsr SKT.Get.I get SKT in ZPPtrSKT, S.SOCKET.SOCK in A bcs .99 cmp #S.SOCKET.SOCK.STREAM @@ -184,14 +184,14 @@ SKT.CloseA jsr SKT.GetA.I get SKT in ZPPtrSKT, S.SOCKET.SOCK in A clc rts */-------------------------------------- -* # SKT.GetA +* # SKT.Get * Get Ptr to socket * **In:** * A = hSocket * **Out:** * Y,A = pS.SOCKET *\-------------------------------------- -SKT.GetA jsr SKT.GetA.I +SKT.Get jsr SKT.Get.I bcs .9 @@ -199,7 +199,7 @@ SKT.GetA jsr SKT.GetA.I .9 rts -SKT.GetA.I and #$7f +SKT.Get.I and #$7f cmp #K.SKTTABLE.SIZE bcs .9 @@ -252,14 +252,14 @@ SKT.GetTable lda hSocketTable clc rts */-------------------------------------- -* # SKT.AcceptA +* # SKT.Accept * Check for an incoming connection * **In:** * A = hListeningSocket * **Out:** * A = hSocket *\-------------------------------------- -SKT.AcceptA jsr SKT.GetA.I +SKT.Accept jsr SKT.Get.I bcs .9 ldy #S.SOCKET.SO lda (ZPPtrSKT),y @@ -293,14 +293,14 @@ SKT.AcceptA jsr SKT.GetA.I sec .9 rts */-------------------------------------- -* # SKT.MkNodA +* # SKT.MkNod * Create a new file from TCP socket * **In:** * A = hSocket * **Out:** * A = hFile *\-------------------------------------- -SKT.MkNodA sta .1+1 +SKT.MkNod sta .1+1 >LDYAI S.FD.SSOCK >SYSCALL getmem0 bcs .9 @@ -348,7 +348,7 @@ SKT.Write >PULLW ZPDataInLen >PULLW ZPDataInPtr >PULLA - jsr SKT.GetA.I + jsr SKT.Get.I bcs .9 cmp #S.SOCKET.SOCK.DGRAM @@ -441,13 +441,13 @@ SKT.Write.TCP ldy #S.SOCKET.TCP.STATUS sec .99 rts */-------------------------------------- -* # SKT.ReadA (DGRAM,RAW) +* # SKT.ReadFrame (DGRAM,RAW) * **In:** * A = hSocket * **Out:** * A = hFrame *\-------------------------------------- -SKT.ReadA jsr SKT.GetA.I +SKT.ReadFrame jsr SKT.Get.I bcs .9 ldy #S.SOCKET.HQ.TAIL @@ -515,7 +515,7 @@ SKT.PutS >PULLW ZPDataOutPtr inc ZPDataInPtr+1 SKT.PutS.1 >PULLA - jsr SKT.GetA.I + jsr SKT.Get.I bcs .9 cmp #S.SOCKET.SOCK.STREAM @@ -578,7 +578,7 @@ SKT.Read clc >PULLW ZPDataOutPtr >PULLA -SKT.Read.I jsr SKT.GetA.I +SKT.Read.I jsr SKT.Get.I bcs .99 cmp #S.SOCKET.SOCK.STREAM bne .90 bad skt diff --git a/LIB/LIBTCPIP.S.txt b/LIB/LIBTCPIP.S.txt index 0714507a..391e46c8 100644 --- a/LIB/LIBTCPIP.S.txt +++ b/LIB/LIBTCPIP.S.txt @@ -56,7 +56,7 @@ CS.START cld .DA GET.IPCFG .DA POLL - .DA PULSEA + .DA PULSE .DA ARP.CLEAR .DA ARP.QUERY @@ -72,20 +72,16 @@ CS.START cld .DA HST.GETBYADDR .DA SKT.New - .DA SKT.CLOSEA - .DA SKT.GETTABLE - .DA SKT.GETA + .DA SKT.Close + .DA SKT.GetTable + .DA SKT.Get - .DA SKT.AcceptA - .DA SKT.MkNodA + .DA SKT.Accept + .DA SKT.MkNod .DA SKT.Write .DA SKT.Read - .DA SKT.ReadA - .DA SKT.PutC - .DA SKT.PutS - .DA SKT.GetC.A - .DA SKT.GetS + .DA SKT.ReadFrame *-------------------------------------- L.IPCFG .DA IPCFG L.ARP.REQ .DA ARP.REQ @@ -185,7 +181,7 @@ POLL >PUSHW L.IOCTL * Expire = every sec * Retry = every 100 msec *-------------------------------------- -PULSEA and #S.EVT.F.T1SEC +PULSE and #S.EVT.F.T1SEC beq .1 jsr ARP.EXPIRE jsr DNS.EXPIRE @@ -278,6 +274,8 @@ FRM.QUEUE.Head .BS 1 FRM.QUEUE.hMem .BS K.FRMQUEUE.SIZE FRM.QUEUE.State .BS K.FRMQUEUE.SIZE FRM.QUEUE.Retry .BS K.FRMQUEUE.SIZE +FRM.QUEUE.LenL .BS K.FRMQUEUE.SIZE +FRM.QUEUE.LenH .BS K.FRMQUEUE.SIZE *-------------------------------------- RefCount .DA #0 hSocketTable .BS 1 diff --git a/README.md b/README.md index 1e87c1cb..235ceff3 100644 --- a/README.md +++ b/README.md @@ -245,9 +245,9 @@ OApple+1,OApple+2,OApple+3 to switch between screens : Kernel Log, text, DHGR. | GETTY | Working | | 0.92 | | LOGIN | In Progress | no auth using /etc/passd yet | 0.92 | | SHELL | Working | (See Internal Shell commands) | 0.92 | -| KCONFIG | Working | Kernel Configuration Utility | 0.9.1 | +| KCONFIG | Working | Kernel Configuration Utility | 0.92 | | ---- | ------ | ------- | ----- | -| TCPIPD | Working | Socket API.ARP,IP,ICMP,UDP & TCP ok | 0.9.1 | +| TCPIPD | Working | Socket API.ARP,IP,ICMP,UDP & TCP ok | 0.92 | | DHCPCLNT| Working | rewritten to use new Socket API | 0.9.1 | | TELNETD | In Progress | | 0.9 | | HTTPD | In Progress | | 0.9 | @@ -297,7 +297,7 @@ note : '$VAR' does NOT expand Variable | DHGR.DRV | Working | 560x192 Mono/16 colors Mixed-Mode support | 0.9.1 | | ---- | ------ | ------- | ----- | | LanCeGS.DRV | Working | | 0.9.1 | -| Uthernet.DRV | Working | | 0.9.1 | +| Uthernet.DRV | Working | | 0.92 | | Uthernet2.DRV | Working | | 0.9.1 | | Uther2.AI.DRV | In Progress | With ARP/IP Offloading | 0.9 | @@ -336,17 +336,17 @@ note : '$VAR' does NOT expand Variable | | | -R : Recurse subdirectories | | | CHGRP | In Progress | -C : Continue On Error | 0.9 | | | | -R : Recurse subdirectories | | -| MD5 | In Progress | -D : String Input | 0.9.1 | +| MD5 | In Progress | -D : String Input | 0.92 | | NSCUTIL | Working | Tool for setting time in NSC/DL1216E | 0.9 | ## Network (TCPIP) tools: | Name | Status | Comment | K.Ver | | ---- | ------ | ------- | ----- | +| IPCONFIG | Working | renamed from NETINFO | 0.92 | +| NETSTAT | Working | | 0.92 | | ARP | Working | dump ARP cache, setup a static ARP entry | 0.9.1 | -| PING | Working | | 0.9.1 | | DNSINFO | Working | dump DNS cache, setup a static DNS entry | 0.9.1 | -| IPCONFIG | Working | renamed from NETINFO | 0.9.1 | -| NETSTAT | Working | | 0.9.1 | +| PING | Working | | 0.9.1 | ## DEV tools: | Name | Status | Comment | K.Ver | diff --git a/SBIN/DHCPCLNT.S.txt b/SBIN/DHCPCLNT.S.txt index 13cf1ea0..76ee4a8c 100644 --- a/SBIN/DHCPCLNT.S.txt +++ b/SBIN/DHCPCLNT.S.txt @@ -4,12 +4,13 @@ AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/SBIN/DHCPCLNT + .TF SBIN/DHCPCLNT *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I - .INB /A2OSX.BUILD/INC/LIBTCPIP.I - .INB /A2OSX.BUILD/INC/NET.DHCP.I + .INB INC/MACROS.I + .INB INC/A2OSX.I + .INB INC/ETH.I + .INB INC/LIBTCPIP.I + .INB INC/NET.DHCP.I *-------------------------------------- TIMEOUT.MAX .EQ 200 20 sec. *-------------------------------------- @@ -241,7 +242,7 @@ CS.QUIT ldy #hSocket lda (pData),y beq .1 - >LIBCALL hLIBTCPIP,LIBTCPIP.SKT.CloseA + >LIBCALL hLIBTCPIP,LIBTCPIP.SKT.Close .1 lda hLIBTCPIP >SYSCALL UnloadLib diff --git a/SBIN/GETTY.S.txt b/SBIN/GETTY.S.txt index ff61e1e0..6e225c50 100644 --- a/SBIN/GETTY.S.txt +++ b/SBIN/GETTY.S.txt @@ -4,11 +4,11 @@ AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/SBIN/GETTY + .TF SBIN/GETTY *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I - .INB /A2OSX.BUILD/INC/NET.TELNET.I + .INB INC/MACROS.I + .INB INC/A2OSX.I + .INB INC/NET.TELNET.I *-------------------------------------- TIMEOUT.MAX .EQ 100 1 sec. *-------------------------------------- diff --git a/SBIN/GUI.S.txt b/SBIN/GUI.S.txt index 2fe29b22..24555502 100644 --- a/SBIN/GUI.S.txt +++ b/SBIN/GUI.S.txt @@ -4,13 +4,13 @@ AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/SBIN/GUI/GUI + .TF SBIN/GUI/GUI *-------------------------------------- - .INB /A2OSX.BUILD/INC/IO.I - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I - .INB /A2OSX.BUILD/INC/GUI.I - .INB /A2OSX.BUILD/INC/LIBGUI.I + .INB INC/IO.I + .INB INC/MACROS.I + .INB INC/A2OSX.I + .INB INC/GUI.I + .INB INC/LIBGUI.I *-------------------------------------- ZPPtr1 .EQ ZPBIN *-------------------------------------- diff --git a/SBIN/HTTPD.S.txt b/SBIN/HTTPD.S.txt index 5a166477..501a5f4a 100644 --- a/SBIN/HTTPD.S.txt +++ b/SBIN/HTTPD.S.txt @@ -4,11 +4,11 @@ AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/SBIN/HTTPD + .TF SBIN/HTTPD *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I - .INB /A2OSX.BUILD/INC/LIBTCPIP.I + .INB INC/MACROS.I + .INB INC/A2OSX.I + .INB INC/LIBTCPIP.I *-------------------------------------- TIMEOUT.MAX .EQ 30 30 sec. CONN.MAX .EQ 16 diff --git a/SBIN/KCONFIG.S.txt b/SBIN/KCONFIG.S.txt index c8bcb6f5..0b99685a 100644 --- a/SBIN/KCONFIG.S.txt +++ b/SBIN/KCONFIG.S.txt @@ -6,10 +6,10 @@ AUTO 6 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/SBIN/KCONFIG + .TF SBIN/KCONFIG *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I + .INB INC/MACROS.I + .INB INC/A2OSX.I *-------------------------------------- ZPCfgPtr .EQ ZPBIN ZPTmp1 .EQ ZPBIN+2 diff --git a/SBIN/NFSD.S.txt b/SBIN/NFSD.S.txt index c5bae6e3..f7656365 100644 --- a/SBIN/NFSD.S.txt +++ b/SBIN/NFSD.S.txt @@ -6,11 +6,11 @@ AUTO 6 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/SBIN/NFSD + .TF SBIN/NFSD *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I - .INB /A2OSX.BUILD/INC/LIBTCPIP.I + .INB INC/MACROS.I + .INB INC/A2OSX.I + .INB INC/LIBTCPIP.I *-------------------------------------- TIMEOUT.MAX .EQ 30 30 sec. *-------------------------------------- diff --git a/SBIN/SHELL.S.txt b/SBIN/SHELL.S.txt index 24979282..80da4c8a 100644 --- a/SBIN/SHELL.S.txt +++ b/SBIN/SHELL.S.txt @@ -4,11 +4,11 @@ AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/SBIN/SHELL + .TF SBIN/SHELL *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I - .INB /A2OSX.BUILD/INC/MLI.ERR.I + .INB INC/MACROS.I + .INB INC/A2OSX.I + .INB INC/MLI.ERR.I *-------------------------------------- ZPPtr1 .EQ ZPBIN ZPPtr2 .EQ ZPBIN+2 diff --git a/SBIN/TCPIPD.S.CFG.txt b/SBIN/TCPIPD.S.CFG.txt index a50b470c..abbd3780 100644 --- a/SBIN/TCPIPD.S.CFG.txt +++ b/SBIN/TCPIPD.S.CFG.txt @@ -1,8 +1,6 @@ -PR#3 -PREFIX /A2OSX.BUILD NEW -INC 1 -AUTO 6 +PREFIX /A2OSX.BUILD +AUTO 4,1 .LIST OFF *-------------------------------------- CFG.Read >PUSHW L.HOSTNAME @@ -12,7 +10,27 @@ CFG.Read >PUSHW L.HOSTNAME jsr CFG.Read.HOSTNAME jsr CFG.Read.Result - >PUSHW L.TCPIP.CONF + lda IPCFG+S.IPCFG.HOSTNAME + bne .4 + + ldy DefaultHostName + +.2 lda DefaultHostName,y + sta IPCFG+S.IPCFG.HOSTNAME,y + dey + bpl .2 + +.3 lda A2osX.TIMER16 + jsr CFG.A2CharAX + sta IPCFG+S.IPCFG.HOSTNAME+7 + stx IPCFG+S.IPCFG.HOSTNAME+8 + + lda A2osX.TIMER16+1 + jsr CFG.A2CharAX + sta IPCFG+S.IPCFG.HOSTNAME+9 + stx IPCFG+S.IPCFG.HOSTNAME+10 + +.4 >PUSHW L.TCPIP.CONF >LDYA L.MSG.CFG >SYSCALL printf @@ -336,6 +354,24 @@ CFG.Dec2Hex sec .8 clc rts *-------------------------------------- +CFG.A2CharAX pha + lsr + lsr + lsr + lsr + ora #$30 + cmp #'9'+1 + bcc .1 + adc #6 +.1 tax + pla + and #$0F + ora #$30 + cmp #'9'+1 + bcc .8 + adc #6 +.8 rts +*-------------------------------------- MAN SAVE /A2OSX.SRC/SBIN/TCPIPD.S.CFG LOAD /A2OSX.SRC/SBIN/TCPIPD.S diff --git a/SBIN/TCPIPD.S.txt b/SBIN/TCPIPD.S.txt index c9c2fa92..97b7baf5 100644 --- a/SBIN/TCPIPD.S.txt +++ b/SBIN/TCPIPD.S.txt @@ -4,13 +4,13 @@ AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/SBIN/TCPIPD + .TF SBIN/TCPIPD *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I - .INB /A2OSX.BUILD/INC/ETH.I - .INB /A2OSX.BUILD/INC/LIBTCPIP.I - .INB /A2OSX.BUILD/INC/MLI.ERR.I + .INB INC/MACROS.I + .INB INC/A2OSX.I + .INB INC/ETH.I + .INB INC/LIBTCPIP.I + .INB INC/MLI.ERR.I *-------------------------------------- ZPIPCfgPtr .EQ ZPBIN ZPDevStatusPtr .EQ ZPBIN+2 @@ -57,27 +57,7 @@ CS.INIT >LDYA L.LIBTCPIP jsr CFG.Read continue even if error opening CFG file - lda IPCFG+S.IPCFG.HOSTNAME - bne .4 - - ldy DefaultHostName - -.2 lda DefaultHostName,y - sta IPCFG+S.IPCFG.HOSTNAME,y - dey - bpl .2 - -.3 lda A2osX.TIMER16 - jsr A2CharAX - sta IPCFG+S.IPCFG.HOSTNAME+7 - stx IPCFG+S.IPCFG.HOSTNAME+8 - - lda A2osX.TIMER16+1 - jsr A2CharAX - sta IPCFG+S.IPCFG.HOSTNAME+9 - stx IPCFG+S.IPCFG.HOSTNAME+10 - -.4 >PUSHW L.IPCFG + >PUSHW L.IPCFG >LIBCALL hLIBTCPIP,LIBTCPIP.SET.IPCFG lda (pPs) @@ -97,6 +77,7 @@ CS.INIT.DEV >LDYA L.DEVNAME >LDYA L.MSG.DEV.KO >SYSCALL printf + lda #MLI.E.NODEV sec rts @@ -113,25 +94,6 @@ CS.INIT.DEV >LDYA L.DEVNAME >PUSHBI IOCTL.OPEN >LDA.G hDev >SYSCALL IOCTL - bcs .9 - - >LDA.G hDev - sdfsdfsdfsf >SYSCALL GetDevStatus - - bcs .9 - >STYA ZPDevStatusPtr - - ldy #S.DIB+2 MAC - ldx #S.IPCFG.MAC - -.2 lda (ZPDevStatusPtr),y - sta IPCFG,x - iny - inx - cpx #S.IPCFG.MAC+6 - bne .2 - - clc rts .9 sec @@ -143,7 +105,7 @@ CS.RUN >LIBCALL hLIBTCPIP,LIBTCPIP.POLL *-------------------------------------- CS.DOEVENT lda (pEvent) bpl .9 - >LIBCALL hLIBTCPIP,LIBTCPIP.PULSEA + >LIBCALL hLIBTCPIP,LIBTCPIP.PULSE .9 sec never discard TIME event rts @@ -160,24 +122,6 @@ CS.QUIT >LDA.G hDev >SYSCALL UnloadLib clc rts -*-------------------------------------- -A2CharAX pha - lsr - lsr - lsr - lsr - ora #$30 - cmp #'9'+1 - bcc .1 - adc #6 -.1 tax - pla - and #$0F - ora #$30 - cmp #'9'+1 - bcc .8 - adc #6 -.8 rts *-------------------------------------- .INB /A2OSX.SRC/SBIN/TCPIPD.S.CFG *-------------------------------------- diff --git a/SBIN/TELNETD.S.txt b/SBIN/TELNETD.S.txt index cf05ea48..94627b00 100644 --- a/SBIN/TELNETD.S.txt +++ b/SBIN/TELNETD.S.txt @@ -6,11 +6,11 @@ AUTO 6 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/SBIN/TELNETD + .TF SBIN/TELNETD *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I - .INB /A2OSX.BUILD/INC/LIBTCPIP.I + .INB INC/MACROS.I + .INB INC/A2OSX.I + .INB INC/LIBTCPIP.I *-------------------------------------- TIMEOUT.MAX .EQ 30 30 sec. CONN.MAX .EQ 16 diff --git a/SYS/KERNEL.S.INIT.txt b/SYS/KERNEL.S.INIT.txt index 661736b4..e1e25325 100644 --- a/SYS/KERNEL.S.INIT.txt +++ b/SYS/KERNEL.S.INIT.txt @@ -805,7 +805,7 @@ DevMgrInit >LDYAI MSG.DEV .6 jsr DevMgrInit.BLK lda #A2osX.S.BLK -.7 ldx FD.BDEV+S.FD.DEV.DEVID +.7 ldx FD.BDEV+S.FD.DEV.BUSID sta A2osX.S,x .8 dec DevMgrInit.DEVCNT diff --git a/SYS/KM.APPLETALK.S.txt b/SYS/KM.APPLETALK.S.txt index 99269e67..2da3102f 100644 --- a/SYS/KM.APPLETALK.S.txt +++ b/SYS/KM.APPLETALK.S.txt @@ -6,12 +6,12 @@ AUTO 6 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/SYS/KM.APPLETALK + .TF SYS/KM.APPLETALK *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/IO.I - .INB /A2OSX.BUILD/INC/MONITOR.I - .INB /A2OSX.BUILD/INC/PRODOS.I + .INB INC/MACROS.I + .INB INC/IO.I + .INB INC/MONITOR.I + .INB INC/PRODOS.I *-------------------------------------- TmpPtr1 .EQ $0 *-------------------------------------- diff --git a/SYS/KM.NSC.S.txt b/SYS/KM.NSC.S.txt index 952fc7df..d53b3f49 100644 --- a/SYS/KM.NSC.S.txt +++ b/SYS/KM.NSC.S.txt @@ -6,12 +6,12 @@ AUTO 6 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/SYS/KM.NSC + .TF SYS/KM.NSC *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/IO.I - .INB /A2OSX.BUILD/INC/MONITOR.I - .INB /A2OSX.BUILD/INC/PRODOS.I + .INB INC/MACROS.I + .INB INC/IO.I + .INB INC/MONITOR.I + .INB INC/PRODOS.I *-------------------------------------- TmpPtr1 .EQ $0 TmpPtr2 .EQ $2 diff --git a/SYS/KM.RAMWORKS.S.txt b/SYS/KM.RAMWORKS.S.txt index 171f327d..64a17bba 100644 --- a/SYS/KM.RAMWORKS.S.txt +++ b/SYS/KM.RAMWORKS.S.txt @@ -6,13 +6,13 @@ AUTO 6 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/SYS/KM.RAMWORKS + .TF SYS/KM.RAMWORKS *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/IO.I - .INB /A2OSX.BUILD/INC/MONITOR.I - .INB /A2OSX.BUILD/INC/PRODOS.I - .INB /A2OSX.BUILD/INC/MLI.ERR.I + .INB INC/MACROS.I + .INB INC/IO.I + .INB INC/MONITOR.I + .INB INC/PRODOS.I + .INB INC/MLI.ERR.I *-------------------------------------- TmpPtr1 .EQ $0 TmpPtr2 .EQ $2 diff --git a/SYS/KM.VSDRIVE.S.txt b/SYS/KM.VSDRIVE.S.txt index 03d3694b..a6dcece6 100644 --- a/SYS/KM.VSDRIVE.S.txt +++ b/SYS/KM.VSDRIVE.S.txt @@ -4,14 +4,14 @@ AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/SYS/KM.VSDRIVE + .TF SYS/KM.VSDRIVE *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/IO.I - .INB /A2OSX.BUILD/INC/MONITOR.I - .INB /A2OSX.BUILD/INC/PRODOS.I - .INB /A2OSX.BUILD/INC/MLI.ERR.I - .INB /A2OSX.BUILD/INC/COM.6551.I + .INB INC/MACROS.I + .INB INC/IO.I + .INB INC/MONITOR.I + .INB INC/PRODOS.I + .INB INC/MLI.ERR.I + .INB INC/COM.6551.I *-------------------------------------- TmpPtr1 .EQ $0 ADT.CMD.VSD .EQ $C5 "E": Virtual Drive Command Envelope diff --git a/TEST.S.txt b/TEST.S.txt index 73635f2c..2bd609c4 100644 --- a/TEST.S.txt +++ b/TEST.S.txt @@ -4,11 +4,11 @@ AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 - .TF /A2OSX.BUILD/ROOT/TEST + .TF ROOT/TEST *-------------------------------------- - .INB /A2OSX.BUILD/INC/MACROS.I - .INB /A2OSX.BUILD/INC/A2OSX.I - .INB /A2OSX.BUILD/INC/LIBPAK.I + .INB INC/MACROS.I + .INB INC/A2OSX.I + .INB INC/LIBPAK.I *-------------------------------------- ZPPakHdrPtr .EQ ZPBIN ZPPakDataPtr .EQ ZPBIN+2