Mercurial > hg > Members > kono > nitros9-code

changeset 2669:53c42701f680 lwtools-port

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More parameter fixups for lwasm
author William Astle <lost@l-w.ca>
date Sun, 10 Jun 2012 14:24:04 -0600
parents 07441dfebc27
children 020e7592f7f2
files 3rdparty/booters/makefile 3rdparty/drivers/ide/makefile 3rdparty/drivers/mmc/makefile 3rdparty/drivers/sdisk3/makefile 3rdparty/fmgrs/msf/makefile 3rdparty/packages/basic09/makefile 3rdparty/packages/multivue/cmds_6309/makefile 3rdparty/subrtns/makefile level1/atari/cmds/makefile level1/atari/modules/kernel/makefile level1/atari/modules/makefile level1/coco/cmds/makefile level1/d64/cmds/makefile level1/d64/modules/makefile level1/dalpha/cmds/makefile level1/dalpha/modules/makefile level1/tano/cmds/makefile level1/tano/modules/makefile level2/coco3/modules/makefile level2/coco3_6309/cmds/makefile level2/coco3_6309/modules/kernel/makefile level2/coco3_6309/modules/makefile
diffstat 22 files changed, 295 insertions(+), 295 deletions(-) [+]
line wrap: on
line diff
--- a/3rdparty/booters/makefile	Sun Jun 10 13:35:44 2012 -0600
+++ b/3rdparty/booters/makefile	Sun Jun 10 14:24:04 2012 -0600
@@ -13,37 +13,37 @@
 
 # OS-9 Level Two Booters
 boot_ktlr_id0: boot_scsi.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aLevel=2 -aKTLR=1 -ascsiid=1
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DLevel=2 -DKTLR=1 -Dscsiid=1
 
 boot_ktlr_id5: boot_scsi.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aLevel=2 -aKTLR=1 -ascsiid=32
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DLevel=2 -DKTLR=1 -Dscsiid=32
 
 boot_tc3_id0: boot_scsi.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aLevel=2 -aTC3=1 -ascsiid=1
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DLevel=2 -DTC3=1 -Dscsiid=1
 
 boot_tc3_id5: boot_scsi.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aLevel=2 -aTC3=1 -ascsiid=32
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DLevel=2 -DTC3=1 -Dscsiid=32
 
 boot_vhd: boot_vhd.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aLevel=2
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DLevel=2
 
 boot_mmc_l2: boot_mmc.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aLevel=2
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DLevel=2
 
 # OS-9 Level One Booters
 boot_ktlr_id0_l1: boot_scsi.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aLevel=1 -aKTLR=1 -ascsiid=1
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DLevel=1 -DKTLR=1 -Dscsiid=1
 
 boot_ktlr_id5_l1: boot_scsi.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aLevel=1 -aKTLR=1 -ascsiid=32
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DLevel=1 -DKTLR=1 -Dscsiid=32
 
 boot_tc3_id0_l1: boot_scsi.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aLevel=1 -aTC3=1 -ascsiid=1
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DLevel=1 -DTC3=1 -Dscsiid=1
 
 boot_tc3_id5_l1: boot_scsi.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aLevel=1 -aTC3=1 -ascsiid=32
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DLevel=1 -DTC3=1 -Dscsiid=32
 
 boot_mmc_l1: boot_mmc.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aLevel=1
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DLevel=1
 
 
--- a/3rdparty/drivers/ide/makefile	Sun Jun 10 13:35:44 2012 -0600
+++ b/3rdparty/drivers/ide/makefile	Sun Jun 10 14:24:04 2012 -0600
@@ -6,8 +6,8 @@
 DRVRS		= ccide_l1.dr ccide_l2.dr
 DESCS		= h0_ide_l1.dd h0_ide_l2.dd h1_ide_l1.dd h1_ide_l2.dd dd_ide_l1.dd dd_ide_l2.dd
 ALLOBJS		= $(DRVRS) $(DESCS)
-IDEL1FLAGS	= $(AFLAGS) -aLevel=1
-IDEL2FLAGS	= $(AFLAGS) -aLevel=2
+IDEL1FLAGS	= $(AFLAGS) -DLevel=1
+IDEL2FLAGS	= $(AFLAGS) -DLevel=2
 
 all:	$(ALLOBJS) $(DEPENDS)
 
@@ -21,22 +21,22 @@
 # Descriptors
 # ITDRV is the Master(0)/Slave(1) switch for device descriptors
 h0_ide_l1.dd: idedesc.asm
-	$(AS) $(ASOUT)$@ $< $(IDEL1FLAGS) -aITDRV=0
+	$(AS) $(ASOUT)$@ $< $(IDEL1FLAGS) -DITDRV=0
 
 h0_ide_l2.dd: idedesc.asm
