Kernel 0.93

2019-05-27 08:01:59 +02:00 · 2019-05-27 08:01:59 +02:00 · f440c4e05b
parent b862166ca4
commit f440c4e05b
14 changed files with 72 additions and 90 deletions
--- a/.Floppies/A2OSX.BUILD.po
+++ b/.Floppies/A2OSX.BUILD.po
--- a/BIN/AARP.S.txt
+++ b/BIN/AARP.S.txt
@ -1,6 +1,5 @@
 NEW
-  PREFIX
-AUTO 4,1
+  AUTO 3,1
 				.LIST OFF
 				.OP	65C02
 				.OR	$2000
@ -25,7 +24,7 @@ CS.START		cld
 				.DA #0
 				.DA CS.END-CS.START		CS
 				.DA DS.END-DS.START		DS
-				.DA #16					SS
+				.DA #64					SS
 				.DA #2					ZP
 				.DA 0
 *--------------------------------------
@ -173,9 +172,10 @@ CS.RUN.DUMP		>LIBCALL hLIBETALK,LIBETALK.AARP.GETCACHE
 				ldy #S.AARPCACHE.ADDR+3
 				>PUSHB (ZPPTR1),y
 				dey
-				>PUSHB (ZPPTR1),y
 				dey
 				>PUSHB (ZPPTR1),y
+				iny
+				>PUSHB (ZPPTR1),y
 				
 				ldy #S.AARPCACHE.MAC+6
 				
@ -194,9 +194,7 @@ CS.RUN.DUMP		>LIBCALL hLIBETALK,LIBETALK.AARP.GETCACHE
 				>PUSHBI 12
 				>LDYA L.MSG1
 				phx
-				>DEBUG
 				>SYSCALL printf
-				>DEBUG
 				plx
 				
 .4				lda ZPPTR1
@ -249,7 +247,7 @@ SSCANF.MAC		.AZ "%h:%h:%h:%h:%h:%h"
 MSG.Usage		.AS "Usage : AARP, display AARP cache\r\n"
 				.AS "        AARP network.nod, query cache or network\r\n"
 				.AZ "        AARP network.nod HH:HH:HH:HH:HH:HH, add a static AARP record in Cache\r\n"
-MSG0			.AZ "STS TTL   MAC Address       network.nod"
+MSG0			.AZ "STS TTL   MAC Address       net.nod"
 MSG1			.AZ "$%h %5D %h:%h:%h:%h:%h:%h %D.%d\r\n"
 MSG2			.AZ "%D%d is at %h:%h:%h:%h:%h:%h\r\n"
 hLIBETALK		.BS 1
--- a/BIN/EDIT.S.BUF.txt
+++ b/BIN/EDIT.S.BUF.txt
@ -1,6 +1,5 @@
 NEW
-PREFIX
-AUTO 4,1
+  AUTO 3,1
 				.LIST OFF
 *--------------------------------------
 BUF.InsertClipboard
--- a/BIN/EDIT.S.CTRL.txt
+++ b/BIN/EDIT.S.CTRL.txt
@ -1,6 +1,5 @@
 NEW
-PREFIX
-AUTO 4,1
+  AUTO 3,1
 				.LIST OFF
 *--------------------------------------
 * ^A = Help
--- a/BIN/EDIT.S.SCRN.txt
+++ b/BIN/EDIT.S.SCRN.txt
@ -1,6 +1,5 @@
 NEW
-PREFIX
-AUTO 4,1
+  AUTO 3,1
 				.LIST OFF
 *--------------------------------------
 SCRN.Init		>LDA.G ScreenH
--- a/BIN/EDIT.S.txt
+++ b/BIN/EDIT.S.txt
@ -1,6 +1,5 @@
 NEW
-PREFIX
-AUTO 4,1
+  AUTO 3,1
 				.LIST OFF
 				.OP	65C02
 				.OR	$2000
@ -13,24 +12,26 @@ AUTO 4,1
 				.DUMMY
 				.OR ZPBIN
 ZS.START
-ZPPTR1			.BS 2
-ZPPTR2			.BS 2
 BufPtr			.BS 2
 BufPtrBackup	.BS 2
 ClipboardPtr	.BS 2
-hMem			.BS 1
-TmpByte			.BS 1
-TmpLen			.BS 2
-TmpCount		.BS 2
+LineBufPtr		.BS 2

-TmpIndex		.BS 2
-SelLen			.BS 2
 BUF.LOffset		.BS 2
 BUF.COffset		.BS 2
 BUF.TmpLine1	.BS 2
 BUF.TmpLine2	.BS 2
