changeset 2829:ed9a4cb85fb3 lwtools-port

Fixed makefiles and defsfile for level 3 Added fdebug.asm in krnp2 with reboot functionality
author boisy
date Sun, 02 Jun 2013 15:30:19 -0500
parents 999159b0e7c0
children d0f5dd304a6e
files level1/coco1/cmds/makefile level1/modules/dwio.asm level1/modules/kernel/krnp2.asm level2/coco3/modules/kernel/makefile level2/coco3_6309/modules/kernel/makefile level2/modules/kernel/ccbkrn.asm level2/modules/kernel/fdebug.asm level2/modules/kernel/freboot.asm level2/modules/kernel/krn.asm level2/modules/kernel/krnp2.asm level3/coco3_6309/cmds/defsfile level3/coco3_6309/cmds/makefile level3/coco3_6309/modules/kernel/makefile level3/coco3_6309/modules/makefile
diffstat 14 files changed, 203 insertions(+), 152 deletions(-) [+]
line wrap: on
line diff
--- a/level1/coco1/cmds/makefile	Sun May 26 15:39:03 2013 -0500
+++ b/level1/coco1/cmds/makefile	Sun Jun 02 15:30:19 2013 -0500
@@ -14,7 +14,7 @@
 		display dmode dsave dump echo edit error exbin format \
 		free grfdrv help ident iniz irqs link list load login makdir \
 		megaread mdir merge mfree mpi os9gen padrom park printerr procs prompt pwd pxd \
-		rename save setime shellplus shell_21 sleep \
+		reboot rename save setime shellplus shell_21 sleep \
 		tee tmode touch tsmon tuneport unlink verify xmode
 
 CMDS_D2		= basic09 runb gfx inkey syscall copy del echo format \
--- a/level1/modules/dwio.asm	Sun May 26 15:39:03 2013 -0500
+++ b/level1/modules/dwio.asm	Sun Jun 02 15:30:19 2013 -0500
@@ -363,8 +363,13 @@
                bra       FRQd2
 
 ; save back D on stack and build our U
-IRQGotOp       pshs      d
-          * mode switch on bits 7+6 of A: 00 = vserial, 01 = vwindow, 10 = wirebug?, 11 = ?							
+IRQGotOp
+               cmpd      #16*256+255
+               beq       do_reboot
+
+               pshs      d
+* mode switch on bits 7+6 of A: 00 = vserial, 01 = vwindow, 10 = wirebug?, 11 = ?							
+
                anda      #$C0                ; mask last 6 bits
                beq       mode00              ; virtual serial mode
           					; future - handle other modes
@@ -396,9 +401,13 @@
                puls      d
                lbra      IRQPutch
 
-               
+do_reboot
+               lda       #255
+               os9       F$Debug
+
 * Virtual Serial Handler
-mode00         lda       ,s                  ; restore A		  
+mode00         
+               lda       ,s                  ; restore A		  
                anda      #$0F                ; mask first 4 bits, a is now port #+1
                beq       IRQCont             ; if we're here with 0 in the port, its not really a port # (can we jump straight to status?)
                deca                          ; we pass +1 to use 0 for no data
--- a/level1/modules/kernel/krnp2.asm	Sun May 26 15:39:03 2013 -0500
+++ b/level1/modules/kernel/krnp2.asm	Sun Jun 02 15:30:19 2013 -0500
@@ -6,6 +6,8 @@
 * Edt/Rev  YYYY/MM/DD  Modified by
 * Comment
 * ------------------------------------------------------------------
+*  11      2013/05/29  Boisy G. Pitre                                                                                                                  
+* F$Debug now incorporated, allows for reboot.   
 
          nam   krnp2
          ttl   NitrOS-9 Level 1 Kernel Part 2
@@ -17,7 +19,7 @@
 tylg     set   Systm+Objct
 atrv     set   ReEnt+rev
 rev      set   $00
-edition  set   10
+edition  set   11
 
          mod   eom,name,tylg,atrv,start,size
 
@@ -71,6 +73,9 @@
          fcb   F$Ret64+$80
          fdb   FRet64-*-2
 
+         fcb   F$Debug
+         fdb   FDebug-*-2
+
          fcb   $80
 
 start    equ   *
@@ -739,5 +744,7 @@
          bcs   ValBoot
 JmpBtEr  puls  pc,u
 
-		emod
+         use   fdebug.asm
+
+         emod
 eom      equ   *