-	$(AS) $(ASOUT)$@ $< $(IDEL2FLAGS) -aITDRV=0
+	$(AS) $(ASOUT)$@ $< $(IDEL2FLAGS) -DITDRV=0
 
 h1_ide_l1.dd: idedesc.asm
-	$(AS) $(ASOUT)$@ $< $(IDEL1FLAGS) -aITDRV=1
+	$(AS) $(ASOUT)$@ $< $(IDEL1FLAGS) -DITDRV=1
 
 h1_ide_l2.dd: idedesc.asm
-	$(AS) $(ASOUT)$@ $< $(IDEL2FLAGS) -aITDRV=1
+	$(AS) $(ASOUT)$@ $< $(IDEL2FLAGS) -DITDRV=1
 
 dd_ide_l1.dd: idedesc.asm
-	$(AS) $(ASOUT)$@ $< $(IDEL1FLAGS) -aITDRV=0 -aDD=1
+	$(AS) $(ASOUT)$@ $< $(IDEL1FLAGS) -DITDRV=0 -DDD=1
 
 dd_ide_l2.dd: idedesc.asm
-	$(AS) $(ASOUT)$@ $< $(IDEL2FLAGS) -aITDRV=0 -aDD=1
+	$(AS) $(ASOUT)$@ $< $(IDEL2FLAGS) -DITDRV=0 -DDD=1
 
 clean:
 	$(RM) $(ALLOBJS)
--- a/3rdparty/drivers/mmc/makefile	Sun Jun 10 13:35:44 2012 -0600
+++ b/3rdparty/drivers/mmc/makefile	Sun Jun 10 14:24:04 2012 -0600
@@ -6,8 +6,8 @@
 DRVRS		= mmcdrv_l1.dr mmcdrv_l2.dr mmcdrv_l1s.dr mmcdrv_l2s.dr 
 DESCS		= h0_mmc_l1.dd h0_mmc_l2.dd h1_mmc_l1.dd h1_mmc_l2.dd dd_mmc_l1.dd dd_mmc_l2.dd
 ALLOBJS		= $(DRVRS) $(DESCS)
-MMCL1FLAGS	= $(AFLAGS) -aLevel=1
-MMCL2FLAGS	= $(AFLAGS) -aLevel=2
+MMCL1FLAGS	= $(AFLAGS) -DLevel=1
+MMCL2FLAGS	= $(AFLAGS) -DLevel=2
 
 all:	$(ALLOBJS) $(DEPENDS)
 
@@ -21,30 +21,30 @@
 # Drivers - optimized for size over speed
 
 mmcdrv_l1s.dr: mmcdrv.asm
-	$(AS) $(ASOUT)$@ $< $(MMCL1FLAGS) -aSMALLC=1
+	$(AS) $(ASOUT)$@ $< $(MMCL1FLAGS) -DSMALLC=1
 
 mmcdrv_l2s.dr: mmcdrv.asm
-	$(AS) $(ASOUT)$@ $< $(MMCL2FLAGS) -aSMALLC=1
+	$(AS) $(ASOUT)$@ $< $(MMCL2FLAGS) -DSMALLC=1
 
 # Descriptors
 # ITDRV is the Drive 0 or 1 switch for device descriptors
 h0_mmc_l1.dd: mmcdesc.asm
-	$(AS) $(ASOUT)$@ $< $(MMCL1FLAGS) -aITDRV=0
+	$(AS) $(ASOUT)$@ $< $(MMCL1FLAGS) -DITDRV=0
 
 h0_mmc_l2.dd: mmcdesc.asm
-	$(AS) $(ASOUT)$@ $< $(MMCL2FLAGS) -aITDRV=0
+	$(AS) $(ASOUT)$@ $< $(MMCL2FLAGS) -DITDRV=0
 
 h1_mmc_l1.dd: mmcdesc.asm
-	$(AS) $(ASOUT)$@ $< $(MMCL1FLAGS) -aITDRV=1
+	$(AS) $(ASOUT)$@ $< $(MMCL1FLAGS) -DITDRV=1
 
 h1_mmc_l2.dd: mmcdesc.asm
-	$(AS) $(ASOUT)$@ $< $(MMCL2FLAGS) -aITDRV=1
+	$(AS) $(ASOUT)$@ $< $(MMCL2FLAGS) -DITDRV=1
 
 dd_mmc_l1.dd: mmcdesc.asm
-	$(AS) $(ASOUT)$@ $< $(MMCL1FLAGS) -aITDRV=0 -aDD=1
+	$(AS) $(ASOUT)$@ $< $(MMCL1FLAGS) -DITDRV=0 -DDD=1
 
 dd_mmc_l2.dd: mmcdesc.asm
