Kernel 0.93++

INC/A2osX.I.txt

@@ -428,7 +428,7 @@ S.DIB.T.NIC			.EQ	$12			Network Interface Card
 S.DIB.T.XY			.EQ	$13			X,Y Pointing Device
 S.DIB.T.CHAR		.EQ	$14
 S.DIB.T.GFX			.EQ	$15
-S.DIB.T.SND			.EQ	$16
+*S.DIB.T.SND			.EQ	$17
 S.DIB.ST		.EQ 22
 S.DIB.ST.EXT		.EQ $80
 S.DIB.ST.DSKSW		.EQ $40

SYS/KERNEL.S.ENV.txt

@@ -71,18 +71,7 @@ K.Expand		jsr K.strdup
 				jsr SHARED.TXTPTR.Next	skip "{"
 				bra .40
 
-.31				jsr ZP.IsDigit			$0 ... $9 ?
-				bcs .32
-
-				and #$0f
-
-				jsr K.ArgV
-				bcs .35					Arg# is undefined, do not append anything
-
-				jsr ENV.AddYAToBuf
-				bra .35
-
-.32				jsr ENV.SysVar
+.31				jsr ENV.SysVar			0-9 *#?@$!
 				bcs .40
 
 .35				jsr SHARED.TXTPTR.Next	skip $x
@@ -91,20 +80,21 @@ K.Expand		jsr K.strdup
 .40				jsr ENV.ExpandStrVar
 				bcc .70
 
-.50				jsr ENV.FindVar
+.50				ldy ENV.BufLen
+				lda /K.Buf256
+				>STYA FORPNT
+
+				jsr K.GetEnv.I
 				bcs .70
 
-				jsr ENV.NextEnvP3Y		Skip NAME=
+				ldx ENV.BufLen
 				
-				.DO AUXENV=1
-				sta SETREADAUX
-				.FIN
+.51				lda K.Buf256,x
+				beq .52
+				inx
+				bra .51
 				
-				jsr ENV.AddP3ToBuf		Add VALUE
-				
-				.DO AUXENV=1
-				sta CLRREADAUX
-				.FIN
+.52				stx	ENV.BufLen
 				
 .70				lda (TXTPTR)
 				beq .72
@@ -115,9 +105,9 @@ K.Expand		jsr K.strdup
 				bra .70
 
 .72				lda ENV.VarEndChar			
-				beq .10
+				bne .35					skip "}" and loop
 
-				bra .35					skip "}" and loop
+				bra .10
 
 .80				ldx ENV.BufLen
 				stz K.Buf256,x
@@ -136,17 +126,30 @@ K.Expand		jsr K.strdup
 *				clc
 .9				rts
 *--------------------------------------
-ENV.SysVar		ldx #ENV.SysVars.Cnt-1
+ENV.SysVar		jsr ZP.IsDigit			$0 ... $9 ?
+				bcs .1
 
-.1				cmp ENV.SysVars,x
-				beq .2
+				and #$0f
+
+				jsr K.ArgV
+				bcs .8					Arg# is undefined, do not append anything
+
+				jsr ENV.AddYAToBuf
+
+.8				clc
+				rts
+
+.1				ldx #ENV.SysVars.Cnt-1
+
+.2				cmp ENV.SysVars,x
+				beq .3
 				dex
-				bpl .1
+				bpl .2
 				
 				sec
 				rts
 
-.2				txa
+.3				txa
 				beq ENV.SysVarsAllArgs
 
 				ldy ENV.SysVars.PS-1,x
@@ -256,7 +259,7 @@ ENV.StrVarsSession
 
 .1				dex
 				dex
-				bmi .3
+				bmi ENV.AddP3ToBuf
 
 				ldy #$ff
 .2				iny
@@ -265,10 +268,8 @@ ENV.StrVarsSession
 
 				jsr ENV.NextEnvP3Y
 				bra .1
-
-.3				jmp ENV.AddP3ToBuf
 *--------------------------------------
-ENV.AddYAToBuf	>STYA ZPPtr3			
+ENV.AddYAToBuf	>STYA ZPPtr3
 *--------------------------------------
 ENV.AddP3ToBuf	ldx ENV.BufLen
 				ldy #$ff
@@ -571,12 +572,11 @@ K.GetEnvDump	ldy #S.PS.ENVPAGECNT
 K.UnsetEnv		>PULLW TXTPTR			name
 
 K.UnsetEnv.I	jsr ENV.FindVar
-				bcs K.UnsetEnv.I.8		not found, quit
+				bcs .8					not found, quit
 
 				jsr ENV.DelVarP3		Ptr3 -> NAME=VALUE
-K.UnsetEnv.I.8	clc
-				
-K.UnsetEnv.I.9	rts
+.8				clc
+				rts
 *--------------------------------------
 * ENV.FindVar
 *  In:
@@ -683,7 +683,7 @@ ENV.InitEnvP3	.DO AUXENV=1
 				.FIN
 				jsr K.GetMemPtr
 				>STYA ZPPtr3			Store ENV
-ENV.InitEnvP3.RTS
+
 				rts
 *--------------------------------------
 ENV.NextEnvP3	jsr ENV.GetP3LenY