--- a/level2/coco3/modules/kernel/makefile	Sun May 26 15:39:03 2013 -0500
+++ b/level2/coco3/modules/kernel/makefile	Sun Jun 02 15:30:19 2013 -0500
@@ -12,7 +12,7 @@
 SYSCALLS	= fallimg.asm fallram.asm falltsk.asm faproc.asm fcmpnam.asm \
 		fcpymem.asm fdatlog.asm fdelram.asm ffmodul.asm ffreehb.asm \
 		fld.asm fldabx.asm flink.asm fmove.asm fnproc.asm fprsnam.asm \
-		freboot.asm fssvc.asm fvmodul.asm \
+		fdebug.asm fssvc.asm fvmodul.asm \
 		fallbit.asm fallprc.asm fchain.asm fclrblk.asm fcrcmod.asm \
 		fdelimg.asm fexit.asm ffind64.asm ffork.asm fgblkmp.asm \
 		fgcmdir.asm fgmoddr.asm fgprdsc.asm fgprocp.asm ficpt.asm \
--- a/level2/coco3_6309/modules/kernel/makefile	Sun May 26 15:39:03 2013 -0500
+++ b/level2/coco3_6309/modules/kernel/makefile	Sun Jun 02 15:30:19 2013 -0500
@@ -11,7 +11,7 @@
 SYSCALLS	= fallimg.asm fallram.asm falltsk.asm faproc.asm fcmpnam.asm \
 		fcpymem.asm fdatlog.asm fdelram.asm ffmodul.asm ffreehb.asm \
 		fld.asm fldabx.asm flink.asm fmove.asm fnproc.asm fprsnam.asm \
-		freboot.asm fsrqmem.asm fssvc.asm fvmodul.asm \
+		fdebug.asm fsrqmem.asm fssvc.asm fvmodul.asm \
 		fallbit.asm fallprc.asm fchain.asm fclrblk.asm fcrcmod.asm \
 		fdelimg.asm fexit.asm ffind64.asm ffork.asm fgblkmp.asm \
 		fgcmdir.asm fgmoddr.asm fgprdsc.asm fgprocp.asm ficpt.asm \
--- a/level2/modules/kernel/ccbkrn.asm	Sun May 26 15:39:03 2013 -0500
+++ b/level2/modules/kernel/ccbkrn.asm	Sun Jun 02 15:30:19 2013 -0500
@@ -757,8 +757,6 @@
 	ldb	#E$UnkSvc	get error code
 	bra	L0355		return with it
 		
