Mercurial > hg > Members > kono > nitros9-code

changeset 2103:58bb6cac8939

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update for new build system
author afra
date Sun, 24 Sep 2006 22:46:17 +0000
parents add5c02385a7
children 40b483145984
files level1/modules/boot_d64.asm level1/modules/ddisk.asm
diffstat 2 files changed, 21 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/level1/modules/boot_d64.asm	Sun Sep 24 22:45:31 2006 +0000
+++ b/level1/modules/boot_d64.asm	Sun Sep 24 22:46:17 2006 +0000
@@ -47,7 +47,7 @@
 	use 	defsfile
         endc
 
-	IFNE	DragonAlpha
+	IFNE	dalpha
 
 * Dragon Alpha has a third PIA at FF24, this is used for
 * Drive select / motor control, and provides FIRQ from the
@@ -177,7 +177,7 @@
 
 ;start   equ   	*
 	
-HWInit  clra  	 		 
+HWInit  clra  	
         ldx   	#CMDREG		; Force inturrupt
         lda   	#FrcInt
         sta   	,x
@@ -185,7 +185,7 @@
         lda   	,x
         lda   	piadb		; Clear DRQ from WD.
 
-	IFNE	DragonAlpha
+	IFNE	dalpha
 	lda	#NMICA2Dis	; Set PIA2 CA2 as output & disable NMI
 	sta	PIA2CRA
 	ENDC
@@ -201,7 +201,7 @@
         ora   	WhichDrv,pcr	; OR in selected drive
         sta   	drvsel,u	; save drive selection byte
 	
-	IFNE	DragonAlpha
+	IFNE	dalpha
 	lbsr	AlphaDskCtl
 	ELSE
 	sta   	>DSKCTL
@@ -289,7 +289,7 @@
 	lda	drvsel,u	
 	ora	#NMIEn
 	  
-	IFNE	DragonAlpha
+	IFNE	dalpha
 	lbsr	AlphaDskCtl
 	ELSE
 	sta   	<dpdskctl
@@ -299,7 +299,7 @@
 	orb	side,u		; mask in side select
 	stb   	<dpcmdreg
 
-	IFNE	DragonAlpha
+	IFNE	dalpha
 	lda	#NMICA2En	; Enable NMI
 	sta	<DPPIA2CRA	
 	ENDIF
@@ -320,7 +320,7 @@
 	leas  	R$Size,s	; Drop saved Regs from stack
         lda   	#MotorOn
 
-	IFNE	DragonAlpha
+	IFNE	dalpha
 	lbsr	AlphaDskCtl
 	lda	#NMICA2Dis	; Disable NMI
 	sta	<DPPIA2CRA
@@ -417,7 +417,7 @@
 MotorOnCmdB    
 	lda	drvsel,u	; Turn on motor
 	
-	IFNE	DragonAlpha
+	IFNE	dalpha
 	bsr	AlphaDskCtl
 	ELSE
 	sta   	>DSKCTL
@@ -432,7 +432,7 @@
 Delay2  lbsr  	Delay3
 Delay3  rts   
 
-	IFNE	DragonAlpha
+	IFNE	dalpha
 
 
 ;
@@ -448,9 +448,9 @@
 	clra			; No, turn off other bits.
 MotorRunning
 	anda	#Mask58		; Mask out 5/8 bit to force the use of 5.25" clock
-	sta	,s	
+	sta	-1,s	
 
-        orcc  #$50		; disable inturrupts
+        orcc  	#$50		; disable inturrupts
 	
 	ldx	#PIA2DA
 	lda	#AYIOREG	; AY-8912 IO register
@@ -460,7 +460,7 @@
 		
 	clr	,x		; Idle AY
 	
-	lda	,s+		; Fetch saved Drive Selects etc
+	lda	-1,s		; Fetch saved Drive Selects etc
 	sta	2,x		; output to PIA
 	ldb	#AYWriteReg	; Write value to latched register
 	stb	,x
--- a/level1/modules/ddisk.asm	Sun Sep 24 22:45:31 2006 +0000
+++ b/level1/modules/ddisk.asm	Sun Sep 24 22:46:17 2006 +0000
@@ -101,7 +101,7 @@
          use   defsfile
          endc
 
-		IFNE	DragonAlpha
+		IFNE	dalpha
 
 * Dragon Alpha has a third PIA at FF24, this is used for
 * Drive select / motor control, and provides FIRQ from the
@@ -244,7 +244,7 @@
 	clra
 	sta	>D.DskTmr	; Zero motor timer
 	
-	IFNE	DragonAlpha	; Turn off all drives
+	IFNE	dalpha	; Turn off all drives
 	lbsr	AlphaDskCtl
 
 	lda	#NMICA2Dis	; Set PIA2 CA2 as output & disable NMI
@@ -446,7 +446,7 @@
 	
         ORB   	>SideSel,U 	; Set up Side		 
          
-	IFNE	DragonAlpha	; Turn on drives & NMI
+	IFNE	dalpha	; Turn on drives & NMI
 	lbsr	AlphaDskCtl
         stb   	<DPCmdReg	; issue command to controler
 	lda	#NMICA2En	; Enable NMI
@@ -464,7 +464,7 @@
 ;
 
 RestoreSavedIO
-	IFNE	DragonAlpha	
+	IFNE	dalpha	
 	lda	#NMICA2Dis	; Disable NMI (Alpha)
 	sta	<DPPIA2CRA
 	ENDC
@@ -472,7 +472,7 @@
 	lda   	>DrivSel,u	; Deselect drives, but leave motor on
         ora   	#MotorOn
 	
-	IFNE	DragonAlpha	; Turn off drives & NMI
+	IFNE	dalpha	; Turn off drives & NMI
 	lbsr	AlphaDskCtl
 	ELSE
         sta   	<DPDskCtl
@@ -806,7 +806,7 @@
  	lda   	#MotorOn	; Turn on motor
         ora   	>DrivSel,u
 
-	IFNE	DragonAlpha
+	IFNE	dalpha
 	lbsr	AlphaDskCtl
 	ELSE
         sta   	>DskCtl
@@ -857,7 +857,7 @@
         bsr   	InsVIRQ
         bra   	IRQOut
 L0509    
-	IFNE	DragonAlpha
+	IFNE	dalpha
 	lbsr	AlphaDskCtl
 	ELSE
         sta   	>DskCtl
@@ -957,7 +957,7 @@
         bne   	MotorsRunning				
         lda   	#MotorOn	; else spin up
 		 
-        IFNE	DragonAlpha
+        IFNE	dalpha
 	bsr	AlphaDskCtl
 	ELSE
         sta   	>DskCtl
@@ -1032,7 +1032,7 @@
 ExitDensity	
 	puls	a,b,pc
 
-	IFNE	DragonAlpha
+	IFNE	dalpha
 
 ; Translate DragonDos Drive select mechinisim to work on Alpha 
 ; Takes byte that would be output to $FF48, reformats it and