Mercurial > hg > Members > kono > nitros9-code

changeset 2710:ab3a2531c000 lwtools-port

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed makefiles and assembly for ATARI port
author Boisy Pitre <boisy.pitre@nuance.com>
date Tue, 24 Jul 2012 10:00:38 -0500
parents f0312e88ccf2
children a1e65a5ef4cf
files level1/atari/bootfiles/makefile level1/atari/defs/makefile level1/atari/modules/kernel/makefile level1/atari/modules/makefile level1/atari/sys/makefile level1/modules/kernel/krn.asm
diffstat 6 files changed, 45 insertions(+), 31 deletions(-) [+]
line wrap: on
line diff
--- a/level1/atari/bootfiles/makefile	Sun Jul 22 19:41:24 2012 -0500
+++ b/level1/atari/bootfiles/makefile	Tue Jul 24 10:00:38 2012 -0500
@@ -8,16 +8,30 @@
 
 DEPENDS		= ./makefile
 
+RBDW3      = $(MD)/rbdw3.dr \
+		$(MD)/ddx0.dd $(MD)/x1.dd $(MD)/x2.dd $(MD)/x3.dd
+SCDWV_NET  = $(MD)/n_scdwv.dd $(MD)/n1_scdwv.dd $(MD)/n2_scdwv.dd \
+		$(MD)/n3_scdwv.dd $(MD)/n4_scdwv.dd $(MD)/n5_scdwv.dd \
+		$(MD)/n6_scdwv.dd $(MD)/n7_scdwv.dd $(MD)/n8_scdwv.dd \
+		$(MD)/n9_scdwv.dd $(MD)/n10_scdwv.dd $(MD)/n11_scdwv.dd \
+		$(MD)/n12_scdwv.dd $(MD)/n13_scdwv.dd $(MD)/midi_scdwv.dd
+SCDWV_WIN  = $(MD)/z1_scdwv.dd $(MD)/z2_scdwv.dd $(MD)/z3_scdwv.dd \
+		$(MD)/z4_scdwv.dd $(MD)/z5_scdwv.dd $(MD)/z6_scdwv.dd \
+		$(MD)/z7_scdwv.dd 
+SCDWP     = $(MD)/scdwp.dr $(MD)/p_scdwp.dd
+
 # IMPORTANT! KRN MUST BE THE LAST MODULE IN BOOTFILE_P1!!
 BOOTFILE_P1 = $(MD)/krnp2 $(MD)/init $(MD)/ioman $(MD)/sysgo \
 		$(MD)/dw3.sb \
 		$(MD)/clock_60hz $(MD)/clock2_dw3 \
           $(MD)/krn
 
-BOOTFILE_P2 = $(MD)/scf.mn $(MD)/vtio.dr $(MD)/term.dt \
-		$(MD)/rbf.mn $(MD)/rbdw3.dr \
-		$(MD)/ddx0.dd $(MD)/x1.dd \
-		$(MD)/scdwp.dr $(MD)/p_scdwp.dd \
+BOOTFILE_P2 = $(MD)/scf.mn \
+		$(MD)/vtio.dr $(MD)/term.dt \
+		$(MD)/rbf.mn \
+		$(RBDW3) \
+		$(MD)/scdwv.dr \
+		$(SCDWV_NET) \
 		$(CD)/shell_21
 
 BOOTFILES	= bootfile
--- a/level1/atari/defs/makefile	Sun Jul 22 19:41:24 2012 -0500
+++ b/level1/atari/defs/makefile	Tue Jul 24 10:00:38 2012 -0500
@@ -1,4 +1,4 @@
-PORT = coco
+PORT = atari
 include $(NITROS9DIR)/rules.mak
 
 DEPENDS		= ./makefile
--- a/level1/atari/modules/kernel/makefile	Sun Jul 22 19:41:24 2012 -0500
+++ b/level1/atari/modules/kernel/makefile	Tue Jul 24 10:00:38 2012 -0500
@@ -1,4 +1,4 @@
-PORT = coco
+PORT = atari
 include $(NITROS9DIR)/rules.mak
 
 vpath %.asm $(LEVEL1)/modules/kernel
@@ -9,7 +9,7 @@
 KERNELP2	= krnp2
 SYSCALLS	= fcmpnam.asm fprsnam.asm
 
