From c29cc70671cbd7111d911ce33c6d458dce021381 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20GIBERT?= <burniouf@users.noreply.github.com>
Date: Wed, 4 Oct 2017 08:16:39 +0200
Subject: [PATCH] Kernel 0.9.1 : Code reorganization & move to CSTR : FORMAT &
 Block devices

---
 .Floppies/A2OSX.BUILD.po | Bin 819200 -> 819200 bytes
 .Floppies/A2OSX.SRC.po   | Bin 819200 -> 819200 bytes
 BIN/FORMAT.S.txt         | 133 +++++++++++++++++++++------------------
 INC/MACROS.I.txt         |   7 +++
 LIB/LIBBLKDEV.S.txt      |  23 ++++---
 5 files changed, 91 insertions(+), 72 deletions(-)

diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po
index dd3600656454629fe8df33b846d2a621665154ea..80a38580ffc7d00fd94cf9fae62d4f4e9bf8eae1 100644
GIT binary patch
delta 3843
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
Oy=iT4x_B_HOaBktM7$mV

delta 3773
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
V6PjWZn_^s3OxqMoI}p>w{tt06xH13$

diff --git a/.Floppies/A2OSX.SRC.po b/.Floppies/A2OSX.SRC.po
index 7d3fa3310d60848b83dfbe9b1743d36ce37e65bc..03bf9a2743663a56f20019fec5206a6088a2dc0d 100644
GIT binary patch
delta 7448
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
K9C+3E(Ek9jDD0g8

delta 7460
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

diff --git a/BIN/FORMAT.S.txt b/BIN/FORMAT.S.txt
index 812c664b..a34ff327 100644
--- a/BIN/FORMAT.S.txt
+++ b/BIN/FORMAT.S.txt
@@ -35,7 +35,6 @@ CS.START		cld
 				.DA CS.DOEVENT		
 				.DA	CS.QUIT
 L.LIBBLKDEV		.DA LIBBLKDEV
-L.BlkParams.Ptr	.DA BlkParams.Ptr
 L.MSG.USAGE		.DA MSG.USAGE
 L.MSG.INIT		.DA MSG.INIT		
 L.MSG.OK		.DA MSG.OK
@@ -45,7 +44,7 @@ L.MSG.ERR		.DA MSG.ERR
 CS.INIT			ldy #S.PS.ARGC
 				lda (pPs),y
 				beq .99
-				
+
 .1				>INC.G ArgIndex
 				
 				>SYSCALL GetArg.A
@@ -78,16 +77,14 @@ CS.INIT			ldy #S.PS.ARGC
 				sta (pData),y
 				bra .1
 				
-.4				ldy #hDev
-				lda (pData),y
+.4				>LDA.G hDev
 				bne .5					Already have a dev name...go get VolName
 							
 				>LDYA ZPPtr1
 				>SYSCALL GetDevByName.YA		
 				bcs .99
 				txa
-				ldy #hDev
-				sta (pData),y
+				>STA.G hDev
 				bra .1
 				
 .5				ldy #$ff
@@ -99,46 +96,63 @@ CS.INIT			ldy #S.PS.ARGC
 
 				lda (ZPPtr1),y
 				sta (pData),y
-				bne .6					success, scan for any other args
-				bra .1
+				bne .6
+				bra .1					success, scan for any other args
 				
-.7				lda (pData)
+.7				>LDA.G VolName
 				bne .8					Volume name ok
+
+				ldx #$ff
+				ldy #VolName-1
+				
+.71				inx
+				iny
+				lda BLANK,x
+				sta (pData),y
+				bne .71
 				
 				lda A2osX.TIMER16
 				jsr A2CharAX
-				sta DefaultVolName+6
-				stx DefaultVolName+7
+				sta (pData),y
+				iny
+				txa
+				sta (pData),y
+				iny
 				
 				lda A2osX.TIMER16+1
 				jsr A2CharAX
-				sta DefaultVolName+8
-				stx DefaultVolName+9
+				sta (pData),y
+				iny
+				txa
+				sta (pData),y
+				iny
 				
 				lda A2osX.RANDOM16
 				jsr A2CharAX
-				sta DefaultVolName+10
-				stx DefaultVolName+11
+				sta (pData),y
+				iny
+				txa
+				sta (pData),y
+				iny
 				
 				lda A2osX.RANDOM16+1
 				jsr A2CharAX
-				sta DefaultVolName+12
-				stx DefaultVolName+13
-
-				ldy DefaultVolName
-				
-.71				lda DefaultVolName,y
 				sta (pData),y
-				dey
-				bpl .71
+				iny
+				txa
+				sta (pData),y
+				iny
+				
+				lda #0
+				sta (pData),y
 				
 .8				>LDYA L.LIBBLKDEV
 				>SYSCALL LoadLib.YA
 				sta hLIBBLKDEV
 				
-				lda (pPs)
-				ora #S.PS.F.EVENT		Now accept events
-				sta (pPs)
+*				lda (pPs)
+*				ora #S.PS.F.EVENT		Now accept events
+*				sta (pPs)
 				
 				clc
 				rts
@@ -163,20 +177,19 @@ CS.RUN			jsr CS.RUN.BuildCat
 				sec
 				rts
 *--------------------------------------
-CS.RUN.BuildCat	ldy #hDev
-				lda (pData),y
+CS.RUN.BuildCat	>LDA.G hDev
 				>SYSCALL GetDevStatus.A
 				
 				bcs .99
 				>STYA ZPPtr1
 				ldy #S.DEVSTAT.SIZE
 				lda (ZPPtr1),y
-				sta SizeInBlocks
-				iny
+				>STA.G SizeInBlocks
+				ldy #S.DEVSTAT.SIZE+1
 				lda (ZPPtr1),y
-				sta SizeInBlocks+1
+				>STA.G SizeInBlocks+1
 				
-				ldy #hDev
+				>LDA.G hDev
 				lda (pData),y
 				>SYSCALL GetDevByID.A
 				bcs .99
@@ -189,59 +202,59 @@ CS.RUN.BuildCat	ldy #hDev
 				adc /S.DEV.NAME
 				sta ZPPtr2+1
 								
-				>PUSHW pData
-				>PUSHW SizeInBlocks
+				>PUSHEA.G VolName
+				>PUSHW.G SizeInBlocks
 				>PUSHW ZPPtr2
 				
 				>LDYA L.MSG.INIT
 				>SYSCALL PrintF.YA
-				bcs .9
+.99				bcs .9
 				
-				>PUSHW SizeInBlocks
+				>PUSHW.G SizeInBlocks
 				>LIBCALL hLIBBLKDEV,LIBBLKDEV.GetProDOSCatSize
 				
-.99				bcs .9
-				stx BlkCnt
+				bcs .9
+				phy
+				pha
+				>STA.G BlkCnt
+				pla
+				ply
 				
 				>SYSCALL GetMem0.YA			BufferSize
 				bcs .9
 				>STYA BlkParams.Ptr
 				txa
-				ldy #hBuf
-				sta (pData),y
+				>STA.G hBuf
 				
-				>PUSHW SizeInBlocks
-				>PUSHW pData
+				>PUSHW.G SizeInBlocks
+				>PUSHEA.G VolName
 				>PUSHW BlkParams.Ptr
 				>LIBCALL hLIBBLKDEV,LIBBLKDEV.BuildProDOSCat
 .9				rts
 *--------------------------------------
-CS.RUN.WriteCat	stz BlkParams.Num
-				stz BlkParams.Num+1
-				
-				ldy #hDev
-				lda (pData),y
+CS.RUN.WriteCat	>LDA.G hDev
 				>SYSCALL GetDevByID.A
 				bcs .9
 				>STYA pDev			
 				
-.1				>LDYA L.BlkParams.Ptr
+.1				>LEA.G BlkParams.Ptr
 				ldx #DEVMGR.WRITEBLOCK
 				
 				jsr pDevJmp
 				bcs .9
-				inc BlkParams.Ptr+1
-				inc BlkParams.Ptr+1
-				inc BlkParams.Num
-				dec BlkCnt
+				>LDA.G BlkParams.Ptr+1
+*				clc				
+				adc #2
+				sta (pData),y
+				
+				>DEC.G BlkCnt
 				bne .1
 .9				rts
 *--------------------------------------
 CS.DOEVENT		sec
 				rts
 *--------------------------------------
-CS.QUIT			ldy #hBuf
-				lda (pData),y
+CS.QUIT			>LDA.G hBuf
 				beq .1
 				>SYSCALL FreeMem.A
 					
@@ -283,21 +296,21 @@ MSG.ERR			>CSTR "[%h]\r\n"
 MSG.INIT		>CSTR "Formatting %s (%D Blks),Volname:%s..."
 *--------------------------------------
 LIBBLKDEV		>CSTR "libblkdev.o"
-DefaultVolName	>CSTR "BLANKXXXXXXXX"
+BLANK			>CSTR "BLANK"
 hLIBBLKDEV		.BS 1
-SizeInBlocks	.BS 2
-BlkCnt			.BS 1
-BlkParams.Ptr	.BS 2
-BlkParams.Num	.BS 2
 *--------------------------------------
 				.DUMMY
 				.OR 0
 DS.START
 ArgIndex		.BS 1
+bLL				.BS 1
 VolName			.BS 16
 hDev			.BS 5
+SizeInBlocks	.BS 2
+BlkCnt			.BS 1
+BlkParams.Ptr	.BS 2
+BlkParams.Num	.BS 2
 hBuf			.BS 1
-bLL				.BS 1
 DS.END
 				.ED
 *--------------------------------------
diff --git a/INC/MACROS.I.txt b/INC/MACROS.I.txt
index d1f70444..e45668bf 100644
--- a/INC/MACROS.I.txt
+++ b/INC/MACROS.I.txt
@@ -126,6 +126,13 @@ AUTO 6
 				>LEA.G ]1
 				>PUSHYA
 				.EM
+*--------------------------------------
+				.MA	PUSHW.G
+				>LDA.G ]1+1
+				>PUSHA
+				>LDA.G ]1
+				>PUSHA
+				.EM
 *--------------------------------------
 				.MA	LDA.G
 				ldy #]1