-	$(AS) $(ASOUT)$@ $< $(MMCL2FLAGS) -aITDRV=0 -aDD=1
+	$(AS) $(ASOUT)$@ $< $(MMCL2FLAGS) -DITDRV=0 -DDD=1
 
 clean:
 	$(RM) $(ALLOBJS)
--- a/3rdparty/drivers/sdisk3/makefile	Sun Jun 10 13:35:44 2012 -0600
+++ b/3rdparty/drivers/sdisk3/makefile	Sun Jun 10 14:24:04 2012 -0600
@@ -10,52 +10,52 @@
 ALLOBJS		= $(L2DRIVERS) $(NITROSDRIVERS) $(DESCS)
 
 # Device Descriptor Macros
-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=3
+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=3
 
 all:	$(ALLOBJS) $(DEPENDS)
 
 # Device Drivers
 sdisk3_dpj_63.dr: sdisk3_dpj.asm
-	$(AS) $(ASOUT)$@ $< $(AFLAGS) -aNitrOS9=1
+	$(AS) $(ASOUT)$@ $< $(AFLAGS) -DNitrOS9=1
 
 sdisk3_dmc_63.dr: sdisk3_dmc.asm
-	$(AS) $(ASOUT)$@ $< $(AFLAGS) -aNitrOS9=1
+	$(AS) $(ASOUT)$@ $< $(AFLAGS) -DNitrOS9=1
 
 # Device Descriptors
 # 35 Track Single-Sided
 ddd0_35s.dd: sdisk3desc.asm
-	$(AS) $(ASOUT)$@ $< $(AFLAGS) $(SSDD35) -aDD=1
+	$(AS) $(ASOUT)$@ $< $(AFLAGS) $(SSDD35) -DDD=1
 
 d0_35s.dd: sdisk3desc.asm
 	$(AS) $(ASOUT)$@ $< $(AFLAGS) $(SSDD35)
 
 d1_35s.dd: sdisk3desc.asm
-	$(AS) $(ASOUT)$@ $< $(AFLAGS) $(SSDD35) -aDNum=1
+	$(AS) $(ASOUT)$@ $< $(AFLAGS) $(SSDD35) -DDNum=1
 
 # 40 Track Double-Sided
 ddd0_40d.dd: sdisk3desc.asm
-	$(AS) $(ASOUT)$@ $< $(AFLAGS) $(DSDD40) -aDD=1
+	$(AS) $(ASOUT)$@ $< $(AFLAGS) $(DSDD40) -DDD=1
 
 d0_40d.dd: sdisk3desc.asm
 	$(AS) $(ASOUT)$@ $< $(AFLAGS) $(DSDD40)
 
 d1_40d.dd: sdisk3desc.asm
-	$(AS) $(ASOUT)$@ $< $(AFLAGS) $(DSDD40) -aDNum=1
+	$(AS) $(ASOUT)$@ $< $(AFLAGS) $(DSDD40) -DDNum=1
 
 # 80 Track Double-Sided
 ddd0_80d.dd: sdisk3desc.asm
-	$(AS) $(ASOUT)$@ $< $(AFLAGS) $(DSDD80) -aDD=1
+	$(AS) $(ASOUT)$@ $< $(AFLAGS) $(DSDD80) -DDD=1
 
 d0_80d.dd: sdisk3desc.asm
 	$(AS) $(ASOUT)$@ $< $(AFLAGS) $(DSDD80)
 
 d1_80d.dd: sdisk3desc.asm
-	$(AS) $(ASOUT)$@ $< $(AFLAGS) $(DSDD80) -aDNum=1
+	$(AS) $(ASOUT)$@ $< $(AFLAGS) $(DSDD80) -DDNum=1
 
 clean:
 	$(RM) $(ALLOBJS)
--- a/3rdparty/fmgrs/msf/makefile	Sun Jun 10 13:35:44 2012 -0600
+++ b/3rdparty/fmgrs/msf/makefile	Sun Jun 10 14:24:04 2012 -0600
@@ -15,7 +15,7 @@
 	$(RM) $(ALLOBJS)
 
 msf_6309.mn: msf.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)$@ -e -aH6309=1
+	$(AS) $(AFLAGS) $< $(ASOUT)$@ -DH6309=1
 
 msf_6809.mn: msf.asm
 	$(AS) $(AFLAGS) $< $(ASOUT)$@
--- a/3rdparty/packages/basic09/makefile	Sun Jun 10 13:35:44 2012 -0600
+++ b/3rdparty/packages/basic09/makefile	Sun Jun 10 14:24:04 2012 -0600
@@ -3,7 +3,7 @@
 DISK	= basic09v010100.dsk
 
 # NitrOS-9
