FIX for:

- HTTPD not reading httpf.conf properly
- ASICFX FORMAT crashing when formatting remapped devices
- KERNEL terminal IAC handling

BASIC.FX/BASIC.S.C.txt

@@ -1607,13 +1607,13 @@ BS.KW.FORMAT	ldx #BSX.FMT.CheckP.X
 				sta ZP.BUFPTR+1			fake Buffer for status & format
 				stz ZP.BUFPTR
 
+				jsr .2					A = cmd = 0 = status
+				bcs .99
+				
 				lda GP.FoundBITS+1
 				and #CMDBITS1.B
 				bne .1
 
-				jsr .2					A = cmd = 0 = status
-				bcs .19
-				
 				stx GP.ParamB
 				sty GP.ParamB+1
 				stz GP.ParamB+2
@@ -1622,9 +1622,9 @@ BS.KW.FORMAT	ldx #BSX.FMT.CheckP.X
 
 				jsr .2
 
-				bcc BS.KW.FORMAT.CAT
+				bra BS.KW.FORMAT.CAT	ignore if not supported by HW
 
-.19				lda #BS.E.IO
+.99				lda #BS.E.IO
 				rts
 
 .2				sta ZP.CMD
@@ -1636,7 +1636,16 @@ BS.KW.FORMAT	ldx #BSX.FMT.CheckP.X
 				lsr
 				lsr
 				tax						000DSSS0
-				jmp (MLI.DEVPTRS,x)
+				
+				bit IO.RRAMWRAMBNK1
+				bit IO.RRAMWRAMBNK1
+				
+				jsr .3
+				
+				bit IO.RROMBNK1
+				rts
+
+.3				jmp (MLI.DEVPTRS,x)
 *--------------------------------------
 * Format Disk II
 *--------------------------------------
@@ -1661,10 +1670,6 @@ BS.KW.FORMAT	ldx #BSX.FMT.CheckP.X
 				ldx #BSX.FMT.D2.X
 				jsr BS.ToAUX
 				bcs .99
-
-				bra BS.KW.FORMAT.CAT
-
-.99				rts
 *--------------------------------------
 BS.KW.FORMAT.CAT
 				lda #2					512 bytes buffers

SBIN/HTTPD.S.txt

@@ -217,14 +217,13 @@ CS.RUN.CONF		>PUSHW L.ETCHTTPDCONF
 
 .1				>PUSHB hFile
 				>PUSHW ZPLinePtr
-				>PUSHWI 256
+				>PUSHWI 255
 				>SYSCALL FGetS
 				bcs .8
 
-				tya
-				beq .1
-
 				lda (ZPLinePtr)
+				beq .1
+				
 				cmp #'#'
 				beq .1
 
@@ -744,7 +743,7 @@ CS.END
 *--------------------------------------
 hLIBTCPIP		.BS 1
 LIBTCPIP		.AZ "libtcpip"
-ETCHTTPDCONF	.AZ "${BOOT}etc/httpd.conf"
+ETCHTTPDCONF	.AZ "${ROOT}etc/httpd.conf"
 *--------------------------------------
 KEYWORDS.CONF	.AS "ServerName "
 				.AS "Listen "
@@ -756,10 +755,10 @@ MSG.TCPIPERR	.CZ "HTTPD:TCP/IP Not initialized properly."
 MSG.INITCONF	.CZ "HTTPD:Reading %s file...\r\n"
 MSG.INITOK		.CZ "HTTPD:Listening on port %D, root dir: %s.\r\n"
 MSG.SKTERR		.CZ "HTTPD:Skt Bind Error."
-MSG.INCOMING	.CZ "HTTPD:Skt $%h Opened From %d.%d.%d.%d\r\n"
+MSG.INCOMING	.CZ "HTTPD:Skt %h Opened From %d.%d.%d.%d\r\n"
-MSG.REQ			.CZ "HTTPD:Req $%h From Skt $%h\r\n"
+MSG.REQ			.CZ "HTTPD:Req %h From Skt %h\r\n"
-MSG.FILE		.CZ "HTTPD:Skt $%h File %s\r\n"
+MSG.FILE		.CZ "HTTPD:Skt %h File %s\r\n"
-MSG.SKTCLOSE	.CZ "HTTPD:Skt $%h Close\r\n"
+MSG.SKTCLOSE	.CZ "HTTPD:Skt %h Close\r\n"
 *--------------------------------------
 KEYWORDS.REQ	.AS "GET "
 				.AS "Connection: "

SYS/KERNEL.S.TERMX.txt

@@ -473,7 +473,7 @@ TERMX.CSI		ldy #S.DCB.TTY.INBUF
 				cpy #S.DCB.TTY.INBUF.MAX-1	buffer full?
 				bne .8
 
-				jsr RESET.MODE
+				jsr TERMX.M0
 
 .8				clc
 				rts
@@ -516,7 +516,7 @@ TERMX.CSI.Exec	stz CsiH
 				cmp #';'
 				beq .1
 
-.5				jsr RESET.MODE
+.5				jsr TERMX.M0
 
 				lda (ZPPtr2)
 				ldx #CsiCodes.Cnt-1
