diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index 241e0cd9..36223e9b 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 6d3dca31..6d0b13d1 100644 Binary files a/.Floppies/A2OSX.SRC.po and b/.Floppies/A2OSX.SRC.po differ diff --git a/BIN/FORMAT.S.txt b/BIN/FORMAT.S.txt index 9a746e0f..7935f282 100644 --- a/BIN/FORMAT.S.txt +++ b/BIN/FORMAT.S.txt @@ -42,8 +42,9 @@ L.MSG.ERR .DA MSG.ERR *-------------------------------------- CS.INIT ldy #S.PS.ARGC lda (pPs),y - beq .90 - + cmp #2 + bcc .90 + .1 >INC.G ArgIndex >SYSCALL ArgV @@ -111,14 +112,11 @@ CS.INIT ldy #S.PS.ARGC .8 >LDYA L.LIBBLKDEV >SYSCALL LoadLib + bcs .9 sta hLIBBLKDEV -* lda (pPs) -* ora #S.PS.F.EVENT Now accept events -* sta (pPs) - clc - rts +.9 rts .99 >PUSHBI 0 >LDYA L.MSG.USAGE @@ -326,7 +324,7 @@ MSG.OK .AZ "[OK]" MSG.ERR .AZ "[%h]\r\n" MSG.INIT .AZ "Formatting %s (%D Blks),Volname:%s..." *-------------------------------------- -LIBBLKDEV .AZ "libblkdev.o" +LIBBLKDEV .AZ "libblkdev" BLANK .AZ "BLANK" hLIBBLKDEV .BS 1 *-------------------------------------- diff --git a/BIN/MORE.S.txt b/BIN/MORE.S.txt new file mode 100644 index 00000000..aeb0ed34 --- /dev/null +++ b/BIN/MORE.S.txt @@ -0,0 +1,239 @@ +NEW +PREFIX /A2OSX.BUILD +AUTO 4,1 + .LIST OFF + .OP 65C02 + .OR $2000 + .TF BIN/MORE +*-------------------------------------- + .INB INC/MACROS.I + .INB INC/A2OSX.I + .INB INC/MLI.I + .INB INC/MLI.E.I +*-------------------------------------- +ZPPTR1 .EQ ZPBIN +ZPBufPtr .EQ ZPBIN+2 +*-------------------------------------- +* File Header (16 Bytes) +*-------------------------------------- +CS.START cld + jmp (.1,x) + .DA #$61 6502,Level 1 (65c02) + .DA #1 BIN Layout Version 1 + .DA #S.PS.F.EVENT S.PS.F + .DA #0 + .DA CS.END-CS.START CS + .DA DS.END-DS.START DS + .DA #16 SS + .DA #4 ZP + .DA 0 +*-------------------------------------- +* Relocation Table +*-------------------------------------- +.1 .DA CS.INIT + .DA CS.RUN + .DA CS.DOEVENT + .DA CS.QUIT +L.MSG.USAGE .DA MSG.USAGE +L.MSG.LINENUM .DA MSG.LINENUM + .DA 0 +*-------------------------------------- +CS.INIT clc + rts +*-------------------------------------- +CS.RUN +.1 >INC.G ArgCount + >SYSCALL ArgV + bcs .7 + + >STYA ZPPtr1 + + lda (ZPPtr1) + cmp #'-' + bne .4 + + ldy #1 + lda (ZPPtr1),y + + ldx OptionList + +.2 cmp OptionList,x + beq .3 + dex + bne .2 + +.99 >PUSHBI 0 + >LDYA L.MSG.USAGE + >SYSCALL printf + lda #E.SYN + sec +.9 rts + +.3 ldy OptionVars-1,x + lda #$80 + sta (pData),y + bra .1 + +.4 >LDA.G hFile + bne .99 + + jsr CS.RUN.OPEN + bcs .9 + >STA.G hFile + + bra .1 scan for any other args + +.7 >LDA.G bHelp + beq .8 + jsr .99 + lda #0 + rts + +.8 >LDYAI 256 + >SYSCALL GetMem + bcs .9 + + >STYA ZPBufPtr + txa + >STA.G hBuf + +CS.RUN.LOOP >SLEEP + + >LDA.G hFILE + beq .11 + + >SYSCALL GetChar + bcs .10 no char + + cmp #$03 Ctrl-C + beq .9 Abort.... + + cmp #$13 Ctrl-S + bne .10 + + >LDA.G bPause + eor #$ff + sta (pData),y + bne .8 + +.10 >LDA.G bPause + bne .8 Pause... + + >LDA.G hFile + bra .12 + +.11 ldy #S.PS.hStdIn + lda (pPS),y + bra .12 + +.12 pha + >PUSHWI 256 + >PUSHW ZPBufPtr + pla + >SYSCALL fgets + >DEBUG + bcs .13 + + >LDYA ZPBufPtr + >SYSCALL puts + + >INC.G LineCount + cmp #20 + bne .8 + lda #0 + sta (pData),y + + dec + >STA.G bPause + +.8 jmp CS.RUN.LOOP + +.13 cmp #MLI.E.EOF + bne .9 + + lda #0 Exit with no Error +.9 sec + rts +*-------------------------------------- +CS.RUN.OPEN >SYSCALL RealPath + bcs .9 + phx save hMem + pha + + >PUSHWI 0 Aux type + >PUSHBI S.FI.T.TXT + >PUSHBI O.RDONLY+O.TEXT + + pla + + >SYSCALL FOpen + plx + bcs .99 + pha + jsr .99 + pla + clc + rts + +.99 pha + txa + >SYSCALL FreeMem + pla + sec +.9 rts +*-------------------------------------- +CS.RUN.PRINTNUM clc + >LDA.G bLineNum + bpl .8 + + >PUSHW.G LineNum + + >PUSHBI 2 + >LDYA L.MSG.LINENUM + >SYSCALL printf +.8 rts +*-------------------------------------- +CS.QUIT >LDA.G hBuf + beq .1 + + >SYSCALL FreeMem + +.1 >LDA.G hFILE + beq .8 + + >SYSCALL FClose + +.8 clc + rts +*-------------------------------------- +CS.DOEVENT sec + rts +*-------------------------------------- +CS.END +*-------------------------------------- +OptionList >PSTR "NnHh" +OptionVars .DA #bLineNum,#bLineNum,#bHelp,#bHelp +*-------------------------------------- +MSG.USAGE .AS "Usage : MORE \r\n" + .AS " -H : This Help Screen\r\n" + .AZ " -N : Number all output lines\r\n" +MSG.LINENUM .AZ "%5D:" +*-------------------------------------- + .DUMMY + .OR 0 +DS.START +ArgCount .BS 1 +hFile .BS 1 +LineCount .BS 1 +LineNum .BS 2 +bPause .BS 1 +bLineNum .BS 1 +bHelp .BS 1 +ArgIndex .BS 1 +hBuf .BS 1 +DS.END + .ED +*-------------------------------------- +MAN +SAVE /A2OSX.SRC/BIN/MORE.S +ASM diff --git a/BIN/PING.S.txt b/BIN/PING.S.txt index ec06ee29..83aec0e4 100644 --- a/BIN/PING.S.txt +++ b/BIN/PING.S.txt @@ -159,20 +159,25 @@ CS.RUN.OPENSKT ldx #3 >PUSHBI S.IP.PROTOCOL.ICMP lda #S.SOCKET.T.RAW >LIBCALL hLIBTCPIP,LIBTCPIP.socket - bcc .2 + bcs .9 - >LDYA L.MSG.SKTKO - >SYSCALL puts - lda #E.SYN - sec - rts - -.2 >STA.G hSocket + >STA.G hSocket pha >PUSHW L.SA.LOCAL pla >LIBCALL hLIBTCPIP,LIBTCPIP.Bind + bcs .9 + + >PUSHW L.SA.REMOTE + >LDA.G hSocket + >LIBCALL hLIBTCPIP,LIBTCPIP.Connect + bcc CS.RUN.SEND.ECHO + +.9 >LDYA L.MSG.SKTKO + >SYSCALL puts + lda #E.SYN + sec rts CS.RUN.SEND.ECHO diff --git a/BIN/X.CPMVRM.S.txt b/BIN/X.CPMVRM.S.txt index 2f337626..c95c0f27 100644 --- a/BIN/X.CPMVRM.S.txt +++ b/BIN/X.CPMVRM.S.txt @@ -240,8 +240,7 @@ CS.RUN >SYSCALL GetChar >LDA.G bRecurse bpl CS.RUN.NEXT - ldy #1 - lda (ZPFileName),y + lda (ZPFileName) cmp #'.' beq CS.RUN.NEXT Skip "." & ".." diff --git a/INC/A2osX.I.txt b/INC/A2osX.I.txt index 5cf83d99..34545614 100644 --- a/INC/A2osX.I.txt +++ b/INC/A2osX.I.txt @@ -93,7 +93,7 @@ E.FTB .EQ $CC File Too Big Error *-------------------------------------- * A2osX.SYSCALL Constants *-------------------------------------- -C.EOF .EQ 4 +C.EOF .EQ 4 Ctrl-D C.ENQ .EQ 5 C.BS .EQ 8 C.LF .EQ 10 diff --git a/LIB/LIBBLKDEV.S.txt b/LIB/LIBBLKDEV.S.txt index bf3743a6..d2239e4e 100644 --- a/LIB/LIBBLKDEV.S.txt +++ b/LIB/LIBBLKDEV.S.txt @@ -4,7 +4,7 @@ AUTO 4,1 .LIST OFF .OP 65C02 .OR $2000 - .TF LIB/LIBBLKDEV.O + .TF LIB/LIBBLKDEV *-------------------------------------- .INB INC/MACROS.I .INB INC/A2OSX.I