-H6309		= $(AFLAGS) -aH6309=1 -e
+H6309		= $(AFLAGS) -DH6309=1
 # Non-NitrOS-9
 M6809		= $(AFLAGS)
 
--- a/3rdparty/packages/multivue/cmds_6309/makefile	Sun Jun 10 13:35:44 2012 -0600
+++ b/3rdparty/packages/multivue/cmds_6309/makefile	Sun Jun 10 14:24:04 2012 -0600
@@ -2,7 +2,7 @@
 
 vpath %.asm ../cmds_6809
 
-AFLAGS		+= -e
+#AFLAGS		+= -e
 DEPENDS		= ./makefile
 
 OSCMDS		= $(LEVEL2)/coco3_6309/cmds/shell $(LEVEL2)/coco3_6309/cmds/utilpak1 \
--- a/3rdparty/subrtns/makefile	Sun Jun 10 13:35:44 2012 -0600
+++ b/3rdparty/subrtns/makefile	Sun Jun 10 14:24:04 2012 -0600
@@ -16,10 +16,10 @@
 	@$(ECHO) "**************************************************"
 
 hires_l1: hires.asm
-	$(AS) $(ASOUT)$@ $< $(AFLAGS) -aLevel=1
+	$(AS) $(ASOUT)$@ $< $(AFLAGS) -DLevel=1
 
 hires_l2: hires.asm
-	$(AS) $(ASOUT)$@ $< $(AFLAGS) -aLevel=2
+	$(AS) $(ASOUT)$@ $< $(AFLAGS) -DLevel=2
 
 clean:
 	$(RM) $(ALLOBJS)
--- a/level1/atari/cmds/makefile	Sun Jun 10 13:35:44 2012 -0600
+++ b/level1/atari/cmds/makefile	Sun Jun 10 14:24:04 2012 -0600
@@ -6,7 +6,7 @@
 
 DEPENDS		= ./makefile
 
-AFLAGS		+= -i=$(NITROS9DIR)/3rdparty/packages/basic09
+AFLAGS		+= --includedir=$(NITROS9DIR)/3rdparty/packages/basic09
 LFLAGS		+= -l=$(NITROS9DIR)/lib/net.l -l=$(NITROS9DIR)/lib/alib.l -l=$(NITROS9DIR)/lib/sys6809l1.l
 
 BASIC09FILES	= basic09.asm runb.asm gfx.asm inkey.asm syscall.asm
@@ -29,16 +29,16 @@
 all:	$(ALLOBJS)
 
 pwd:	pd.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aPWD=1
+	$(AS) $(AFLAGS) $< $(ASOUT)$@ -DPWD=1
 
 xmode:	xmode.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aXMODE=1
+	$(AS) $(AFLAGS) $< $(ASOUT)$@ -DXMODE=1
 
 tmode:	xmode.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aTMODE=1
+	$(AS) $(AFLAGS) $< $(ASOUT)$@ -DTMODE=1
 
 pxd:	pd.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aPXD=1
+	$(AS) $(AFLAGS) $< $(ASOUT)$@ -DPXD=1
 	
 clean:
 	$(RM) $(ALLOBJS)
--- a/level1/atari/modules/kernel/makefile	Sun Jun 10 13:35:44 2012 -0600
+++ b/level1/atari/modules/kernel/makefile	Sun Jun 10 14:24:04 2012 -0600
@@ -9,7 +9,7 @@
 KERNELP2	= krnp2
 SYSCALLS	= fcmpnam.asm fprsnam.asm
 
-AFLAGS		+= -aATARI=1 -I$(LEVEL1)/modules/kernel
+AFLAGS		+= -DATARI=1 -I$(LEVEL1)/modules/kernel
 
 ALLOBJS		= $(KERNEL) $(KERNELP2)
 
--- a/level1/atari/modules/makefile	Sun Jun 10 13:35:44 2012 -0600
+++ b/level1/atari/modules/makefile	Sun Jun 10 14:24:04 2012 -0600
@@ -5,7 +5,7 @@
 
 AFLAGS		+= -I$(LEVEL1)/modules
 
-CLOCKSOFT       = -aRTCSoft=1
+CLOCKSOFT       = -DRTCSoft=1
 
 DEPENDS		= ./makefile
 TPB		= $(3RDPARTY)/booters
@@ -43,79 +43,79 @@
 
 
 sysgo_rom: sysgo.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aROM=1
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DROM=1
 
 # 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
 
 # DriveWire 3 SCF descriptors
 term_scdwn.dt: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=0
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=0
 
 n_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=255
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=255
 
 n1_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=1
 
 n2_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=2
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=2
 
 n3_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=3
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=3
 
 n4_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=4
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=4
 
 n5_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=5
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=5
 
 n6_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=6
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=6
 
 n7_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=7
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=7
 
 n8_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=8
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=8
 
 n9_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=9
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=9
 
 n10_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=10
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=10
 
 n11_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=11
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=11
 
 n12_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=12
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=12
 
 n13_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=13
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=13
 
 midi_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=14
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=14
 
 # 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
 
 clean:
 	$(CD) kernel; make $@