@@ -717,17 +717,17 @@ TERMX.CUx		ldy #1
 				beq .8
 
 .1				lda .80,x
-				sta .2+1
+				sta .3+1
 				lda .80+1,x
-				sta .2+2
+				sta .3+2
 
-				phy
+.2				phy
 
-.2				jsr $FFFF				SELF MODIFIED
+.3				jsr $FFFF				SELF MODIFIED
 
 				ply
 				dey
-				bne .1
+				bne .2
 
 .8				clc
 				rts
@@ -829,17 +829,17 @@ TERMX.IAC		ldy #S.DCB.TTY.INBUF
 				cmp #SE
 				bne TERMX.HOME.8		wait for ending SE....keep bIACMode
 
-				bra COUT.IAC.SB
+				bra TERMX.IAC.SB
 
 				ldy #S.DCB.TTY.INBUF+1
 				lda (ZPDCBPtr),y		get back CMD
 
 .1				cmp #IAC
-				beq COUT.IAC.SB.9
+				beq TERMX.IAC.SB.9
 
 				sec
 				sbc #WILL
-				bcc COUT.IAC.SB.9
+				bcc TERMX.IAC.SB.9
 
 				asl
 				tax
@@ -849,21 +849,21 @@ TERMX.IAC		ldy #S.DCB.TTY.INBUF
 
 				jmp (.8,x)
 
-.8				.DA COUT.IAC.WILL
+.8				.DA TERMX.IAC.WILL
-				.DA COUT.IAC.WONT
+				.DA TERMX.IAC.WONT
-				.DA COUT.IAC.DO
+				.DA TERMX.IAC.DO
-				.DA COUT.IAC.DONT
+				.DA TERMX.IAC.DONT
 *--------------------------------------
-COUT.IAC.SB		ldy #S.DCB.TTY.INBUF+2
+TERMX.IAC.SB		ldy #S.DCB.TTY.INBUF+2
 				lda (ZPDCBPtr),y			Get SUBCMD in A
 
 				cmp #TN.O.TTYPE
-				bne COUT.IAC.SB.9
+				bne TERMX.IAC.SB.9
 
 				iny
 				lda (ZPDCBPtr),y
 				cmp #SB.SEND
-				bne COUT.IAC.SB.9
+				bne TERMX.IAC.SB.9
 
 				ldx #0
 
@@ -873,9 +873,9 @@ COUT.IAC.SB		ldy #S.DCB.TTY.INBUF+2
 				cpx #SB.IS.TTYPE.LEN
 				bne .1
 
-COUT.IAC.SB.9	bra COUT.IAC.EXIT
+TERMX.IAC.SB.9	bra TERMX.M0
 *--------------------------------------
-COUT.IAC.WILL	ldx #WILLDO.CNT-1
+TERMX.IAC.WILL	ldx #WILLDO.CNT-1
 
 .1				cmp WILLDO,x
 				beq .7
@@ -886,20 +886,17 @@ COUT.IAC.WILL	ldx #WILLDO.CNT-1
 				ldx #WILLDONT.CNT-1
 
 .2				cmp WILLDONT,x
-				beq .8
+				beq TERMX.IAC.WONT		Send DONT
 
 				dex
 				bpl .2
 
-				bra COUT.IAC.EXIT
+				bra TERMX.M0
 
 .7				ldx #DO
-				.HS 2C					BIT ABS
+				bra TERMX.IAC.SendAX
-.8				ldx #DONT
-
-				bra COUT.IAC.SendAX
 *--------------------------------------
-COUT.IAC.DO		ldx #DOWILL.CNT-1
+TERMX.IAC.DO	ldx #DOWILL.CNT-1
 
 .1				cmp DOWILL,x
 				beq .7
@@ -910,18 +907,22 @@ COUT.IAC.DO		ldx #DOWILL.CNT-1
 				ldx #DOWONT.CNT-1
 
 .2				cmp DOWONT,x
-				beq .8
+				beq TERMX.IAC.DONT		Send WONT
 
 				dex
 				bpl .2
 
-				bra COUT.IAC.EXIT
+				bra TERMX.M0
 
 .7				ldx #WILL
 				.HS 2C					BIT ABS
-.8				ldx #WONT
 *--------------------------------------
-COUT.IAC.SendAX
+TERMX.IAC.DONT	ldx #WONT
+				.HS 2C					BIT ABS
+*--------------------------------------
+TERMX.IAC.WONT	ldx #DONT
+*--------------------------------------
+TERMX.IAC.SendAX
 				pha						push CMD
 				phx
 				lda #IAC
@@ -931,13 +932,7 @@ COUT.IAC.SendAX
 				pla
 				jsr TERMX.COUT
 *--------------------------------------
-COUT.IAC.WONT
+TERMX.M0		lda #0
-*--------------------------------------
-COUT.IAC.DONT
-*--------------------------------------
-COUT.IAC.EXIT
-*--------------------------------------
-RESET.MODE		lda #0
 				ldy #S.DCB.TTY.M
 				sta (ZPDCBPtr),y
 				rts