Mercurial > hg > Members > kono > nitros9-code
changeset 2997:394e63addfe4
level3 makefiles: Add missing modules parts from level2
- TC3 boot modules
- IDE and SDC flags
- TERM flag for term_scdwv.dt
- midi_scdwv.dd instead of n14_scdwv.dd
author | Gene Heskett <gheskett@wdtv.com> |
---|---|
date | Sun, 26 Oct 2014 08:43:55 +0100 |
parents | 3d6a48f9cf5f |
children | db707ae1397e |
files | level3/coco3/modules/makefile level3/coco3_6309/modules/makefile |
diffstat | 2 files changed, 287 insertions(+), 28 deletions(-) [+] |
line wrap: on
line diff
--- a/level3/coco3/modules/makefile Sun Oct 26 11:28:41 2014 +0100 +++ b/level3/coco3/modules/makefile Sun Oct 26 08:43:55 2014 +0100 @@ -15,22 +15,27 @@ CLOCKSOFT = -DRTCSoft=1 CLOCKMESSEMU = -DRTCMessEmu=1 CLOCKJVEMU = -DRTCJVEmu=1 +TC3FLAGS = $(AFLAGS) -DTC3=1 $(FLAGS) +IDEFLAGS = $(AFLAGS) -DIDE=1 $(FLAGS) +SDFLAGS = $(AFLAGS) -DCOCOSDC=1 -DITTYP=128 $(FLAGS) -DEPENDS = ./makefile -TPB = ../../3rdparty/booters +DEPENDS = ./makefile +TPB = $(3RDPARTY)/booters BOOTERS = boot_1773_6ms boot_1773_30ms \ + boot_tc3 boot_ide \ + boot_dw_becker boot_dw_arduino boot_rom \ boot_burke boot_rampak boot_wd1002 boot_dw BOOTTRACK = rel_32 rel_40 rel_80 rel_32_50hz rel_40_50hz rel_80_50hz $(BOOTERS) krn KERNEL = krnp2 krnp3_perr krnp4_regdump -SYSMODS = ioman init sysgo_h0 sysgo_dd nitro end +SYSMODS = ioman init sysgo_h0 sysgo_dd sysgo_rom rominfo vectors CLOCKS = clock_60hz clock_50hz \ clock2_elim clock2_disto2 clock2_disto4 clock2_bnb \ clock2_smart clock2_harris clock2_cloud9 clock2_soft \ clock2_jvemu clock2_messemu clock2_dw RBF = rbf.mn \ - rbdw.dr dwio.sb \ + rbdw.dr dwio.sb dwio_becker.sb dwio_arduino.sb \ rb1773.dr rb1773_scii_ff74.dr rb1773_scii_ff58.dr \ d0_35s.dd d1_35s.dd d2_35s.dd d3_35s.dd \ d0_40d.dd d1_40d.dd d2_40d.dd d0_80d.dd \ @@ -38,8 +43,13 @@ ddd0_35s.dd ddd0_40d.dd ddd0_80d.dd \ rammer.dr r0_8k.dd r0_96k.dd r0_128k.dd r0_192k.dd \ ddr0_8k.dd ddr0_96k.dd ddr0_128k.dd ddr0_192k.dd md.dd \ - ddx0.dd x0.dd x1.dd x2.dd x3.dd - + myram.dr mr0.dd \ + ddx0.dd x0.dd x1.dd x2.dd x3.dd \ + rbsuper.dr lltc3.dr llide.dr llcocosdc.dr \ + ddi0_ide.dd i0_ide.dd i1_ide.dd ih_ide.dd \ + dds0_tc3.dd s0_tc3.dd s1_tc3.dd s2_tc3.dd s3_tc3.dd s4_tc3.dd \ + s5_tc3.dd s6_tc3.dd sh_tc3.dd \ + ddsd0_cocosdc.dd sd0_cocosdc.dd sd1_cocosdc.dd SCF = scf.mn \ vtio.dr vrn.dr scbbp.dr scbbt.dr scdwp.dr sspak.dr sc6551.dr \ @@ -55,16 +65,19 @@ 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 \ - 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 \ + 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 + n12_scdwv.dd n13_scdwv.dd midi_scdwv.dd \ + term_z_scdwv.dt z1_scdwv.dd z2_scdwv.dd z3_scdwv.dd \ + z4_scdwv.dd z5_scdwv.dd z6_scdwv.dd z7_scdwv.dd \ PIPE = pipeman.mn pipeman_named.mn \ piper.dr \ pipe.dd -# +RFM = rfm.mn rfmdrv.dr ddy0.dd y0.dd y1.dd y2.dd y3.dd # The following macros represent a collection of modules for various # kernel tracks and bootfile configurations. # @@ -72,8 +85,8 @@ KERNEL_RAMPAK = rel_32 $(TPB)/boot_rampak krn KERNEL_KENTON = rel_32 $(TPB)/boot_kenton krn KERNEL_IDE = rel_32 $(TPB)/boot_ide krn - -ALLOBJS = $(BOOTTRACK) $(KERNEL) $(SYSMODS) $(CLOCKS) $(RBF) $(SCF) $(PIPE) +KERNEL_TC3 = rel_32 $(TPB)/boot_tc3 krn +ALLOBJS = $(BOOTTRACK) $(KERNEL) $(SYSMODS) $(CLOCKS) $(RBF) $(SCF) $(PIPE) $(RFM) all: $(ALLOBJS) @@ -82,10 +95,41 @@ $(CD) kernel; make $@ $(OS9COPY) kernel/$@ . -# Special cases +# TC^3 SCSI Booter +boot_tc3: boot_scsi.asm + $(AS) $(ASOUT)$@ $< $(TC3FLAGS) + +# SuperIDE/Glenside IDE Booter +boot_ide: boot_ide.asm + $(AS) $(ASOUT)$@ $< $(IDEFLAGS) + +# DriveWire Becker Booter +boot_dw_becker: boot_dw.asm + $(AS) $< $(ASOUT)$@ $(AFLAGS) -DBECKER=1 + +# DriveWire Becker Submodule +dwio_becker.sb: dwio.asm + $(AS) $< $(ASOUT)$@ $(AFLAGS) -DBECKER=1 + +# DriveWire Becker Booter +boot_dw_arduino: boot_dw.asm + $(AS) $< $(ASOUT)$@ $(AFLAGS) -DARDUINO=1 + +# DriveWire Arduino Submodule +dwio_arduino.sb: dwio.asm + $(AS) $< $(ASOUT)$@ $(AFLAGS) -DARDUINO=1 + +# CoGrf/CoVDG Modules cogrf.io: cowin.asm $(AS) $< $(ASOUT)$@ $(AFLAGS) -DCoGrf=1 +covdg.io: covdg.asm + $(AS) $(AFLAGS) $(ASOUT)$@ $< -DCOCO3=1 + +covdg_small.io: covdg.asm + $(AS) $(AFLAGS) $(ASOUT)$@ $< + +# Disto SC-II Drivers rb1773_scii_ff74.dr: rb1773.asm $(AS) $< $(ASOUT)$@ $(AFLAGS) -DSCII=1 @@ -120,8 +164,19 @@ $(AS) $< $(ASOUT)$@ $(AFLAGS) -DDD=1 sysgo_h0: sysgo.asm - $(AS) $< $(ASOUT)$@ $(AFLAGS) - + $(AS) $< $(ASOUT)$@ $(AFLAGS) + +sysgo_rom: sysgo.asm + $(AS) $< $(ASOUT)$@ $(AFLAGS) -DROM=1 + +# TC^3 SCSI Driver +lltc3.dr: llscsi.asm + $(AS) $(ASOUT)$@ $< $(TC3FLAGS) + +# IDE Driver +llide.dr: llide.asm + $(AS) $(ASOUT)$@ $< $(IDEFLAGS) + # Floppy descriptors SSDD35 = -DCyls=35 -DSides=1 -DSectTrk=18 -DSectTrk0=18 \ -DInterlv=3 -DSAS=8 -DDensity=1 @@ -240,10 +295,34 @@ n13_scdwv.dd: scdwvdesc.asm $(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=13 -n14_scdwv.dd: scdwvdesc.asm +midi_scdwv.dd: scdwvdesc.asm $(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=14 -# DriveWire 3 RBF descriptors +term_z_scdwv.dt: scdwvdesc.asm + $(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=16 + +z1_scdwv.dd: scdwvdesc.asm + $(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=17 + +z2_scdwv.dd: scdwvdesc.asm + $(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=18 + +z3_scdwv.dd: scdwvdesc.asm + $(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=19 + +z4_scdwv.dd: scdwvdesc.asm + $(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=20 + +z5_scdwv.dd: scdwvdesc.asm + $(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=21 + +z6_scdwv.dd: scdwvdesc.asm + $(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=22 + +z7_scdwv.dd: scdwvdesc.asm + $(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=23 + +# DriveWire RBF descriptors ddx0.dd: dwdesc.asm $(AS) $< $(ASOUT)$@ $(AFLAGS) -DDD=1 -DDNum=0 @@ -259,12 +338,72 @@ x3.dd: dwdesc.asm $(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=3 -# VDGInt Modules -covdg.io: covdg.asm - $(AS) $(AFLAGS) $(ASOUT)$@ $< -DCOCO2=1 +# TC^3 SCSI Descriptors +dds0_tc3.dd: superdesc.asm + $(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID0) -DDD=1 + +s0_tc3.dd: superdesc.asm + $(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID0) $(SCSI_HD) + +s1_tc3.dd: superdesc.asm + $(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID1) $(SCSI_HD) + +s2_tc3.dd: superdesc.asm + $(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID2) $(SCSI_HD) + +s3_tc3.dd: superdesc.asm + $(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID3) $(SCSI_HD) + +s4_tc3.dd: superdesc.asm + $(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID4) $(SCSI_HD) + +s5_tc3.dd: superdesc.asm + $(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID5) $(SCSI_HD) + +s6_tc3.dd: superdesc.asm + $(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID6) $(SCSI_HD) + +sh_tc3.dd: superdesc.asm + $(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(HDBDOS) + +# IDE Descriptors +ddi0_ide.dd: superdesc.asm + $(AS) $(ASOUT)$@ $< $(IDEFLAGS) $(MASTER) -DDD=1 -covdg_small.io: covdg.asm - $(AS) $(AFLAGS) $(ASOUT)$@ $< +i0_ide.dd: superdesc.asm + $(AS) $(ASOUT)$@ $< $(IDEFLAGS) $(MASTER) + +i1_ide.dd: superdesc.asm + $(AS) $(ASOUT)$@ $< $(IDEFLAGS) $(SLAVE) + +ih_ide.dd: superdesc.asm + $(AS) $(ASOUT)$@ $< $(IDEFLAGS) $(HDBDOS) + +# SuperSD Descriptors +ddsd0_cocosdc.dd: superdesc.asm + $(AS) $(ASOUT)$@ $< $(SDFLAGS) -DDD=1 + +sd0_cocosdc.dd: superdesc.asm + $(AS) $(ASOUT)$@ $< $(SDFLAGS) -DITDRV=0 + +sd1_cocosdc.dd: superdesc.asm + $(AS) $(ASOUT)$@ $< $(SDFLAGS) -DITDRV=1 + +# RFM descriptors +ddy0.dd: rfmdesc.asm + $(AS) $< $(ASOUT)$@ $(AFLAGS) -DDD=1 -DDNum=0 + +y0.dd: rfmdesc.asm +$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=0 + +y1.dd: rfmdesc.asm + $(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=1 + +y2.dd: rfmdesc.asm + $(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=2 + +y3.dd: rfmdesc.asm + $(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=3 # Clocks clock_60hz: clock.asm
--- a/level3/coco3_6309/modules/makefile Sun Oct 26 11:28:41 2014 +0100 +++ b/level3/coco3_6309/modules/makefile Sun Oct 26 08:43:55 2014 +0100 @@ -15,11 +15,15 @@ CLOCKSOFT = -DRTCSoft=1 CLOCKMESSEMU = -DRTCMessEmu=1 CLOCKJVEMU = -DRTCJVEmu=1 +TC3FLAGS = $(AFLAGS) -DTC3=1 $(FLAGS) +IDEFLAGS = $(AFLAGS) -DIDE=1 $(FLAGS) +SDFLAGS = $(AFLAGS) -DCOCOSDC=1 -DITTYP=128 $(FLAGS) DEPENDS = ./makefile TPB = ../../3rdparty/booters -BOOTERS = boot_1773_6ms boot_1773_30ms \ +BOOTERS = boot_1773_6ms boot_1773_30ms boot_tc3 \ + boot_ide boot_dw_becker boot_dw_arduino \ boot_burke boot_rampak boot_wd1002 boot_dw BOOTTRACK = rel_32 rel_40 rel_80 rel_32_50hz rel_40_50hz rel_80_50hz $(BOOTERS) krn KERNEL = krnp2 krnp3_perr krnp4_regdump @@ -58,13 +62,15 @@ 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 + n12_scdwv.dd n13_scdwv.dd midi_scdwv.dd \ + term_z_scdwv.dt z1_scdwv.dd z2_scdwv.dd z3_scdwv.dd \ + z4_scdwv.dd z5_scdwv.dd z6_scdwv.dd z7_scdwv.dd \ PIPE = pipeman.mn pipeman_named.mn \ piper.dr \ pipe.dd -# +RFM = rfm.mn rfmdrv.dr ddy0.dd y0.dd y1.dd y2.dd y3.dd# # The following macros represent a collection of modules for various # kernel tracks and bootfile configurations. # @@ -72,7 +78,7 @@ KERNEL_RAMPAK = rel_32 $(TPB)/boot_rampak krn KERNEL_KENTON = rel_32 $(TPB)/boot_kenton krn KERNEL_IDE = rel_32 $(TPB)/boot_ide krn - +KERNEL_TC3 = rel_32 $(TPB)/boot_tc3 krn ALLOBJS = $(BOOTTRACK) $(KERNEL) $(SYSMODS) $(CLOCKS) $(RBF) $(SCF) $(PIPE) all: $(ALLOBJS) @@ -86,6 +92,30 @@ cogrf.io: cowin.asm $(AS) $< $(ASOUT)$@ $(AFLAGS) -DCoGrf=1 +# TC3 controller +boot_tc3: boot_scsi.asm + $(AS) $(ASOUT)$@ $< $(TC3FLAGS) + +# SuperIDE/Glenside IDE Booter +boot_ide: boot_ide.asm + $(AS) $(ASOUT)$@ $< $(IDEFLAGS) + +# DriveWire Becker Booter +boot_dw_becker: boot_dw.asm + $(AS) $< $(ASOUT)$@ $(AFLAGS) -DBECKER=1 + +# DriveWire Becker Submodule +dwio_becker.sb: dwio.asm + $(AS) $< $(ASOUT)$@ $(AFLAGS) -DBECKER=1 + +# DriveWire Becker Booter +boot_dw_arduino: boot_dw.asm + $(AS) $< $(ASOUT)$@ $(AFLAGS) -DARDUINO=1 + +# DriveWire Arduino Submodule +dwio_arduino.sb: dwio.asm + $(AS) $< $(ASOUT)$@ $(AFLAGS) -DARDUINO=1 +# Disto SC-II drivers rb1773_scii_ff74.dr: rb1773.asm $(AS) $< $(ASOUT)$@ $(AFLAGS) -DSCII=1 @@ -240,9 +270,32 @@ n13_scdwv.dd: scdwvdesc.asm $(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=13 -n14_scdwv.dd: scdwvdesc.asm +midi_scdwv.dd: scdwvdesc.asm $(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=14 +term_z_scdwv.dt: scdwvdesc.asm + $(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=16 + +z1_scdwv.dd: scdwvdesc.asm + $(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=17 + +z2_scdwv.dd: scdwvdesc.asm + $(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=18 + +z3_scdwv.dd: scdwvdesc.asm + $(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=19 + +z4_scdwv.dd: scdwvdesc.asm + $(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=20 + +z5_scdwv.dd: scdwvdesc.asm + $(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=21 + +z6_scdwv.dd: scdwvdesc.asm + $(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=22 + +z7_scdwv.dd: scdwvdesc.asm + $(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=23 # DriveWire 3 RBF descriptors ddx0.dd: dwdesc.asm $(AS) $< $(ASOUT)$@ $(AFLAGS) -DDD=1 -DDNum=0 @@ -259,13 +312,80 @@ x3.dd: dwdesc.asm $(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=3 +# TC^3 SCSI Descriptors +dds0_tc3.dd: superdesc.asm + $(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID0) -DDD=1 + +s0_tc3.dd: superdesc.asm + $(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID0) $(SCSI_HD) + +s1_tc3.dd: superdesc.asm + $(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID1) $(SCSI_HD) + +s2_tc3.dd: superdesc.asm + $(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID2) $(SCSI_HD) + +s3_tc3.dd: superdesc.asm + $(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID3) $(SCSI_HD) + +s4_tc3.dd: superdesc.asm + $(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID4) $(SCSI_HD) + +s5_tc3.dd: superdesc.asm + $(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID5) $(SCSI_HD) + +s6_tc3.dd: superdesc.asm + $(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID6) $(SCSI_HD) + +sh_tc3.dd: superdesc.asm + $(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(HDBDOS) + +# IDE Descriptors +ddi0_ide.dd: superdesc.asm + $(AS) $(ASOUT)$@ $< $(IDEFLAGS) $(MASTER) -DDD=1 + +i0_ide.dd: superdesc.asm + $(AS) $(ASOUT)$@ $< $(IDEFLAGS) $(MASTER) + +i1_ide.dd: superdesc.asm + $(AS) $(ASOUT)$@ $< $(IDEFLAGS) $(SLAVE) + +ih_ide.dd: superdesc.asm + $(AS) $(ASOUT)$@ $< $(IDEFLAGS) $(HDBDOS) + +# SuperSD Descriptors +ddsd0_cocosdc.dd: superdesc.asm + $(AS) $(ASOUT)$@ $< $(SDFLAGS) -DDD=1 + +sd0_cocosdc.dd: superdesc.asm + $(AS) $(ASOUT)$@ $< $(SDFLAGS) -DITDRV=0 + +sd1_cocosdc.dd: superdesc.asm + $(AS) $(ASOUT)$@ $< $(SDFLAGS) -DITDRV=1 + # VDGInt Modules covdg.io: covdg.asm - $(AS) $(AFLAGS) $(ASOUT)$@ $< -DCOCO2=1 + $(AS) $(AFLAGS) $(ASOUT)$@ $< -DCOCO3=1 covdg_small.io: covdg.asm $(AS) $(AFLAGS) $(ASOUT)$@ $< +# RFM descriptors +ddy0.dd: rfmdesc.asm + $(AS) $< $(ASOUT)$@ $(AFLAGS) -DDD=1 -DDNum=0 + +y0.dd: rfmdesc.asm +$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=0 + +y1.dd: rfmdesc.asm + $(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=1 + +y2.dd: rfmdesc.asm + $(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=2 + +y3.dd: rfmdesc.asm + $(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=3 + # Clocks clock_60hz: clock.asm $(AS) $(AFLAGS) $(ASOUT)$@ $< -DPwrLnFrq=60