--- a/level1/coco/cmds/makefile	Sun Jun 10 13:35:44 2012 -0600
+++ b/level1/coco/cmds/makefile	Sun Jun 10 14:24:04 2012 -0600
@@ -29,16 +29,16 @@
 all:	$(ALLOBJS)
 
 pwd:	pd.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aPWD=1
+	$(AS) $(AFLAGS) $< $(ASOUT)$@ -DPWD=1
 
 xmode:	xmode.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aXMODE=1
+	$(AS) $(AFLAGS) $< $(ASOUT)$@ -DXMODE=1
 
 tmode:	xmode.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aTMODE=1
+	$(AS) $(AFLAGS) $< $(ASOUT)$@ -DTMODE=1
 
 pxd:	pd.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aPXD=1
+	$(AS) $(AFLAGS) $< $(ASOUT)$@ -DPXD=1
 	
 clean:
 	$(RM) $(ALLOBJS)
--- a/level1/d64/cmds/makefile	Sun Jun 10 13:35:44 2012 -0600
+++ b/level1/d64/cmds/makefile	Sun Jun 10 14:24:04 2012 -0600
@@ -41,19 +41,19 @@
 
 
 pwd:	pd.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aPWD=1
+	$(AS) $(AFLAGS) $< $(ASOUT)$@ -DPWD=1
 
 xmode:	xmode.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aXMODE=1
+	$(AS) $(AFLAGS) $< $(ASOUT)$@ -DXMODE=1
 
 tmode:	xmode.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aTMODE=1
+	$(AS) $(AFLAGS) $< $(ASOUT)$@ -DTMODE=1
 
 pxd:	pd.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aPXD=1
+	$(AS) $(AFLAGS) $< $(ASOUT)$@ -DPXD=1
 	
 cobbler_dragon: cobbler.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)cobbler_dragon -aDRAGON=1
+	$(AS) $(AFLAGS) $< $(ASOUT)cobbler_dragon -DDRAGON=1
 
 clean:
 	$(RM) $(ALLOBJS)
--- a/level1/d64/modules/makefile	Sun Jun 10 13:35:44 2012 -0600
+++ b/level1/d64/modules/makefile	Sun Jun 10 14:24:04 2012 -0600
@@ -27,16 +27,16 @@
 
 AFLAGS		+= -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
@@ -81,94 +81,94 @@
 	$(CP) kernel/$@ .
 
 boot_d64:	boot_d64.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=0 -aStep=$(STEP)
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=0 -DSTEP=$(STEP)
 
 # 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_bnb: clock2_ds1315.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aBNB=1
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DBNB=1
 
 clock2_cloud9: clock2_ds1315.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aCLOUD9=1
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DCLOUD9=1
 
 
 # Floppy descriptors