diff --git a/LIB/LIBBLKDEV.S.txt b/LIB/LIBBLKDEV.S.txt
index 8e842314..311e2b15 100644
--- a/LIB/LIBBLKDEV.S.txt
+++ b/LIB/LIBBLKDEV.S.txt
@@ -161,17 +161,16 @@ BuildProDOSCat	>PULLW ZPPtr1			DstBuf
 				
 * Directory Blocks
 			
-				lda (ZPPtr2)			VolName Len
+.3				lda (ZPPtr2),y
+				iny
+				sta VolDirHdr.Name,y
+				bne .3
+				
+				tya
 				and #$0f				make sure 15 bytes max
-				tay
 				ora #$F0				Volume Directory Header
 				sta VolDirHdr.Name
 				
-.3				lda (ZPPtr2),y
-				sta VolDirHdr.Name,y
-				dey
-				bne .3
-				
 				ldy #VolDirHdr.size-1
 				
 .4				lda VolDirHdr,y
@@ -326,11 +325,11 @@ D2TrkWNIB		>PULLB DrvSlt
 				
 				ldy #TrkWriter.Size
 				
-.7				lda TrkWriter,y
-				sta UsrBuf256,y
-				dey
-				bne .7
-				jmp UsrBuf256
+*.7				lda TrkWriter,y
+*				sta UsrBuf256,y
+*				dey
+*				bne .7
+*				jmp UsrBuf256
 				
 				
 				clc