Mercurial > hg > Members > kono > nitros9-code

changeset 2280:7706697da5c7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Made creation of modules a tad nicer
author boisy
date Tue, 29 Dec 2009 01:15:05 +0000
parents bbe2aa624b7e
children 5cb8ceef30b6
files level1/modules/dwtdesc.asm level1/modules/scdwt.asm level2/coco3_6309/bootfiles/makefile level2/coco3_6309/modules/makefile
diffstat 4 files changed, 38 insertions(+), 31 deletions(-) [+]
line wrap: on
line diff
--- a/level1/modules/dwtdesc.asm	Tue Dec 29 00:52:58 2009 +0000
+++ b/level1/modules/dwtdesc.asm	Tue Dec 29 01:15:05 2009 +0000
@@ -35,7 +35,7 @@
          fcb   UPDAT.    	mode byte
          ENDC
          fcb   HW.Page    extended controller address
-         fdb   $FF00+TNum      physical controller address
+         fdb   $FF00+Addr      physical controller address
          fcb   initsize-*-1 initilization table size
          fcb   DT.SCF     device type:0=scf,1=rbf,2=pipe,3=scf
          IFNE  UTIL
@@ -81,12 +81,11 @@
          ELSE
 		 IFNE  UTIL
 name     fcc   /U/
-         fcb   176+TNum-8
 		 ELSE
 name     fcc   /T/
+         ENDC
          fcb   176+TNum
          ENDC
-         ENDC
 mgrnam   fcs   /SCF/
 drvnam   fcs   /scdwt/
 
--- a/level1/modules/scdwt.asm	Tue Dec 29 00:52:58 2009 +0000
+++ b/level1/modules/scdwt.asm	Tue Dec 29 01:15:05 2009 +0000
@@ -204,8 +204,8 @@
 
 Init		equ		*
 
-			pshs  cc        save IRQ/Carry status
-
+ lda IT.PAR,y
+			pshs  cc,a        save IRQ/Carry status
 * link to subroutine module
          	pshs	u				;preserve u since os9 link is coming up
 
@@ -322,7 +322,7 @@
 			stx   	RxBufEnd,u      	;save Rx buffer end address
 
 			* tell DW we have a new port opening
-			ldb		PD.PAR,u		; get our port mode
+			ldb		1,s		; get our port mode from stack
 			pshs    b
 			ldb		<V.PORT+1,u		; get our port #			
 			lda     #OP_SERINIT 	; command 
@@ -341,9 +341,9 @@
     		leas	3,s				;clean dw args off stack
     		
 InitEx		equ		*
-			puls	cc,pc
+			puls	cc,a,pc
 InitExBad
-			puls cc
+			puls cc,a
 			orcc  #Carry
 			rts
 
--- a/level2/coco3_6309/bootfiles/makefile	Tue Dec 29 00:52:58 2009 +0000
+++ b/level2/coco3_6309/bootfiles/makefile	Tue Dec 29 01:15:05 2009 +0000
@@ -34,17 +34,25 @@
 # NitrOS-9 disk bootfile to allow booting from DriveWire 3 server
 # minimum bootfile without graphics console support
 BOOTFILE_DW3_SERVER	= $(MD)/krnp2 $(MD)/ioman $(MD)/init \
+		$(MD)/dw3.sb \
+		$(MD)/dw3.sb \
+		$(MD)/dw3.sb \
+		$(MD)/dw3.sb \
+		$(MD)/dw3.sb \
+		$(MD)/dw3.sb \
+		$(MD)/dw3.sb \
+		$(MD)/dw3.sb \
 		$(MD)/rbf.mn \
-		$(MD)/rbdw3.dr $(MD)/dw3.sb \
+		$(MD)/rbdw3.dr \
 		$(MD)/ddx0.dd $(MD)/x1.dd $(MD)/x2.dd $(MD)/x3.dd \
 		$(MD)/scf.mn \
-		$(MD)/vtio.dr \
-		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
-		$(MD)/cowin.io $(MD)/covdg.io \
-		$(MD)/term_win80.dt \
+		$(MD)/sc6551.dr $(MD)/term_sc6551.dt \
 		$(MD)/scdwt.dr $(MD)/t0_scdwt.dd \
-                $(MD)/t1_scdwt.dd $(MD)/t2_scdwt.dd $(MD)/t3_scdwt.dd \
-                $(MD)/t4_scdwt.dd $(MD)/t5_scdwt.dd $(MD)/t6_scdwt.dd \
+		$(MD)/t1_scdwt.dd $(MD)/t2_scdwt.dd $(MD)/t3_scdwt.dd \
+		$(MD)/t4_scdwt.dd $(MD)/t5_scdwt.dd $(MD)/t6_scdwt.dd \
+		$(MD)/u0_scdwt.dd $(MD)/u1_scdwt.dd $(MD)/u2_scdwt.dd \
+		$(MD)/u3_scdwt.dd $(MD)/u4_scdwt.dd $(MD)/u5_scdwt.dd \
+		$(MD)/u6_scdwt.dd \
 		$(MD)/scdwp.dr $(MD)/p_scdwp.dd \
 		$(MD)/pipeman.mn $(MD)/piper.dr $(MD)/pipe.dd \
 		$(MD)/clock_60hz $(MD)/clock2_dw3
--- a/level2/coco3_6309/modules/makefile	Tue Dec 29 00:52:58 2009 +0000
+++ b/level2/coco3_6309/modules/makefile	Tue Dec 29 01:15:05 2009 +0000
@@ -196,52 +196,52 @@
 
 # DriveWire 3 SCF descriptors
 term_scdwt.dt: dwtdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aTERM=1 -aTNum=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aTERM=1 -aAddr=1 -aTNum=1
 
 t0_scdwt.dd: dwtdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aTNum=0
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=0 -aTNum=0
 
 t1_scdwt.dd: dwtdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aTNum=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=1 -aTNum=1
 
 t2_scdwt.dd: dwtdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aTNum=2
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=2 -aTNum=2
 
 t3_scdwt.dd: dwtdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aTNum=3
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=3 -aTNum=3
 
 t4_scdwt.dd: dwtdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aTNum=4
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=4 -aTNum=4
 
 t5_scdwt.dd: dwtdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aTNum=5
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=5 -aTNum=5
 
 t6_scdwt.dd: dwtdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aTNum=6
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=6 -aTNum=6
 
 t7_scdwt.dd: dwtdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aTNum=7
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=7 -aTNum=7
 
 u0_scdwt.dd: dwtdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aUTIL=1 -aTNum=8
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=8 -aUTIL=1 -aTNum=0
 
 u1_scdwt.dd: dwtdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aUTIL=1 -aTNum=9
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=9 -aUTIL=1 -aTNum=1
 
 u2_scdwt.dd: dwtdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aUTIL=1 -aTNum=10
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=10 -aUTIL=1 -aTNum=2
 
 u3_scdwt.dd: dwtdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aUTIL=1 -aTNum=11
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=11 -aUTIL=1 -aTNum=3
 
 u4_scdwt.dd: dwtdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aUTIL=1 -aTNum=12
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=12 -aUTIL=1 -aTNum=4
 
 u5_scdwt.dd: dwtdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aUTIL=1 -aTNum=13
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=13 -aUTIL=1 -aTNum=5
 
 u6_scdwt.dd: dwtdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aUTIL=1 -aTNum=14
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=14 -aUTIL=1 -aTNum=6
 
 # DriveWire 3 RBF descriptors
 ddx0.dd: dwdesc.asm