changeset 1719:b680ef2c88f2

Init is now pulled from level1, also makefile modified for new clock sources
author boisy
date Fri, 20 Aug 2004 11:02:29 +0000
parents be1b6c7e5f9d
children 2305d175abb3
files level2/modules/init.asm level2/modules/makefile
diffstat 2 files changed, 4 insertions(+), 102 deletions(-) [+]
line wrap: on
line diff
--- a/level2/modules/init.asm	Fri Aug 20 11:01:21 2004 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-********************************************************************
-* Init - NitrOS-9 Level 2 Configuration module
-*
-* $Id$
-*
-* Edt/Rev  YYYY/MM/DD  Modified by
-* Comment
-* ------------------------------------------------------------------
-* 204      1998/10/12  Boisy G. Pitre
-* Original OS-9 L2 Tandy distribution.
-*
-* 205      1998/10/20  Boisy G. Pitre
-* Added CC3IO and Clock sections.
-*
-* 205r2    1998/10/20  Boisy G. Pitre
-* Removed clock information from here.
-*
-*   1      2003/01/08  Boisy G. Pitre
-* Restarted edition number back to 1, removed CMDS/cc3go reference and
-* just have cc3go so that in certain cases, cc3go can be in the bootfile,
-* and so that ROMmed systems don't have to have a special init module.
-*          2003/11/05  Robert Gault
-* Corrected CC3IO info regards mouse. Changed from fcb to fdb low res/ right
-* Corrected OS9Defs to match.
-
-         nam   Init
-         ttl   NitrOS-9 Level 2 Configuration module
-
-         ifp1  
-         use   defsfile
-         endc  
-
-tylg     set   Systm+$00
-atrv     set   ReEnt+rev
-rev      set   $00
-edition  set   1
-
-         mod   eom,name,tylg,atrv,$0FE0,$0015
-
-***** USER MODIFIABLE DEFINITIONS HERE *****
-
-* Init table
-start    equ   *
-         fcb   $27        number of IRQ polling entires
-         fdb   DefProg    offset to program to fork
-         fdb   DefDev     offset to default disk device
-         fdb   DefCons    offset to default console device
-         fdb   DefBoot    offset to boot module name
-         fcb   $01        write protect flag (?)
-         fcb   Level      OS level
-         fcb   NOS9Vrsn   OS version
-         fcb   NOS9Major  OS major revision
-         fcb   NOS9Minor  OS minor revision
-         fcb   $00        feature byte #1
-         fcb   $00        feature byte #2
-         fcb   0,0,0,0,0,0,0,0  reserved
-
-* CC3IO section
-         fcb   Monitor    monitor type
-         fcb   0,1        mouse info, low res right mouse
-         fcb   $1E        key repeat start constant
-         fcb   $03        key repeat delay constant
-
-name     fcs   "Init"
-         fcb   edition
-
-DefProg  fcs   "SysGo"
-DefDev   fcs   "/DD"
-DefCons  fcs   "/Term"
-DefBoot  fcs   "Boot"
-
-         emod  
-eom      equ   *
-         end   
--- a/level2/modules/makefile	Fri Aug 20 11:01:21 2004 +0000
+++ b/level2/modules/makefile	Fri Aug 20 11:02:29 2004 +0000
@@ -197,35 +197,11 @@
 clock_50hz: clock.asm
 	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aPwrLnFrq=50
 
-clock2_elim: clock2.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< $(CLOCKELIM)
-
-clock2_disto2: clock2.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< $(CLOCKDISTO2)
-
-clock2_disto4: clock2.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< $(CLOCKDISTO4)
-
-clock2_bnb: clock2.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< $(CLOCKBNB)
-
-clock2_smart: clock2.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< $(CLOCKSMART)
+clock2_cloud9: clock2_ds1315.asm
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aCLOUD9=1
 
-clock2_harris: clock2.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< $(CLOCKHARRIS)
-
-clock2_cloud9: clock2.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< $(CLOCKCLOUD9)
-
-clock2_jvemu: clock2.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< $(CLOCKJVEMU)
-
-clock2_messemu: clock2.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< $(CLOCKMESSEMU)
-
-clock2_soft: clock2.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< $(CLOCKSOFT)
+clock2_bnb: clock2_ds1315.asm
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aBNB=1
 
 clean:
 	$(CD) kernel; make $@