-SSDD35		= -aCyls=35 -aSides=1 -aSectTrk=18 -aSectTrk0=18 \
-		-aInterlv=2 -aSAS=8 -aDensity=1 -aStep=0
-SSDD40		= -aCyls=40 -aSides=1 -aSectTrk=18 -aSectTrk0=18 \
-		-aInterlv=2 -aSAS=8 -aDensity=1 -aStep=$(STEP)
-DSDD40		= -aCyls=40 -aSides=2 -aSectTrk=18 -aSectTrk0=18 \
-		-aInterlv=2 -aSAS=8 -aDensity=1 -aStep=$(STEP)
-SSDD80		= -aCyls=80 -aSides=1 -aSectTrk=18 -aSectTrk0=18 \
-		-aInterlv=2 -aSAS=8 -aDensity=1 -aD35 -aStep=$(STEP)
-DSDD80		= -aCyls=80 -aSides=2 -aSectTrk=18 -aSectTrk0=18 \
-		-aInterlv=2 -aSAS=8 -aDensity=1 -aD35 -aStep=$(STEP)
+SSDD35		= -DCyls=35 -DSides=1 -DSectTrk=18 -DSectTrk0=18 \
+		-DInterlv=2 -DSAS=8 -DDensity=1 -DSTEP=0
+SSDD40		= -DCyls=40 -DSides=1 -DSectTrk=18 -DSectTrk0=18 \
+		-DInterlv=2 -DSAS=8 -DDensity=1 -DSTEP=$(STEP)
+DSDD40		= -DCyls=40 -DSides=2 -DSectTrk=18 -DSectTrk0=18 \
+		-DInterlv=2 -DSAS=8 -DDensity=1 -DSTEP=$(STEP)
+SSDD80		= -DCyls=80 -DSides=1 -DSectTrk=18 -DSectTrk0=18 \
+		-DInterlv=2 -DSAS=8 -DDensity=1 -DD35 -DSTEP=$(STEP)
+DSDD80		= -DCyls=80 -DSides=2 -DSectTrk=18 -DSectTrk0=18 \
+		-DInterlv=2 -DSAS=8 -DDensity=1 -DD35 -DSTEP=$(STEP)
 
 #Dragon 64
 #Dragon 64 Drives can be double or single sided, but assume 
 # that /d0 and /d1 are double sided 40 track.
 
 ddd0_40d.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=0 -aDD=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -DDNum=0 -DDD=1
 
 d0_40d.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=0
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -DDNum=0
 
 d1_40d.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -DDNum=1
 
 d2_40d.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=2
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -DDNum=2
 
 d3_40d.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=3
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -DDNum=3
 
 #Single sided 40 track drives.
 ddd0_40s.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD40) -aDNum=0 -aDD=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD40) -DDNum=0 -DDD=1
 
 d0_40s.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD40) -aDNum=0
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD40) -DDNum=0
 
 d1_40s.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD40) -aDNum=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD40) -DDNum=1
 
 d2_40s.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD40) -aDNum=2
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD40) -DDNum=2
 
 d3_40s.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD40) -aDNum=3
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD40) -DDNum=3
 
 
 ddd0_80d.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=0 -aDD=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -DDNum=0 -DDD=1
 
 d0_80d.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=0
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -DDNum=0
 
 d1_80d.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -DDNum=1
 
 d2_80d.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=2
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -DDNum=2
 
 d3_80d.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=3
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -DDNum=3
 
 
 sysgo_dd: sysgo.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aDD=1
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DDD=1
 
 sysgo_h0: sysgo.asm
 	$(AS) $(AFLAGS) $(ASOUT)$@ $<
 
 ddisk.dr: ddisk.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ -aUPGRADED32=$(UPGRADED32) $< 
+	$(AS) $(AFLAGS) $(ASOUT)$@ -DUPGRADED32=$(UPGRADED32) $< 
 
 
 clean:
--- a/level1/dalpha/cmds/makefile	Sun Jun 10 13:35:44 2012 -0600
+++ b/level1/dalpha/cmds/makefile	Sun Jun 10 14:24:04 2012 -0600
@@ -41,19 +41,19 @@
 
 
 pwd:	pd.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aPWD=1
+	$(AS) $(AFLAGS) $< $(ASOUT)$@ -DPWD=1
 
 xmode:	xmode.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aXMODE=1
+	$(AS) $(AFLAGS) $< $(ASOUT)$@ -DXMODE=1
 
 tmode:	xmode.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aTMODE=1
+	$(AS) $(AFLAGS) $< $(ASOUT)$@ -DTMODE=1
 
 pxd:	pd.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aPXD=1
+	$(AS) $(AFLAGS) $< $(ASOUT)$@ -DPXD=1
 	
 cobbler_dragon: cobbler.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)cobbler_dragon -aDRAGON=1
+	$(AS) $(AFLAGS) $< $(ASOUT)cobbler_dragon -DDRAGON=1
 
 clean:
 	$(RM) $(ALLOBJS)
--- a/level1/dalpha/modules/makefile	Sun Jun 10 13:35:44 2012 -0600
+++ b/level1/dalpha/modules/makefile	Sun Jun 10 14:24:04 2012 -0600
@@ -27,16 +27,16 @@
 
 AFLAGS		+= -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
@@ -80,72 +80,72 @@
 	$(CP) kernel/$@ .
 
 boot_dalpha:	boot_d64.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=0 -aStep=$(STEP)
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=0 -DSTEP=$(STEP)
 
 # 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_bnb: clock2_ds1315.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aBNB=1
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DBNB=1
 
 clock2_cloud9: clock2_ds1315.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aCLOUD9=1
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DCLOUD9=1
 
 # Floppy descriptors