-AFLAGS		+= -DATARI=1 -I$(LEVEL1)/modules/kernel
+AFLAGS		+= -I$(LEVEL1)/modules/kernel
 
 ALLOBJS		= $(KERNEL) $(KERNELP2)
 
--- a/level1/atari/modules/makefile	Sun Jul 22 19:41:24 2012 -0500
+++ b/level1/atari/modules/makefile	Tue Jul 24 10:00:38 2012 -0500
@@ -3,7 +3,7 @@
 
 vpath %.asm $(LEVEL1)/modules
 
-AFLAGS		+= -I$(LEVEL1)/modules
+AFLAGS		+= --includedir=$(LEVEL1)/modules
 
 CLOCKSOFT       = -DRTCSoft=1
 
@@ -22,10 +22,10 @@
 		nil.dd \
 		term.dt \
 		scdwp.dr p_scdwp.dd \
-		scdwn.dr term_scdwn.dt n_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 midi_scdwn.dd
+		scdwv.dr term_scdwv.dt n_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 midi_scdwv.dd
 
 PIPE		= pipeman.mn \
 		piper.dr \
@@ -62,52 +62,52 @@
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=3
 
 # DriveWire 3 SCF descriptors
-term_scdwn.dt: scdwndesc.asm
+term_scdwv.dt: scdwvdesc.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=0
 
-n_scdwn.dd: scdwndesc.asm
+n_scdwv.dd: scdwvdesc.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=255
 
-n1_scdwn.dd: scdwndesc.asm
+n1_scdwv.dd: scdwvdesc.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=1
 
-n2_scdwn.dd: scdwndesc.asm
+n2_scdwv.dd: scdwvdesc.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=2
 
-n3_scdwn.dd: scdwndesc.asm
+n3_scdwv.dd: scdwvdesc.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=3
 
-n4_scdwn.dd: scdwndesc.asm
+n4_scdwv.dd: scdwvdesc.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=4
 
-n5_scdwn.dd: scdwndesc.asm
+n5_scdwv.dd: scdwvdesc.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=5
 
-n6_scdwn.dd: scdwndesc.asm
+n6_scdwv.dd: scdwvdesc.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=6
 
-n7_scdwn.dd: scdwndesc.asm
+n7_scdwv.dd: scdwvdesc.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=7
 
-n8_scdwn.dd: scdwndesc.asm
+n8_scdwv.dd: scdwvdesc.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=8
 
-n9_scdwn.dd: scdwndesc.asm
+n9_scdwv.dd: scdwvdesc.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=9
 
-n10_scdwn.dd: scdwndesc.asm
+n10_scdwv.dd: scdwvdesc.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=10
 
-n11_scdwn.dd: scdwndesc.asm
+n11_scdwv.dd: scdwvdesc.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=11
 
-n12_scdwn.dd: scdwndesc.asm
+n12_scdwv.dd: scdwvdesc.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=12
 
-n13_scdwn.dd: scdwndesc.asm
+n13_scdwv.dd: scdwvdesc.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=13
 
-midi_scdwn.dd: scdwndesc.asm
+midi_scdwv.dd: scdwvdesc.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=14
 
 # Clocks
--- a/level1/atari/sys/makefile	Sun Jul 22 19:41:24 2012 -0500
+++ b/level1/atari/sys/makefile	Tue Jul 24 10:00:38 2012 -0500
@@ -1,4 +1,4 @@
-PORT = coco
+PORT = atari
 include $(NITROS9DIR)/rules.mak
 
 vpath %.hp	$(LEVEL1)/sys
--- a/level1/modules/kernel/krn.asm	Sun Jul 22 19:41:24 2012 -0500
+++ b/level1/modules/kernel/krn.asm	Tue Jul 24 10:00:38 2012 -0500
@@ -562,7 +562,7 @@
          pshs  x,a
          ldd   M$Name,x
          leax  d,x                     X = addr of name in mod
-         IFNE  ATARI
+         IFNE  atari
 * jsr [>$FFE8]
 * lda	#$20
 * jsr [>$FFE4]
@@ -976,7 +976,7 @@
          fdb   SVCNMI                  NMI
          
          
-         IFNE  ATARI
+         IFNE  atari
          fdb	$F3FE-(*-OS9Cold)
          ENDC