+
+TmpLen			.BS 2
+TmpCount		.BS 2
+TmpIndex		.BS 2
+SelLen			.BS 2
+
+ZPPTR1			.BS 2
 bNotRepaint		.BS 1
 bSelected		.BS	1
+TmpByte			.BS 1
+
 ZS.END			.ED
 *--------------------------------------
 PromptBufMax	.EQ 64
@ -143,6 +144,9 @@ CS.RUN			>PUSHBI 0
 				
 				jsr LoadFile
 				bcc .3					if CS, Failed to load file, keep name, but new file....
+
+				cmp #E.OOM
+				beq CS.RUN.RTS
 				
 .2				>LDYAI 1				buffer size = 0 (+ 1 for ending 0)
 				>SYSCALL GetMem0
@ -155,10 +159,10 @@ CS.RUN			>PUSHBI 0
 				>STA.G bSaved
 				
 				jsr SCRN.Init
-.9				bcs CS.RUN.RTS
+				bcs CS.RUN.RTS
 				
 CS.RUN.LOOP		>SYSCALL GetChar
-				bcs CS.RUN.RTS			I/O eror
+				bcs CS.RUN.RTS			I/O error
 				
 .1				jsr CharIn
 				
@ -176,7 +180,10 @@ CS.RUN.RTS		rts
 CS.DOEVENT		sec
 				rts
 *--------------------------------------
-CS.QUIT			ldy #hBuffer
+CS.QUIT			ldy #hLineBuffer
+				jsr .8
+
+				ldy #hBuffer
 				jsr .8
 				
 				ldy #hBufferBackup
@ -344,74 +351,59 @@ LoadFile		>PUSHWI 0				Aux type
 				
 				>SYSCALL LoadTXTFile
 				bcs .9
+
+				>STYA BufPtr
+				>STYA ZPPTR1
 				
-				stx hMem
-				iny
-				bne .1
-				inc						Add 1 for \0
-				
-.1				>SYSCALL GetMem
-				bcs .98
-				
-				>STYA ZPPTR2
 				txa
 				>STA.G hBuffer
 				
-				lda hMem
-				
-				>SYSCALL GetMemPtr
-				>STYA ZPPTR1
-				
 				stz TmpLen
 				stz TmpLen+1

 				ldy #0
 				ldx #0
 				
-.2				lda (ZPPTR1),y
+.2				lda (BufPtr),y
 				beq .8

 				cpx #C.CR
 				bne .3
+				
 				cmp #C.LF
-				beq .4
+				beq .5
 				
-.3				jsr PutBytePtr2
+.3				cmp #C.SPACE
+				bcs .31
 				
-.4				tax						set previous char				
+				cmp #C.CR
+				bne .5
+				
+.31				sta (ZPPTR1)
+				inc ZPPTR1
+				bne .4
+				inc ZPPTR1+1
+				
+.4				inc TmpLen
+				bne .5
+				inc TmpLen+1
+				
+.5				tax						set previous char
 				iny
 				bne .2
+				
 				inc ZPPTR1+1
 				bra .2
 				
-.8				>LDYA TmpLen
+.8				lda #0
+				sta (ZPPTR1)
+
+				>LDYA TmpLen
 				>STYA.G FileLen
 				
-				lda #0
-				jsr PutBytePtr2			set ending \0
-
-				jsr .98
 				clc
-				rts
-				
-.98				pha
-				lda hMem
-				>SYSCALL FreeMem
-				pla				
-				sec
 .9				rts				
 *--------------------------------------
-PutBytePtr2		sta (ZPPTR2)
-				inc ZPPTR2
-				bne .1
-				inc ZPPTR2+1
-				
-.1				inc TmpLen
-				bne .8
-				inc TmpLen+1
-				
-.8				rts		
-*--------------------------------------
 SaveFile		>PUSHWI 0				Aux type
 				>PUSHBI S.FI.T.TXT
 				>PUSHBI	O.CREATE+O.WRONLY
@ -520,6 +512,7 @@ EscBuffer		.BS 16
 hFileName		.BS 1
 hFind			.BS 1
 hReplace		.BS 1
+hLineBuffer		.BS 1
 hBuffer			.BS 1
 hBufferBackup	.BS 1
 FileLen			.BS 2
--- a/BIN/ETCONFIG.S.txt
+++ b/BIN/ETCONFIG.S.txt
@ -1,6 +1,5 @@
 NEW