-SSDD35		= -aCyls=35 -aSides=1 -aSectTrk=18 -aSectTrk0=18 \
-		-aInterlv=2 -aSAS=8 -aDensity=1 -aStep=0
-SSDD40		= -aCyls=40 -aSides=1 -aSectTrk=18 -aSectTrk0=18 \
-		-aInterlv=2 -aSAS=8 -aDensity=1 -aStep=$(STEP)
-DSDD40		= -aCyls=40 -aSides=2 -aSectTrk=18 -aSectTrk0=18 \
-		-aInterlv=2 -aSAS=8 -aDensity=1 -aStep=$(STEP)
-SSDD80		= -aCyls=80 -aSides=1 -aSectTrk=18 -aSectTrk0=18 \
-		-aInterlv=2 -aSAS=8 -aDensity=1 -aD35 -aStep=$(STEP)
-DSDD80		= -aCyls=80 -aSides=2 -aSectTrk=18 -aSectTrk0=18 \
-		-aInterlv=2 -aSAS=8 -aDensity=1 -aD35 -aStep=$(STEP)
+SSDD35		= -DCyls=35 -DSides=1 -DSectTrk=18 -DSectTrk0=18 \
+		-DInterlv=2 -DSAS=8 -DDensity=1 -DSTEP=0
+SSDD40		= -DCyls=40 -DSides=1 -DSectTrk=18 -DSectTrk0=18 \
+		-DInterlv=2 -DSAS=8 -DDensity=1 -DSTEP=$(STEP)
+DSDD40		= -DCyls=40 -DSides=2 -DSectTrk=18 -DSectTrk0=18 \
+		-DInterlv=2 -DSAS=8 -DDensity=1 -DSTEP=$(STEP)
+SSDD80		= -DCyls=80 -DSides=1 -DSectTrk=18 -DSectTrk0=18 \
+		-DInterlv=2 -DSAS=8 -DDensity=1 -DD35 -DSTEP=$(STEP)
+DSDD80		= -DCyls=80 -DSides=2 -DSectTrk=18 -DSectTrk0=18 \
+		-DInterlv=2 -DSAS=8 -DDensity=1 -DD35 -DSTEP=$(STEP)
 
 #Dragon Alpha
 # Internal drives on Alpha are Single Sided 80 track.
 
 ddd0_80s.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD80) -aDNum=0 -aDD=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD80) -DDNum=0 -DDD=1
 
 ddd0_80d.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=0 -aDD=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -DDNum=0 -DDD=1
 
 d0_80s.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD80) -aDNum=0
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD80) -DDNum=0
 	
 d0_80d.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=0
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -DDNum=0
 	
 d1_80s.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD80) -aDNum=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD80) -DDNum=1
 
 d1_80d.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -DDNum=1
 
 d2_80s.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD80) -aDNum=2
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD80) -DDNum=2
 
 d2_80d.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=2
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -DDNum=2
 
 d3_80s.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD80) -aDNum=3
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD80) -DDNum=3
 
 d3_80d.dd: ddiskdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=3
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -DDNum=3
 
 adisk.dr: ddisk.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS)
 
 
 sysgo_dd: sysgo.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aDD=1
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DDD=1
 
 sysgo_h0: sysgo.asm
 	$(AS) $(AFLAGS) $(ASOUT)$@ $<
--- a/level1/tano/cmds/makefile	Sun Jun 10 13:35:44 2012 -0600
+++ b/level1/tano/cmds/makefile	Sun Jun 10 14:24:04 2012 -0600
@@ -41,19 +41,19 @@
 
 
 pwd:	pd.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aPWD=1
+	$(AS) $(AFLAGS) $< $(ASOUT)$@ -DPWD=1
 
 xmode:	xmode.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aXMODE=1
+	$(AS) $(AFLAGS) $< $(ASOUT)$@ -DXMODE=1
 
 tmode:	xmode.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aTMODE=1
+	$(AS) $(AFLAGS) $< $(ASOUT)$@ -DTMODE=1
 
 pxd:	pd.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)$@ -aPXD=1
+	$(AS) $(AFLAGS) $< $(ASOUT)$@ -DPXD=1
 	
 cobbler_dragon: cobbler.asm
-	$(AS) $(AFLAGS) $< $(ASOUT)cobbler_dragon -aDRAGON=1
+	$(AS) $(AFLAGS) $< $(ASOUT)cobbler_dragon -DDRAGON=1
 
 clean:
 	$(RM) $(ALLOBJS)
--- a/level1/tano/modules/makefile	Sun Jun 10 13:35:44 2012 -0600
+++ b/level1/tano/modules/makefile	Sun Jun 10 14:24:04 2012 -0600
@@ -58,79 +58,79 @@
 	$(CP) kernel/$@ .
 
 boot_1773_6ms:	boot_1773.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=0 -aSTEP=0
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=0 -DSTEP=0
 
 boot_1773_30ms:	boot_1773.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=0 -aSTEP=3
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=0 -DSTEP=3
 
 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
 
 # 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_bnb: clock2_ds1315.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aBNB=1
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DBNB=1
 
 clock2_cloud9: clock2_ds1315.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aCLOUD9=1
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DCLOUD9=1
 
 # 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
 
 sysgo_dd: sysgo.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aDD=1
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DDD=1
 
 sysgo_h0: sysgo.asm
 	$(AS) $(AFLAGS) $(ASOUT)$@ $<
