Mercurial > hg > Members > kono > nitros9-code

changeset 1564:b9a87d97494d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Multiple changes for next release
author boisy
date Mon, 17 May 2004 14:11:30 +0000
parents cc4a58b55d79
children 2fd77e029314
files 3rdparty/drivers/disto/defsfile 3rdparty/drivers/disto/makefile 3rdparty/utils/boisy/bawk.asm level2/coco3/bootfiles/makefile level2/coco3/bootfiles/makefile.cust level2/coco3/bootlists/standard.bl level2/coco3_6309/bootfiles/makefile level2/coco3_6309/bootfiles/makefile.cust level2/coco3_6309/bootlists/standard.bl level2/modules/cc3io.asm level2/modules/makefile level2/modules/windint.asm rules.mak
diffstat 13 files changed, 127 insertions(+), 75 deletions(-) [+]
line wrap: on
line diff
--- a/3rdparty/drivers/disto/defsfile	Fri May 14 03:20:44 2004 +0000
+++ b/3rdparty/drivers/disto/defsfile	Mon May 17 14:11:30 2004 +0000
@@ -1,3 +1,4 @@
 	use	os9defs
 	use	scfdefs
+        use     rbfdefs
         use     systype
--- a/3rdparty/drivers/disto/makefile	Fri May 14 03:20:44 2004 +0000
+++ b/3rdparty/drivers/disto/makefile	Mon May 17 14:11:30 2004 +0000
@@ -1,6 +1,6 @@
 include ../../../rules.mak
 
-vpath %.asm $(LEVEL2)/MODULES
+vpath %.asm $(6809L2)/modules:$(6809L1)/modules
 
 L1_256 = $(AFLAGS) -aLevel=1 -aRAMSize=1
 L2_256 = $(AFLAGS) -aLevel=2 -aRAMSize=1
@@ -39,33 +39,33 @@
    
 # Disto Super Controller II Device Descriptors
 # 35 Track Single-Sided
-ddd0_35s.dd: cc3diskdesc.asm
+ddd0_35s.dd: rb1773desc.asm
 	$(AS) $(ASOUT)$@ $< $(AFLAGS) $(SSDD35) -aDD=1
 
-d0_35s.dd: cc3diskdesc.asm
+d0_35s.dd: rb1773desc.asm
 	$(AS) $(ASOUT)$@ $< $(AFLAGS) $(SSDD35)
 
-d1_35s.dd: cc3diskdesc.asm
+d1_35s.dd: rb1773desc.asm
 	$(AS) $(ASOUT)$@ $< $(AFLAGS) $(SSDD35) -aDNum=1
 
 # 40 Track Double-Sided
-ddd0_40d.dd: cc3diskdesc.asm  
+ddd0_40d.dd: rb1773desc.asm  
 	$(AS) $(ASOUT)$@ $< $(AFLAGS) $(DSDD40) -aDD=1
 
-d0_40d.dd: cc3diskdesc.asm       
+d0_40d.dd: rb1773desc.asm       
 	$(AS) $(ASOUT)$@ $< $(AFLAGS) $(DSDD40)
 
-d1_40d.dd: cc3diskdesc.asm
+d1_40d.dd: rb1773desc.asm
 	$(AS) $(ASOUT)$@ $< $(AFLAGS) $(DSDD40) -aDNum=1
 
 # 80 Track Double-Sided
-ddd0_80d.dd: cc3diskdesc.asm
+ddd0_80d.dd: rb1773desc.asm
 	$(AS) $(ASOUT)$@ $< $(AFLAGS) $(DSDD80) -aDD=1
 
-d0_80d.dd: cc3diskdesc.asm
+d0_80d.dd: rb1773desc.asm
 	$(AS) $(ASOUT)$@ $< $(AFLAGS) $(DSDD80)
 
-d1_80d.dd: cc3diskdesc.asm
+d1_80d.dd: rb1773desc.asm
 	$(AS) $(ASOUT)$@ $< $(AFLAGS) $(DSDD80) -aDNum=1
 
 # RAM Disk Descriptors