-	use	freboot.asm
-		
 	use	fssvc.asm
 		
 	use	flink.asm
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/level2/modules/kernel/fdebug.asm	Sun Jun 02 15:30:19 2013 -0500
@@ -0,0 +1,64 @@
+******************************************************                                                                                                 
+* F$Debug entry point                                                                                                                                  
+*                                                                                                                                                      
+* Enter the debugger (or reboot)
+*
+* Input:  A = Function code                                                                                                                            
+* 
+
+FDebug  equ   *
+* Determine if this is a system process or super user
+* Only they have permission to reboot
+         lda   R$A,u
+         cmpa  #255         reboot request
+         bne   leave        nope
+         ldx   <D.Proc
+         ldd   P$User,x     get user ID
+         beq   REBOOT
+         comb
+         ldb   #E$UnkSvc
+leave    rts 
+
+* NOTE: HIGHLY MACHINE DEPENDENT CODE!
+* THIS CODE IS SPECIFIC TO THE COCO 3!
+REBOOT   orcc  #IntMasks  turn off IRQ's
+         clrb
+         stb   >$FFA0     map in block 0
+         stb   >$0071     cold reboot
+         lda   #$38       bottom of DECB block mapping
+         sta   >$FFA0     map in block zero
+         stb   >$0071     and cold reboot here, too
+         ldu   #$0000       force code to go at offset $0000
+         leax  ReBootLoc,pc  reboot code
+         ldy   #CodeSize
+cit.loop lda   ,x+
+         sta   ,u+
+         leay  -1,y
+         bne   cit.loop
+         clr   >$FEED     cold reboot
+         clr   >$FFD8     go to low speed
+         jmp   >$0000       jump to the reset code
+
+ReBootLoc
+         ldd   #$3808       block $38, 8 times
+         ldx   #$FFA0       where to put it
+Lp       sta   8,x        put into map 1
+         sta   ,x+        and into map 0
+         inca
+         decb             count down
+         bne   Lp
+
+         lda   #$4C       standard DECB mapping
+         sta   >$FF90
+         clr   >$FF91     go to map type 0
+         clr   >$FFDE     and to all-ROM mode
+         ldd   #$FFFF
+*         clrd               executes as CLRA on a 6809
+         fdb   $104F
+         tstb               is it a 6809?
+         bne   Reset        yup, skip ahead
+*         ldmd  #$00       go to 6809 mode!
+         fcb   $11,$3D,$00
+Reset    jmp   [$FFFE]    do a reset
+CodeSize equ   *-ReBootLoc
+
--- a/level2/modules/kernel/freboot.asm	Sun May 26 15:39:03 2013 -0500
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-******************************************************
-* F$ReBoot entry point
-*   Currently disabled (doesn't work)
-*   Besides, there's no need for this code to be in system memory.
-*   A user-mode program can do this just as well.
-*
-* Entry A = 0 Cold ReBoot
-*         = 1 Quit to RSDOS
-*
-*ReBoot   equ    *
-*         orcc   #Carry       Set error flag
-*         rts                 Exit
-*        tst    R$A,u        Cold start (a=0)
-*        bne    WarmBt       no, attempt a warm boot
-*WarmBt   orcc   #IntMasks
-*         ldb    #CodeSize
-*         leax   BootCode,pc
-*         tfr    0,y
-*BootLoop lda    ,x+
-*         sta    ,y+
-*         decb
-*         bne    BootLoop
-*         jmp    >$0000
-*BootCode equ   *
-*        lda   >$ffa8
-*        sta   >$ffa0
-*         clra
-*         sta   >$ff90
-*        sta   >$ff91
-*         jmp   >$ed5f
-*CodeSize equ   *-BootCode
-
--- a/level2/modules/kernel/krn.asm	Sun May 26 15:39:03 2013 -0500
+++ b/level2/modules/kernel/krn.asm	Sun Jun 02 15:30:19 2013 -0500
@@ -651,8 +651,6 @@
 	ldb	#E$UnkSvc	get error code
 	bra	L0355		return with it
 		
-	use	freboot.asm
-		
 	use	fssvc.asm
 		
 	use	flink.asm
--- a/level2/modules/kernel/krnp2.asm	Sun May 26 15:39:03 2013 -0500
+++ b/level2/modules/kernel/krnp2.asm	Sun Jun 02 15:30:19 2013 -0500
@@ -60,6 +60,9 @@
 *  18r7    2004/06/18  Boisy G. Pitre
 * Kernel no longer attempts a reboot when failing to open term device, but
 * crashes upon error.
+*
+*  19      2013/05/29  Boisy G. Pitre
+* F$Debug now incorporated, allows for reboot.
 
          nam    krnp2
          ttl    NitrOS-9 Level 2 Kernel Part 2
@@ -73,8 +76,8 @@
          ENDC
 
 TC9      set    false       "true" use TC-9 6309 trap vector
-Edition  equ    18
-Revision equ    7
+Edition  equ    19
+Revision equ    0
 
          mod    eom,MName,Systm,ReEnt+Revision,krnp2,$0100
 
@@ -326,6 +329,8 @@
          fdb    FClrBlk-*-2
          fcb    F$GCMDir+$80
          fdb    FGCMDir-*-2
+         fcb    F$Debug
+         fdb    FDebug-*-2
          fcb    F$CRCMod    new system call to change module CRC calcs on/off
          fdb    FCRCMod-*-2
          fcb    $7f
@@ -420,6 +425,8 @@
 
          use    fgcmdir.asm
 
+         use    fdebug.asm
+
          emod
 eom      equ   *
          end
--- a/level3/coco3_6309/cmds/defsfile	Sun May 26 15:39:03 2013 -0500
+++ b/level3/coco3_6309/cmds/defsfile	Sun Jun 02 15:30:19 2013 -0500
@@ -1,2 +1,2 @@
           use    ../defsfile
-          use    scfdefs
+          use    scf.d
--- a/level3/coco3_6309/cmds/makefile	Sun May 26 15:39:03 2013 -0500
+++ b/level3/coco3_6309/cmds/makefile	Sun Jun 02 15:30:19 2013 -0500
@@ -4,7 +4,7 @@
 vpath %.asm $(LEVEL3)/cmds:$(LEVEL2)/cmds:$(LEVEL1)/cmds:$(NITROS9DIR)/3rdparty/packages/basic09
 
 DEPENDS		= ./makefile
-AFLAGS		+= -e -aH6309=1 -i=$(NITROS9DIR)/3rdparty/packages/basic09
+AFLAGS		+= -DH6309=1 -I=$(NITROS9DIR)/3rdparty/packages/basic09
 
 CMDS		= asm attr backup binex build cmp cobbler copy cputype \
 		date dcheck debug ded deiniz del deldir devs dir dirsort disasm \
@@ -25,22 +25,22 @@
 all:	$(CMDS) $(CMDS_D2) shell utilpak1 $(DEPENDS)
 
 runb:	runb.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aPWD=1
+	$(AS) $(AFLAGS) $< $(ASOUT)$@ -DPWD=1
 	$(MERGE) $@ $(SUBS)>$@.tmp
 	$(RM) $@
 	$(MOVE) $@.tmp $@
 
 tmode:	xmode.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aTMODE=1
+	$(AS) $(AFLAGS) $< $(ASOUT)$@ -DTMODE=1
 
 xmode:	xmode.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aXMODE=1
+	$(AS) $(AFLAGS) $< $(ASOUT)$@ -DXMODE=1
 
 pwd:	pd.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aPWD=1
+	$(AS) $(AFLAGS) $< $(ASOUT)$@ -DPWD=1
 
 pxd:	pd.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aPXD=1
+	$(AS) $(AFLAGS) $< $(ASOUT)$@ -DPXD=1
 
 shell:  $(SHELLMODS) $(DEPENDS)
 	$(MERGE) $(SHELLMODS)>$@
--- a/level3/coco3_6309/modules/kernel/makefile	Sun May 26 15:39:03 2013 -0500
+++ b/level3/coco3_6309/modules/kernel/makefile	Sun Jun 02 15:30:19 2013 -0500
@@ -4,14 +4,14 @@
 vpath %.asm $(LEVEL3)/modules/kernel:$(LEVEL2)/modules/kernel:$(LEVEL1)/modules/kernel
 
 DEPENDS		= ./makefile
-AFLAGS		+= -e -aH6309=1 -I$(LEVEL2)/modules/kernel -I$(LEVEL1)/modules/kernel
+AFLAGS		+= -DH6309=1 -I$(LEVEL2)/modules/kernel -I$(LEVEL1)/modules/kernel
 
 KERNEL		= krn
 KERNELP2	= krnp2
 SYSCALLS	= fallimg.asm fallram.asm falltsk.asm faproc.asm fcmpnam.asm \
 		fcpymem.asm fdatlog.asm fdelram.asm ffmodul.asm ffreehb.asm \
 		fld.asm fldabx.asm flink.asm fmove.asm fnproc.asm fprsnam.asm \
-		freboot.asm fsrqmem.asm fssvc.asm fvmodul.asm \
+		fdebug.asm fsrqmem.asm fssvc.asm fvmodul.asm \
 		fallbit.asm fallprc.asm fchain.asm fclrblk.asm fcrcmod.asm \
 		fdelimg.asm fexit.asm ffind64.asm ffork.asm fgblkmp.asm \
 		fgcmdir.asm fgmoddr.asm fgprdsc.asm fgprocp.asm ficpt.asm \
--- a/level3/coco3_6309/modules/makefile	Sun May 26 15:39:03 2013 -0500
+++ b/level3/coco3_6309/modules/makefile	Sun Jun 02 15:30:19 2013 -0500
@@ -3,18 +3,18 @@
 
 vpath %.asm kernel:$(LEVEL2)/modules/kernel:$(LEVEL3)/modules:$(LEVEL2)/modules:$(LEVEL1)/modules
 
-AFLAGS		+= -e -aH6309=1 -I$(LEVEL1)/modules
+AFLAGS		+= -DH6309=1 -I$(LEVEL1)/modules
 
-CLOCKELIM       = -aRTCElim=1
-CLOCKDISTO2     = -aRTCDsto2=1
-CLOCKDISTO4     = -aRTCDsto4=1
-CLOCKBNB        = -aRTCBB=1
-CLOCKSMART      = -aRTCSmart=1 -aMPIFlag=1
-CLOCKHARRIS     = -aRTCHarrs=1
-CLOCKCLOUD9     = -aRTCCloud9=1
-CLOCKSOFT       = -aRTCSoft=1
-CLOCKMESSEMU    = -aRTCMessEmu=1
-CLOCKJVEMU      = -aRTCJVEmu=1
+CLOCKELIM       = -DRTCElim=1
+CLOCKDISTO2     = -DRTCDsto2=1
+CLOCKDISTO4     = -DRTCDsto4=1
+CLOCKBNB        = -DRTCBB=1
+CLOCKSMART      = -DRTCSmart=1 -DMPIFlag=1
+CLOCKHARRIS     = -DRTCHarrs=1
+CLOCKCLOUD9     = -DRTCCloud9=1
+CLOCKSOFT       = -DRTCSoft=1
+CLOCKMESSEMU    = -DRTCMessEmu=1
+CLOCKJVEMU      = -DRTCJVEmu=1
 
 DEPENDS		= ./makefile
 TPB		= ../../3rdparty/booters
@@ -55,10 +55,10 @@
 		w8.dw w9.dw w10.dw w11.dw w12.dw w13.dw w14.dw w15.dw \
 		v1.dw v2.dw v3.dw v4.dw v5.dw \
 		v6.dw v7.dw \
-		scdwn.dr term_scdwn.dt n0_scdwn.dd n1_scdwn.dd n2_scdwn.dd n3_scdwn.dd \
-                n4_scdwn.dd n5_scdwn.dd n6_scdwn.dd n7_scdwn.dd \
-		n8_scdwn.dd n9_scdwn.dd n10_scdwn.dd n11_scdwn.dd \
-                n12_scdwn.dd n13_scdwn.dd n14_scdwn.dd
+		scdwv.dr term_scdwv.dt n0_scdwv.dd n1_scdwv.dd n2_scdwv.dd n3_scdwv.dd \
+                n4_scdwv.dd n5_scdwv.dd n6_scdwv.dd n7_scdwv.dd \
+		n8_scdwv.dd n9_scdwv.dd n10_scdwv.dd n11_scdwv.dd \
+                n12_scdwv.dd n13_scdwv.dd n14_scdwv.dd
 
 PIPE		= pipeman.mn pipeman_named.mn \
 		piper.dr \
@@ -84,200 +84,200 @@
 
 # Special cases
 cogrf.io: cowin.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aCoGrf=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DCoGrf=1
 
 rb1773_scii_ff74.dr:    rb1773.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aSCII=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DSCII=1
                                                                             
 rb1773_scii_ff58.dr:    rb1773.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aSCII=1 -aSCIIALT=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DSCII=1 -DSCIIALT=1
                                                                             
 rel_32: rel.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aWidth=32
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DWidth=32
 
 rel_40: rel.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aWidth=40
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DWidth=40
 
 rel_80: rel.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aWidth=80
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DWidth=80
 
 rel_32_50hz: rel.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aWidth=32 -aTkPerSec=50
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DWidth=32 -DTkPerSec=50
 
 rel_40_50hz: rel.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aWidth=40 -aTkPerSec=50
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DWidth=40 -DTkPerSec=50
 
 rel_80_50hz: rel.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aWidth=80 -aTkPerSec=50
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DWidth=80 -DTkPerSec=50
 
 boot_1773_6ms: boot_1773.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aSTEP=0
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DSTEP=0
 
 boot_1773_30ms: boot_1773.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aSTEP=3
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DSTEP=3
 
 sysgo_dd: sysgo.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDD=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDD=1
 	
 sysgo_h0: sysgo.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS)
 	
 # Floppy descriptors
