Kernel 0.94

BIN/LS.S.txt

@@ -27,7 +27,7 @@ ZPFileStat		.BS 2
 
 ZPPW			.BS 2
 
-bToDev			.BS 1
+bCRLF			.BS 1
 hLineBuf		.BS 1
 ZPLineBuf		.BS 2
 ZS.END
@@ -144,12 +144,14 @@ CS.RUN
 				lda OF.Table.hFD-1,x
 				>SYSCALL GetMemPtr
 				>STYA ZPPtr1
+
 				lda (ZPPtr1)			S.FD.T
 				beq CS.RUN.LOOP			S.FD.T.REG
+
 				cmp #S.FD.T.PIPE
 				beq CS.RUN.LOOP
 				
-				dec bToDev
+				dec bCRLF
 *--------------------------------------
 CS.RUN.LOOP		ldy #S.PS.hStdIn
 				lda (pPS),y
@@ -625,25 +627,6 @@ CS.RUN.UpdateColCnt
 				sta (pData),y
 				bra CS.RUN.NewLine.1
 *--------------------------------------
-CS.RUN.NewLine	>LDA.G ColCount
-				beq CS.RUN.NewLine.8
-CS.RUN.NewLine.1
-				bit bToDev
-				bpl CS.RUN.NewLine.CR
-				
-				>PUSHW L.MSG.CRLF
-				>PUSHBI 0
-				>SYSCALL PrintF
-				rts
-				
-CS.RUN.NewLine.CR
-				lda #C.CR
-				>SYSCALL putchar
-				rts
-CS.RUN.NewLine.8
-				clc
-				rts
-*--------------------------------------
 CS.RUN.ENTER.MSG
 				>PUSHW L.MSG.ENTER
 				ldy #hSrcBasePath
@@ -653,6 +636,23 @@ CS.RUN.ENTER.MSG
 				>PUSHBI 2
 				
 				>SYSCALL PrintF
+				bcc	CS.RUN.NewLine.1
+				rts
+*--------------------------------------
+CS.RUN.NewLine	>LDA.G ColCount
+				beq CS.RUN.NewLine.8
+CS.RUN.NewLine.1
+				lda #C.CR
+				>SYSCALL putchar
+				
+				bit bCRLF
+				bpl CS.RUN.NewLine.8
+				
+				lda #C.LF
+				>SYSCALL putchar
+
+CS.RUN.NewLine.8
+				clc
 				rts
 *--------------------------------------
 CS.DOEVENT		sec
@@ -762,7 +762,7 @@ MSG.DIR			.AZ "\e[32m%s/\e[0m"
 MSG.DIREXT		.AZ "%s %6s %6s            %s %s  <dir>   \e[32m%s/\e[0m"
 MSG.BDEV		.AZ "\e[32m%s/\e[0m"
 MSG.BDEVEXT		.AZ "/%15s S%dD%d Blocks Used:%5D Total:%5D"
-MSG.ENTER		.AS "Directory:%s"
+MSG.ENTER		.AZ "Directory:%s"
 MSG.CRLF		.AZ "\r\n"
 *--------------------------------------
 PRODOS.FT.HEX	.HS 0406FAFCFDE2CBCCCFFF

BIN/MORE.S.txt

@@ -5,11 +5,11 @@ NEW
 				.OR	$2000
 				.TF bin/more
 *--------------------------------------
-				.INB INC/MACROS.I
-				.INB INC/A2OSX.I
-				.INB INC/KERNEL.I
-				.INB INC/MLI.I
-				.INB INC/MLI.E.I
+				.INB inc/macros.i
+				.INB inc/a2osx.i
+				.INB inc/kernel.i
+				.INB inc/mli.i
+				.INB inc/mli.e.i
 *--------------------------------------
 PG.SIZE			.EQ 23
 *--------------------------------------
@@ -296,5 +296,5 @@ DS.END
 				.ED
 *--------------------------------------
 MAN
-SAVE USR/SRC/BIN/MORE.S
+SAVE usr/src/bin/more.s
 ASM