-  PREFIX
-AUTO 4,1
+  AUTO 3,1
 				.LIST OFF
 				.OP	65C02
 				.OR	$2000
@ -40,7 +39,7 @@ CS.START		cld
 				.DA #0
 				.DA CS.END-CS.START		Code Size (without Constants)
 				.DA DS.END-DS.START		Data SegmentSize
-				.DA #16					Stack Size
+				.DA #64					Stack Size
 				.DA #ZS.END-ZS.START	Zero Page Size
 				.DA 0
 *--------------------------------------
@ -265,19 +264,21 @@ CS.RUN.PROBE	>PUSHBI 0
 				dex
 				bpl .20
 				
-				lda #$58
+				lda #0
+*				lda #$58
 				sta AARP.PRB.SPA+2
 				sta AARP.PRB.TPA+2
 				sta ETKCFG+S.ETKCFG.NetID

-				lda A2osX.RANDOM16+1
-				lda #$06
+*				lda A2osX.RANDOM16+1
+*				lda #$06
 				sta AARP.PRB.SPA+1
 				sta AARP.PRB.TPA+1
 				sta ETKCFG+S.ETKCFG.NetID+1

 				lda A2osX.RANDOM16
-				lda #$3A
+				eor A2osX.RANDOM16+1
+*				lda #$3A
 				bne .1
 				inc
 				
@ -307,7 +308,7 @@ CS.RUN.PROBE	>PUSHBI 0
 				>SLEEP
 				
 				>DEC.G PROBE.CNT
-*				bne .3
+				bne .3
 				
 				>LDYA L.DDP.GetNetInfo
 				>STYA IOCTL+S.IOCTL.BUFPTR
@ -506,7 +507,7 @@ CFG.DefaultHost	.AZ "a2osx-%H"
 *--------------------------------------
 MSG.PROBE		.AZ "ETCONFIG:Acquiring NODE..."
 MSG.PROBE.KO	.AZ "ETCONFIG:Time Out [%h].\r\n"
-MSG.PROBE.OK	.AZ "ETCONFIG:Success\n"
+MSG.PROBE.OK	.AZ "ETCONFIG:Success."
 *--------------------------------------
 ETKCFG			.BS S.ETKCFG
 CFG.hCfgFile	.BS 1
--- a/LIB/LIBETALK.S.AARP.txt
+++ b/LIB/LIBETALK.S.AARP.txt
@ -1,6 +1,5 @@
 NEW
-PREFIX
-AUTO 4,1
+  AUTO 3,1
 				.LIST OFF	
 */--------------------------------------
 * # AARP.Clear
--- a/LIB/LIBETALK.S.CFG.txt
+++ b/LIB/LIBETALK.S.CFG.txt
@ -1,6 +1,5 @@
 NEW
-PREFIX
-AUTO 4,1
+  AUTO 3,1
 				.LIST OFF	
 *--------------------------------------
 CFG.SET			>PULLW ZPTmpPtr1		ETKCFG
--- a/LIB/LIBETALK.S.DDP.txt
+++ b/LIB/LIBETALK.S.DDP.txt
@ -1,6 +1,5 @@
 NEW
-  PREFIX
-AUTO 4,1
+  AUTO 3,1
 				.LIST OFF	
 *--------------------------------------
 DDP.IN			clc
--- a/LIB/LIBETALK.S.ELAP.txt
+++ b/LIB/LIBETALK.S.ELAP.txt
@ -1,6 +1,5 @@
 NEW
-PREFIX
-AUTO 4,1
+  AUTO 3,1
 				.LIST OFF	
 *--------------------------------------

--- a/LIB/LIBETALK.S.FRM.txt
+++ b/LIB/LIBETALK.S.FRM.txt
@ -1,6 +1,5 @@
 NEW
-PREFIX
-AUTO 4,1
+  AUTO 3,1
 				.LIST OFF	
 *--------------------------------------
 *--------------------------------------
--- a/LIB/LIBETALK.S.RTMP.txt
+++ b/LIB/LIBETALK.S.RTMP.txt
@ -1,6 +1,5 @@
 NEW
-PREFIX
-AUTO 4,1
+  AUTO 3,1
 				.LIST OFF	
 *--------------------------------------
 		
--- a/LIB/LIBETALK.S.txt
+++ b/LIB/LIBETALK.S.txt
@ -1,6 +1,5 @@
 NEW
-PREFIX
-AUTO 4,1
+  AUTO 3,1
 				.LIST OFF	
 				.OP	65C02
 				.OR	$2000