-SSDD35		= -aCyls=35 -aSides=1 -aSectTrk=18 -aSectTrk0=18 \
-		-aInterlv=3 -aSAS=8 -aDensity=1
-DSDD40		= -aCyls=40 -aSides=2 -aSectTrk=18 -aSectTrk0=18 \
-		-aInterlv=3 -aSAS=8 -aDensity=1
-DSDD80		= -aCyls=80 -aSides=2 -aSectTrk=18 -aSectTrk0=18 \
-		-aInterlv=3 -aSAS=8 -aDensity=1 -aD35
+SSDD35		= -DCyls=35 -DSides=1 -DSectTrk=18 -DSectTrk0=18 \
+		-DInterlv=3 -DSAS=8 -DDensity=1
+DSDD40		= -DCyls=40 -DSides=2 -DSectTrk=18 -DSectTrk0=18 \
+		-DInterlv=3 -DSAS=8 -DDensity=1
+DSDD80		= -DCyls=80 -DSides=2 -DSectTrk=18 -DSectTrk0=18 \
+		-DInterlv=3 -DSAS=8 -DDensity=1 -DD35
 
 ddd0_35s.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -aDNum=0 -aDD=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -DDNum=0 -DDD=1
 
 d0_35s.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -aDNum=0
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -DDNum=0
 
 d1_35s.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -aDNum=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -DDNum=1
 
 d2_35s.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -aDNum=2
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -DDNum=2
 
 d3_35s.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -aDNum=3
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -DDNum=3
 
 ddd0_40d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=0 -aDD=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -DDNum=0 -DDD=1
 
 d0_40d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=0
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -DDNum=0
 
 d1_40d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -DDNum=1
 
 d2_40d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=2
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -DDNum=2
 
 ddd0_80d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=0 -aDD=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -DDNum=0 -DDD=1
 
 d0_80d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=0
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -DDNum=0
 
 d1_80d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -DDNum=1
 
 d2_80d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=2
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -DDNum=2
 
 # RAM Disk descriptors
 r0_8k.dd: r0.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aRAMSize=8
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DRAMSize=8
 
 ddr0_8k.dd: r0.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aRAMSize=8 -aDD=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DRAMSize=8 -DDD=1
 
 r0_96k.dd: r0.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aRAMSize=96
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DRAMSize=96
 
 ddr0_96k.dd: r0.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aRAMSize=96 -aDD=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DRAMSize=96 -DDD=1
 
 r0_128k.dd: r0.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aRAMSize=128
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DRAMSize=128
 
 ddr0_128k.dd: r0.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aRAMSize=128 -aDD=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DRAMSize=128 -DDD=1
 
 r0_192k.dd: r0.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aRAMSize=192
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DRAMSize=192
 
 ddr0_192k.dd: r0.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aRAMSize=192 -aDD=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DRAMSize=192 -DDD=1
 
 # DriveWire 3 SCF descriptors