--- a/level2/coco3/modules/makefile	Sun Jun 10 13:35:44 2012 -0600
+++ b/level2/coco3/modules/makefile	Sun Jun 10 14:24:04 2012 -0600
@@ -5,18 +5,18 @@
 
 AFLAGS		+= -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
-TC3FLAGS        = $(AFLAGS) -aTC3=1 $(FLAGS)
-IDEFLAGS        = $(AFLAGS) -aIDE=1 $(FLAGS)
+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
+TC3FLAGS        = $(AFLAGS) -DTC3=1 $(FLAGS)
+IDEFLAGS        = $(AFLAGS) -DIDE=1 $(FLAGS)
 
 DEPENDS		= ./makefile
 TPB		= $(3RDPARTY)/booters
@@ -102,64 +102,64 @@
 
 # DriveWire 3 Becker Booter
 boot_dw3_becker: boot_dw3.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aBECKER=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DBECKER=1
 
 # DriveWire 3 Becker Submodule
 dw3_becker.sb: dw3.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aBECKER=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DBECKER=1
 
 # CoGrf/CoVDG Modules
 cogrf.io: cowin.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aCoGrf=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DCoGrf=1
 
 covdg.io: covdg.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aCOCO2=1
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DCOCO2=1
 
 covdg_small.io: covdg.asm
 	$(AS) $(AFLAGS) $(ASOUT)$@ $<
 
 # Disto SC-II Drivers
 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 Modules
 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
 
 # Floppy Booters
 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 Modules
 sysgo_dd: sysgo.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDD=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDD=1
 	
 sysgo_h0: sysgo.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS)
 	
 sysgo_rom: sysgo.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aROM=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DROM=1
 	
 # TC^3 SCSI Driver
 lltc3.dr: llscsi.asm
@@ -170,145 +170,145 @@
 	$(AS) $(ASOUT)$@ $< $(IDEFLAGS)
 
 # 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) -aAddr=0
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=0
 
 n_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=255
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=255
 
 n1_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=1
 
 n2_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=2
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=2
 
 n3_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=3
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=3
 
 n4_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=4
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=4
 
 n5_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=5
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=5
 
 n6_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=6
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=6
 
 n7_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=7
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=7
 
 n8_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=8
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=8
 
 n9_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=9
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=9
 
 n10_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=10
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=10
 
 n11_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=11
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=11
 
 n12_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=12
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=12
 
 n13_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=13
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=13
 
 midi_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=14
+	$(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
 
 # TC^3 SCSI Descriptors
 dds0_tc3.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID0) -aDD=1
+	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID0) -DDD=1
 
 s0_tc3.dd: superdesc.asm
 	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID0) $(SCSI_HD)
@@ -336,7 +336,7 @@
 
 # IDE Descriptors
 ddi0_ide.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(IDEFLAGS) $(MASTER) -aDD=1
+	$(AS) $(ASOUT)$@ $< $(IDEFLAGS) $(MASTER) -DDD=1
 
 i0_ide.dd: superdesc.asm
 	$(AS) $(ASOUT)$@ $< $(IDEFLAGS) $(MASTER)
@@ -349,35 +349,35 @@
 
 # RFM descriptors
 ddy0.dd: rfmdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDD=1 -aDNum=0
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDD=1 -DDNum=0
 
 y0.dd: rfmdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=0
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=0
 
 y1.dd: rfmdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=1
 
 y2.dd: rfmdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=2
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=2
 
 y3.dd: rfmdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=3
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=3
 
 # 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
 
 clock2_dw3_becker: clock2_dw3.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aBECKER=1
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DBECKER=1
 
 clean:
 	$(CD) kernel; make $@
--- a/level2/coco3_6309/cmds/makefile	Sun Jun 10 13:35:44 2012 -0600
+++ b/level2/coco3_6309/cmds/makefile	Sun Jun 10 14:24:04 2012 -0600
@@ -1,2 +1,2 @@
 include ../../coco3/cmds/makefile
-AFLAGS          += -e -aH6309=1
+AFLAGS          +=  -DH6309=1
--- a/level2/coco3_6309/modules/kernel/makefile	Sun Jun 10 13:35:44 2012 -0600
+++ b/level2/coco3_6309/modules/kernel/makefile	Sun Jun 10 14:24:04 2012 -0600
@@ -4,7 +4,7 @@
 vpath %.asm $(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
--- a/level2/coco3_6309/modules/makefile	Sun Jun 10 13:35:44 2012 -0600
+++ b/level2/coco3_6309/modules/makefile	Sun Jun 10 14:24:04 2012 -0600
@@ -1,2 +1,2 @@
 include ../../coco3/modules/makefile
-AFLAGS		+= -e -aH6309=1
+AFLAGS		+=  -DH6309=1