Kernel 0.94++

ProDOS.FX/ProDOS.S.LDR.txt

@@ -274,6 +274,7 @@ LDR.Common		jsr LDR.BlkDevScan
 *--------------------------------------
 				lda LDR.BootFlag		get setup entry point flag
 				beq LDR.ReadRoot		taken if normal boot.
+
 				lda RROMBNK2
 				rts		  				return to caller at setup entry point.
 *--------------------------------------
@@ -429,24 +430,15 @@ LDR.ClkDevScan	php
 				ldy PAKME.NCLK+1
 				bra LDR.SetupCLK
 *--------------------------------------
-LDR.ClkDevTCLK	lda CLRC8ROM	   		switch out $C8 ROMs
-
-				stz idxl
+LDR.ClkDevTCLK	stz idxl
 				lda #$C1
 				sta idxl+1
+				
+				lda #1
+				sta LDR.SlotIdx
 
-.1				ldy #6
-
-.2  			lda (idxl),y	   		compare id bytes
-				cmp dskid,y
-				bne .3
-				dey
-				dey
-				bpl .2
-
-				lda idxl+1
-				and #$f
-				tax
+.1				jsr LDR.CheckTClkID
+				bcs .7
 
 				sta SETPAGE2
 				stz $478,x
@@ -478,10 +470,13 @@ LDR.ClkDevTCLK	lda CLRC8ROM	   		switch out $C8 ROMs
 				sta TCLK.Cx2+2
 				rts
 
-.3				inc idxl+1
+.7				inc LDR.SlotIdx
+
+				inc idxl+1
 				lda idxl+1
 				cmp #$C8
 				bne .1
+
 				rts
 *--------------------------------------
 LDR.SetupCLK	stx ZPInBufPtr
@@ -609,9 +604,7 @@ LDR.BlkDevScan	stz idxl
 				cpx #2					CS if 2 devs or more
 				jsr	LDR.AddBlkDevs		install 1 or 2 devices from this slot.
 
-.7  			ldx LDR.SlotIdx
-				lda sltbit-1,x
-				tsb rommap	   			mark bit to flag rom present
+.7  			
 
 .8				dec idxl+1				next lower slot.
 				dec LDR.SlotIdx 		have all slots been checked ?
@@ -853,21 +846,45 @@ LDR.SPVect		jsr $0000				self modifying
 				.DA LDR.SPStatus.P
 				rts
 *--------------------------------------
-LDR.CheckDiskID	lda CLRC8ROM	   		switch out $C8 ROMs
+LDR.CheckTClkID	ldy #6
 
-				ldy #$05
+				.HS 2C					BIT ABS
+
+LDR.CheckDiskID	ldy #5
+
+				lda CLRC8ROM	   		switch out $C8 ROMs
 
 .1  			lda (idxl),y	   		compare id bytes
 				cmp dskid,y
-				sec		  				set if no disk card
-				bne .2
+				bne .3
 
 				dey
 				dey
 				bpl .1					loop until all 4 id bytes match.
 
-				clc						clear if disk card
-.2  			rts
+				clc
+				php
+				
+.8				ldx LDR.SlotIdx
+
+				lda sltbit-1,x
+				tsb rommap	   			mark bit to flag rom present
+
+.9				plp
+				rts
+				
+.3				sec
+				php
+				
+				ldx #0				
+				
+.4				cmp (idxl),y
+				bne .9
+				
+				inx
+				bne .4
+				
+				bra .8
 *--------------------------------------
 LDR.SetDevID	ldy #$FE				check attributes byte.
 
@@ -1117,7 +1134,7 @@ L2C4D			lda 1,s
 DS1216E.SIG		.HS	5CA33AC55CA33AC5	Reverted 7->0
 *--------------------------------------
 * id bytes: evens for clock, odds for disk
-dskid	 		.HS 082028005803703C
+dskid	 		.HS 08.20.28.00.58.03.70
 sltbit			.HS 02040810204080
 *--------------------------------------
 LDR.MLIOL.P		.DA #2