-term_scdwn.dt: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aTERM=1 -aAddr=0
+term_scdwv.dt: scdwvdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DTERM=1 -DAddr=0
 
-n0_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=0
+n0_scdwv.dd: scdwvdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=0
 
-n1_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=1
+n1_scdwv.dd: scdwvdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=1
 
-n2_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=2
+n2_scdwv.dd: scdwvdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=2
 
-n3_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=3
+n3_scdwv.dd: scdwvdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=3
 
-n4_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=4
+n4_scdwv.dd: scdwvdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=4
 
-n5_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=5
+n5_scdwv.dd: scdwvdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=5
 
-n6_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=6
+n6_scdwv.dd: scdwvdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=6
 
-n7_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=7
+n7_scdwv.dd: scdwvdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=7
 
-n8_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=8
+n8_scdwv.dd: scdwvdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=8
 
-n9_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=9
+n9_scdwv.dd: scdwvdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=9
 
-n10_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=10
+n10_scdwv.dd: scdwvdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=10
 
-n11_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=11
+n11_scdwv.dd: scdwvdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=11
 
-n12_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=12
+n12_scdwv.dd: scdwvdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=12
 
-n13_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=13
+n13_scdwv.dd: scdwvdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=13
 
-n14_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=14
+n14_scdwv.dd: scdwvdesc.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=14
 
 # DriveWire 3 RBF descriptors
 ddx0.dd: dwdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDD=1 -aDNum=0
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDD=1 -DDNum=0
 
 x0.dd: dwdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=0
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=0
 
 x1.dd: dwdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=1
 
 x2.dd: dwdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=2
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=2
 
 x3.dd: dwdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=3
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=3
 
 # VDGInt Modules
 covdg.io: covdg.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aCOCO2=1
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DCOCO2=1
 
 covdg_small.io: covdg.asm
 	$(AS) $(AFLAGS) $(ASOUT)$@ $<
 
 # Clocks
 clock_60hz: clock.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aPwrLnFrq=60
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DPwrLnFrq=60
 
 clock_50hz: clock.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aPwrLnFrq=50
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DPwrLnFrq=50
 
 clock2_cloud9: clock2_ds1315.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aCLOUD9=1
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DCLOUD9=1
 
 clock2_bnb: clock2_ds1315.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aBNB=1
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DBNB=1
 
 clean:
 	$(CD) kernel; make $@