--- a/3rdparty/utils/boisy/bawk.asm	Fri May 14 03:20:44 2004 +0000
+++ b/3rdparty/utils/boisy/bawk.asm	Mon May 17 14:11:30 2004 +0000
@@ -166,12 +166,12 @@
 
 
 HelpMess fcc     /Usage:  BAWK [-d? -i -l -a# -f -F] "format_string" [file] [...]/
-         fcb     $0d
+         fcb     C$CR
 
 Shell    fcc     "Shell"
-         fcb     $0d
+         fcb     C$CR
 
-FileHead fdb     $0a0d
+FileHead fdb     C$LF,C$CR
          fcc     "*** File: "
 FileHLen equ     *-FileHead
 
@@ -212,11 +212,11 @@
 SaveFile pshs    x
          leay    FileBuff,u
 SaveF2   lda     ,x+
-         cmpa    #$20
+         cmpa    #C$SPAC
          bne     SaveF3
-         lda     #$0d
+         lda     #C$CR
 SaveF3   sta     ,y+
-         cmpa    #$0d
+         cmpa    #C$CR
          bne     SaveF2
          puls    x
          rts
@@ -235,7 +235,7 @@
          beq     Return                Nope, process at first column
 AncLoop  ldb     Anchor                else move X to anchor point
 Anc2     lda     ,x+
-         cmpa    #$0d
+         cmpa    #C$CR
          beq     BackUp
          decb
          bne     Anc2
@@ -277,7 +277,7 @@
 
 EatSpace pshs    a
 Eat2     lda     ,x+
-         cmpa    #$20
+         cmpa    #C$SPAC
          beq     Eat2
          leax    -1,x
          puls    a
@@ -295,7 +295,7 @@
          clr     Anchor                Anchor to first column
          clr     FEFlag                Clear Fork/Echo flag
          clr     ForkFlag              Clear Fork flag
-         lda     #$20                  put space as extra delimiter
+         lda     #C$SPAC               put space as extra delimiter
          sta     Delim
 
 ****************************************
@@ -303,7 +303,7 @@
 
 Parse    bsr     EatSpace
          lda     ,x+
-         cmpa    #$0d
+         cmpa    #C$CR
          beq     Help
          cmpa    #'-
          bne     IsItQ
@@ -346,18 +346,18 @@
 * Save the format string
 SaveFmat leay    Format,u
 SaveFmt2 lda     ,x+                   Point to char after first '"'
-         cmpa    #$0d
+         cmpa    #C$CR
          beq     Help
          cmpa    #'"                   is it the second '"'?
          bne     SaveFmt3              no, save char
-         lda     #$0d
+         lda     #C$CR
          sta     ,y
          bra     ChkFile
 SaveFmt3 sta     ,y+                   else save char
          bra     SaveFmt2
 ChkFile  lbsr    EatSpace              Check after last '"' for a filename
          lda     ,x
-         cmpa    #$0d                  if no filename, execute from StdIn
+         cmpa    #C$CR                 if no filename, execute from StdIn
          beq     MainLine
          bra     OpenFile
 
@@ -397,7 +397,7 @@
 
 FilePrs  lbsr    EatSpace              eat spaces
          lda     ,x                    check char
-         cmpa    #$0d                  if CR,
+         cmpa    #C$CR                 if CR,
          beq     Done
 
 OpenFile lbsr    SaveFile
@@ -436,7 +436,7 @@
          cmpa    #'$                   Is it the '$' field character?
          beq     FieldPar              Check Field Parameter
 PFmt2    sta     ,y+
-         cmpa    #$0d
+         cmpa    #C$CR
          bne     ParseFmt
          tst     ForkFlag
          bne     PFmt3
@@ -461,7 +461,7 @@
          leax    Line,u                at this point we copy the entire...
          lbsr    AncLine               Anchor the line
 CopyAll  lda     ,x+                   and transfer the rest of the line
-         cmpa    #$0d                  line since we've encountered a $0
+         cmpa    #C$CR                 line since we've encountered a $0
          beq     Field3                and continue parsing
          sta     ,y+
          bra     CopyAll
@@ -491,25 +491,25 @@
 SetField leax    Line,u
          lbsr    AncLine               Anchor the line
 Skip     lda     ,x+
-         cmpa    #$20
+         cmpa    #C$SPAC
          beq     Skip
          cmpa    Delim
          beq     Skip
-         cmpa    #$0d
+         cmpa    #C$CR
          beq     Leave2
          decb
          beq     Leave
 EatField lda     ,x+
-         cmpa    #$20
+         cmpa    #C$SPAC
          beq     Skip
          cmpa    Delim
          beq     Skip
-         cmpa    #$0d
+         cmpa    #C$CR
          beq     Leave2
          bra     EatField
 Leave    clrb
 Leave2   leax    -1,x
-         rts
+ExExit   rts
          
 
 ****************************************
@@ -517,15 +517,14 @@
 *
 
 Expand   lda     ,x+
-         cmpa    #$20
+         cmpa    #C$SPAC
          beq     ExExit
          cmpa    Delim
          beq     ExExit
-         cmpa    #$0d
+         cmpa    #C$CR
          beq     ExExit
          sta     ,y+
          bra     Expand
-ExExit   rts
 
 
 ****************************************
--- a/level2/coco3/bootfiles/makefile	Fri May 14 03:20:44 2004 +0000
+++ b/level2/coco3/bootfiles/makefile	Mon May 17 14:11:30 2004 +0000
@@ -12,7 +12,7 @@
 # OS-9 disk bootfile to allow booting from WD1773 disk controller
 BOOTFILE_VDG	= $(MD)/kernelp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/cc3disk.dr $(MD)/d0_40d.dd $(MD)/d1_40d.dd \
+		$(MD)/rb1773.dr $(MD)/d0_40d.dd $(MD)/d1_40d.dd \
 		$(MD)/ddd0_40d.dd \
 		$(MD)/scf.mn $(MD)/cc3io.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
@@ -25,7 +25,7 @@
 
 BOOTFILE_WIN40	= $(MD)/kernelp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/cc3disk.dr $(MD)/d0_40d.dd $(MD)/d1_40d.dd \
+		$(MD)/rb1773.dr $(MD)/d0_40d.dd $(MD)/d1_40d.dd \
 		$(MD)/ddd0_40d.dd \
 		$(MD)/scf.mn $(MD)/cc3io.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
@@ -38,7 +38,7 @@
 
 BOOTFILE_WIN80	= $(MD)/kernelp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/cc3disk.dr $(MD)/d0_40d.dd $(MD)/d1_40d.dd \
+		$(MD)/rb1773.dr $(MD)/d0_40d.dd $(MD)/d1_40d.dd \
 		$(MD)/ddd0_40d.dd \
 		$(MD)/scf.mn $(MD)/cc3io.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
@@ -86,7 +86,7 @@
 # OS-9 disk bootfile to allow booting from WD1773 disk controller
 BOOTFILE_VDG_DS80	= $(MD)/kernelp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/cc3disk.dr $(MD)/d0_80d.dd $(MD)/d1_40d.dd \
+		$(MD)/rb1773.dr $(MD)/d0_80d.dd $(MD)/d1_40d.dd \
 		$(MD)/ddd0_80d.dd \
 		$(MD)/scf.mn $(MD)/cc3io.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
@@ -99,7 +99,7 @@
 
 BOOTFILE_WIN40_DS80	= $(MD)/kernelp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/cc3disk.dr $(MD)/d0_80d.dd $(MD)/d1_40d.dd \
+		$(MD)/rb1773.dr $(MD)/d0_80d.dd $(MD)/d1_40d.dd \
 		$(MD)/ddd0_80d.dd \
 		$(MD)/scf.mn $(MD)/cc3io.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
@@ -112,7 +112,7 @@
 
 BOOTFILE_WIN80_DS80	= $(MD)/kernelp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/cc3disk.dr $(MD)/d0_80d.dd $(MD)/d1_40d.dd \
+		$(MD)/rb1773.dr $(MD)/d0_80d.dd $(MD)/d1_40d.dd \
 		$(MD)/ddd0_80d.dd \
 		$(MD)/scf.mn $(MD)/cc3io.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
--- a/level2/coco3/bootfiles/makefile.cust	Fri May 14 03:20:44 2004 +0000
+++ b/level2/coco3/bootfiles/makefile.cust	Mon May 17 14:11:30 2004 +0000
@@ -19,7 +19,7 @@
 # OS-9 disk bootfile to allow booting from WD1773 disk controller
 BOOTFILE_1773	= $(MD)/kernelp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/cc3disk.dr $(MD)/d0_40d.dd $(MD)/d1_80d.dd \
+		$(MD)/rb1773.dr $(MD)/d0_40d.dd $(MD)/d1_80d.dd \
 		$(MD)/ddd0_40d.dd \
 		$(MD)/scf.mn $(MD)/cc3io.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
@@ -60,7 +60,7 @@
 # This is a custom bootfile made by Boisy for his system
 BOOTFILE_CUST	= $(MD)/kernelp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/cc3disk.dr \
+		$(MD)/rb1773.dr \
 		$(MD)/d0_80d.dd $(MD)/d1_40d.dd \
 		$(MD)/scf.mn $(MD)/cc3io.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
@@ -81,7 +81,7 @@
                 $(C9)/Products/DriveWire/software/6809l2/x1.dd \
                 $(C9)/Products/DriveWire/software/6809l2/x2.dd \
                 $(C9)/Products/DriveWire/software/6809l2/x3.dd \
-                $(MD)/cc3disk.dr $(MD)/d0_80d.dd $(MD)/d1_40d.dd \
+                $(MD)/rb1773.dr $(MD)/d0_80d.dd $(MD)/d1_40d.dd \
                 $(MD)/scf.mn $(MD)/cc3io.dr \
                 $(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
                 $(MD)/windint.io $(MD)/vdgint.io \
--- a/level2/coco3/bootlists/standard.bl	Fri May 14 03:20:44 2004 +0000
+++ b/level2/coco3/bootlists/standard.bl	Mon May 17 14:11:30 2004 +0000
@@ -56,8 +56,8 @@
 *../MODULES/RBF/hb_255_d4n1.dd
 *../MODULES/RBF/hb_255_hdii.dd
 *
-* CC3Disk - WD1773 floppy support
-../MODULES/RBF/cc3disk.dr
+* WD1773 floppy support
+../MODULES/RBF/rb1773.dr
 * Floppy device descriptors
 * DD - default device - choose one if needed
 *../MODULES/RBF/ddd0_35s.dd
--- a/level2/coco3_6309/bootfiles/makefile	Fri May 14 03:20:44 2004 +0000
+++ b/level2/coco3_6309/bootfiles/makefile	Mon May 17 14:11:30 2004 +0000
@@ -12,7 +12,7 @@
 # OS-9 disk bootfile to allow booting from WD1773 disk controller
 BOOTFILE_VDG	= $(MD)/kernelp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/cc3disk.dr $(MD)/d0_40d.dd $(MD)/d1_40d.dd \
+		$(MD)/rb1773.dr $(MD)/d0_40d.dd $(MD)/d1_40d.dd \
 		$(MD)/ddd0_40d.dd \
 		$(MD)/scf.mn $(MD)/cc3io.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
@@ -25,7 +25,7 @@
 
 BOOTFILE_WIN40	= $(MD)/kernelp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/cc3disk.dr $(MD)/d0_40d.dd $(MD)/d1_40d.dd \
+		$(MD)/rb1773.dr $(MD)/d0_40d.dd $(MD)/d1_40d.dd \
 		$(MD)/ddd0_40d.dd \
 		$(MD)/scf.mn $(MD)/cc3io.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
@@ -38,7 +38,7 @@
 
 BOOTFILE_WIN80	= $(MD)/kernelp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/cc3disk.dr $(MD)/d0_40d.dd $(MD)/d1_40d.dd \
+		$(MD)/rb1773.dr $(MD)/d0_40d.dd $(MD)/d1_40d.dd \
 		$(MD)/ddd0_40d.dd \
 		$(MD)/scf.mn $(MD)/cc3io.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
@@ -86,7 +86,7 @@
 # OS-9 disk bootfile to allow booting from WD1773 disk controller
 BOOTFILE_VDG_DS80	= $(MD)/kernelp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/cc3disk.dr $(MD)/d0_80d.dd $(MD)/d1_40d.dd \
+		$(MD)/rb1773.dr $(MD)/d0_80d.dd $(MD)/d1_40d.dd \
 		$(MD)/ddd0_80d.dd \
 		$(MD)/scf.mn $(MD)/cc3io.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
@@ -99,7 +99,7 @@
 
 BOOTFILE_WIN40_DS80	= $(MD)/kernelp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/cc3disk.dr $(MD)/d0_80d.dd $(MD)/d1_40d.dd \
+		$(MD)/rb1773.dr $(MD)/d0_80d.dd $(MD)/d1_40d.dd \
 		$(MD)/ddd0_80d.dd \
 		$(MD)/scf.mn $(MD)/cc3io.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
@@ -112,7 +112,7 @@
 
 BOOTFILE_WIN80_DS80	= $(MD)/kernelp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/cc3disk.dr $(MD)/d0_80d.dd $(MD)/d1_40d.dd \
+		$(MD)/rb1773.dr $(MD)/d0_80d.dd $(MD)/d1_40d.dd \
 		$(MD)/ddd0_80d.dd \
 		$(MD)/scf.mn $(MD)/cc3io.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
--- a/level2/coco3_6309/bootfiles/makefile.cust	Fri May 14 03:20:44 2004 +0000
+++ b/level2/coco3_6309/bootfiles/makefile.cust	Mon May 17 14:11:30 2004 +0000
@@ -19,7 +19,7 @@
 # OS-9 disk bootfile to allow booting from WD1773 disk controller
 BOOTFILE_1773	= $(MD)/kernelp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/cc3disk.dr $(MD)/d0_40d.dd $(MD)/d1_80d.dd \
+		$(MD)/rb1773.dr $(MD)/d0_40d.dd $(MD)/d1_80d.dd \
 		$(MD)/ddd0_40d.dd \
 		$(MD)/scf.mn $(MD)/cc3io.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
@@ -60,7 +60,7 @@
 # This is a custom bootfile made by Boisy for his system
 BOOTFILE_CUST	= $(MD)/kernelp2 $(MD)/ioman $(MD)/init \
 		$(MD)/rbf.mn \
-		$(MD)/cc3disk.dr \
+		$(MD)/rb1773.dr \
 		$(MD)/d0_80d.dd $(MD)/d1_40d.dd \
 		$(MD)/scf.mn $(MD)/cc3io.dr \
 		$(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
@@ -81,7 +81,7 @@
                 $(C9)/Products/DriveWire/software/6809l2/x1.dd \
                 $(C9)/Products/DriveWire/software/6809l2/x2.dd \
                 $(C9)/Products/DriveWire/software/6809l2/x3.dd \
-                $(MD)/cc3disk.dr $(MD)/d0_80d.dd $(MD)/d1_40d.dd \
+                $(MD)/rb1773.dr $(MD)/d0_80d.dd $(MD)/d1_40d.dd \
                 $(MD)/scf.mn $(MD)/cc3io.dr \
                 $(MD)/keydrv_cc3.sb $(MD)/joydrv_joy.sb $(MD)/snddrv_cc3.sb \
                 $(MD)/windint.io $(MD)/vdgint.io \
--- a/level2/coco3_6309/bootlists/standard.bl	Fri May 14 03:20:44 2004 +0000
+++ b/level2/coco3_6309/bootlists/standard.bl	Mon May 17 14:11:30 2004 +0000
@@ -56,8 +56,8 @@
 *../MODULES/RBF/hb_255_d4n1.dd
 *../MODULES/RBF/hb_255_hdii.dd
 *
-* CC3Disk - WD1773 floppy support
-../MODULES/RBF/cc3disk.dr
+* WD1773 floppy support
+../MODULES/RBF/rb1773.dr
 * Floppy device descriptors
 * DD - default device - choose one if needed
 *../MODULES/RBF/ddd0_35s.dd
--- a/level2/modules/cc3io.asm	Fri May 14 03:20:44 2004 +0000
+++ b/level2/modules/cc3io.asm	Mon May 17 14:11:30 2004 +0000
@@ -1438,6 +1438,7 @@
          puls  pc,u,y,a		restore regs & return
 
 WindInt  fcs   /WindInt/
+GrfInt   fcs   /GrfInt/ ++
 
 *
 * Try WindInt
@@ -1448,7 +1449,15 @@
          leax  <WindInt,pcr	point to WindInt name
          lda   #$80		get driver type code
          bsr   L08D4		try and link it
-         puls  pc,u,y		restore regs and return
+
+*++
+         bcc   ok
+         leax  <GrfInt,pcr	point to GrfInt name
+         lda   #$80
+         bsr   L08D4
+*++
+
+ok       puls  pc,u,y		restore regs and return
 L08D2    clrb  
          rts   
 
--- a/level2/modules/makefile	Fri May 14 03:20:44 2004 +0000
+++ b/level2/modules/makefile	Mon May 17 14:11:30 2004 +0000
@@ -24,7 +24,7 @@
 		clock2_smart clock2_harris clock2_tc3 clock2_soft
 
 RBF		= rbf.mn \
-		cc3disk.dr rammer.dr \
+		rb1773.dr rammer.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 \
 		d1_80d.dd d2_80d.dd ddd0_35s.dd ddd0_40d.dd \
@@ -71,6 +71,9 @@
 rel_32: rel.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aWidth=32
 
+grfint.io: windint.asm
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aGrfInt=1
+
 rel_40: rel.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aWidth=40
 
@@ -97,43 +100,43 @@
 DSDD80		= -aCyls=80 -aSides=2 -aSectTrk=18 -aSectTrk0=18 \
 		-aInterlv=3 -aSAS=8 -aDensity=3
 
-ddd0_35s.dd: cc3diskdesc.asm
+ddd0_35s.dd: rb1773desc.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -aDNum=0 -aDD=1
 
-d0_35s.dd: cc3diskdesc.asm
+d0_35s.dd: rb1773desc.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -aDNum=0
 
-d1_35s.dd: cc3diskdesc.asm
+d1_35s.dd: rb1773desc.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -aDNum=1
 
-d2_35s.dd: cc3diskdesc.asm
+d2_35s.dd: rb1773desc.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -aDNum=2
 
-d3_35s.dd: cc3diskdesc.asm
+d3_35s.dd: rb1773desc.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -aDNum=3
 
-ddd0_40d.dd: cc3diskdesc.asm
+ddd0_40d.dd: rb1773desc.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=0 -aDD=1
 
-d0_40d.dd: cc3diskdesc.asm
+d0_40d.dd: rb1773desc.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=0
 
-d1_40d.dd: cc3diskdesc.asm
+d1_40d.dd: rb1773desc.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=1
 
-d2_40d.dd: cc3diskdesc.asm
+d2_40d.dd: rb1773desc.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=2
 
-ddd0_80d.dd: cc3diskdesc.asm
+ddd0_80d.dd: rb1773desc.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=0 -aDD=1
 
-d0_80d.dd: cc3diskdesc.asm
+d0_80d.dd: rb1773desc.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=0
 
-d1_80d.dd: cc3diskdesc.asm
+d1_80d.dd: rb1773desc.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=1
 
-d2_80d.dd: cc3diskdesc.asm
+d2_80d.dd: rb1773desc.asm
 	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=2
 
 # RAM Disk descriptors
--- a/level2/modules/windint.asm	Fri May 14 03:20:44 2004 +0000
+++ b/level2/modules/windint.asm	Mon May 17 14:11:30 2004 +0000
@@ -1,5 +1,5 @@
 *******************************************************************
-* WindInt - NitrOS-9 Window Module
+* GrfInt/WindInt - NitrOS-9 Text/Graphics Window Module
 *
 * $Id$
 *
@@ -13,7 +13,7 @@
 * Patches to scrollbar windows to recover arrows and markers.
 * Includes new stdfonts with graphics added to the end.
 
-         nam   WindInt
+         nam   GrfInt/WindInt
          ttl   NitrOS-9 Window Module
 
          ifp1  
@@ -35,7 +35,12 @@
          mod   eom,name,tylg,atrv,entry,size
 size     equ   .
 
-name     fcs   /WindInt/
+name     equ   *
+         IFEQ  GrfInt-1
+         fcs   /GrfInt/
+         ELSE
+         fcs   /WindInt/
+         ENDC
          fcb   edition
 
 ****************************
@@ -924,6 +929,8 @@
 * Overlay removed, check if we activate menu bar on parent window
 L052E    puls  y,u        Restore static mem & path dsc. ptrs
          lbsr  L0436      set lines per page in path descriptor
+        
+         IFNE  GrfInt-1
          IFNE  H6309
          tste		is screen type a regular no box window?
          ELSE
@@ -942,6 +949,9 @@
          lda   >WGlobal+G.CrDvFl     Are we the current active window?
          beq   L0591      no, no need to update menu bar
          lbra  L13F5      set menu bar to active state
+         ELSE
+         rts
+         ENDC
 
 ****************************
 * Select entry point
@@ -1022,6 +1032,8 @@
          pshs  d
          ldd   Wt.DfSZX,y Get default X/Y sizes from window table
          pshs  d          Make them the ending X,Y coords
+
+         IFNE  GrfInt-1
          lda   ,x         get graphics table window type
          beq   L05E3      If normal window, skip all adjustments
          deca             Is it a WT.FWin (framed window=1)?
@@ -1042,6 +1054,8 @@
 L05DD    inc   3,s        add 1 to Y start for menu bar
          dec   1,s        decrement Y size by 2 for menu & bottom borders
          dec   1,s
+         ENDC
+
 L05E3    ldd   Wt.SZX,y   get current X/Y sizes
          cmpa  ,s         will X size fit?
          bhi   L0606      no return error
@@ -2038,8 +2052,10 @@
          lbeq  L0AF4      yes, go process
          cmpa  #SS.DfPal  get default colors?
          beq   L0AC3      yes, go process
+         IFNE  GrfInt-1
          cmpa  #SS.MnSel  menu select?
          lbeq  L1515      yes, go process
+         ENDC
          cmpa  #SS.ScInf  screen info?
          beq   SS.SInf    yes, go process
          lbra  L0A96      All others illegal
@@ -2178,12 +2194,14 @@
          lbeq  L0BD1
          cmpa  #SS.DfPal  Set default palettes
          beq   L0B38
+         IFNE  GrfInt-1
          cmpa  #SS.WnSet
          lbeq  L0D23
          cmpa  #SS.SBar
          lbeq  L1AB9
          cmpa  #SS.UmBar  Update menu bar
          lbeq  L13F5
+         ENDC
          lbra  L0A96
 
 * SS.DfPal entry point
@@ -2408,11 +2426,17 @@
 L0C68    tsta             Screen change?
          beq   L0C7F      Yes, go do
          deca             Update mouse packet?
+* TODO: Does update mouse packet go in GrfInt?
+         IFNE  GrfInt-1
          lbeq  L1CC8      Yes, go do
+         ENDC
          deca             Update cursors?
          beq   L0CE7      Yes, go do
+* TODO: Does auto-follow mouse go in GrfInt?
+         IFNE  GrfInt-1
          deca             Update auto-follow mouse?
          lbeq  L1B4D      Yes, go do
+         ENDC
          lbra  L0A96
 
 * Active window has changed, update everything
@@ -2429,9 +2453,11 @@
          ldu   >WGlobal+G.PrWMPt     get previous device static mem pointer
          beq   L0CB3      nothing there, skip ahead
          pshs  y          preserve new window table pointer
+         IFNE  GrfInt-1
          bsr   L0CF2      any overlay windows or frames?
          bcs   L0CA3      no, skip ahead
          lbsr  L1034      set menu bar to in-active state
+         ENDC
 L0CA3    lda   >WGlobal+g00BE     get new window table flag
          bmi   L0CB1      not used, skip ahead
          ldu   >WGlobal+G.PrWMPt     get previous device static mem pointer
@@ -2445,9 +2471,11 @@
          tst   ,s         did we de-activate last used window?
          beq   L0CE1      no, skip activate
          pshs  y,u        Preserve regs
+         IFNE  GrfInt-1
          bsr   L0CF2      any overlay or framed windows?
          bcs   L0CCA      no, skip ahead
          lbsr  L13E9      set menu bar to active state
+         ENDC
 L0CCA    ldy   >WGlobal+G.CurDev     get current device mem pointer
          sty   >WGlobal+G.PrWMPt     save it as previous
          puls  u,y        Get Y & static mem ptr back for possible overlay
@@ -2475,9 +2503,11 @@
 L0CF2    lda   #$FF       initialize new window table flag
          sta   >WGlobal+g00BE
 L0CFA    lbsr  L06AE      get window table pointer of this window
+         IFNE  GrfInt-1
          lbsr  L0E34      framed or scroll barred window?
          bcs   L0D06      no, skip ahead
          rts   
+         ENDC
 
 * No framed or scroll barred window, check for overlay window
 L0D06    lda   Wt.BLnk,y  is this a overlay window?
@@ -2492,6 +2522,7 @@
 L0D20    coma             set carry & return
          rts   
 
+         IFNE  GrfInt-1
 * SS.WnSet SetStt call processor
 L0D23    lbsr  L1358      setup the graphics table entry
          ldx   PD.RGS,y   get register stack pointer
@@ -2892,6 +2923,7 @@
          puls  a,pc
          ENDC
 
+         IFNE  GrfInt-1
 * Draw a 3D frame around window for scroll barred window
 FSWin    ldy   >WGlobal+g00BB     Get ptr to work window table
          lbsr  L12BE      clear screen
@@ -3139,6 +3171,8 @@
          fdb   -1
          fcb   $4a
 
+         ENDC
+
 * Check if window is a graphic window
 L115F    bsr   L116C      copy window table to work table
          lda   >WGlobal+g00BD     Get current screen type
@@ -5308,6 +5342,9 @@
          ENDC
          rts              return
 
+         ENDC
+
+
 ****************************
 * Scale/DWProtSw/TCharSw/BoldSw
 DWProtSw
@@ -5453,6 +5490,7 @@
          clrb             No error & return
          rts   
 
+         IFNE  GrfInt-1
 * FIXMENU - redos the graphics on the menu bar affected by menu pulldown
 * Entry: X=Ptr to menu text (NUL terminated)
 *        Y=Window table ptr
@@ -5548,6 +5586,7 @@
          lbsr  DrawBar
          leas  10,s       Restore stack
          puls  d,x,pc     Restore regs & return
+         ENDC
 
          emod  
 eom      equ   *
--- a/rules.mak	Fri May 14 03:20:44 2004 +0000
+++ b/rules.mak	Mon May 17 14:11:30 2004 +0000
@@ -4,7 +4,8 @@
 # These macros should change according to where the base directory of
 # your project source tree is located.
 BASEDIR		= $(HOME)/nitros9
-OS9TOOLSDIR	= /usr/local/bin
+OS9TOOLSDIR	= $(HOME)/bin
+#OS9TOOLSDIR	= /usr/local/bin
 DEFDIR		= $(BASEDIR)/defs
 DSKDIR		= $(BASEDIR)/dsks