changeset 1417:b7b173926ea1

Changes and fixes by Robert Gault
author boisy
date Sun, 30 Nov 2003 22:25:56 +0000
parents f48bed2bdf44
children fe9b121458c1
files defs/os9defs defs/systype
diffstat 2 files changed, 63 insertions(+), 46 deletions(-) [+]
line wrap: on
line diff
--- a/defs/os9defs	Sun Nov 30 22:00:40 2003 +0000
+++ b/defs/os9defs	Sun Nov 30 22:25:56 2003 +0000
@@ -55,6 +55,9 @@
 * changed the sizes from 2 to 3 bytes.
 * DT.NFM is now the same for both Level One and Level Two.
 * Added DT.CDFM type for future CD-ROM file manager
+*
+*          2003/11/05  Robert Gault
+* Fixed MouseInf. Made it rmb 2 as it should be. Also changes to init and cc3io.
 
          nam   OS9Defs
          IFEQ  Level-1
@@ -545,18 +548,18 @@
 D.VOFF1  rmb   1          vertical offset 1 register ($FF9D)
 D.VOFF0  rmb   1          vertical offset 0 register ($FF9E)
 D.HOFF0  rmb   1          horizontal offset 0 register ($FF9F)
-D.Speed  rmb   1          Speed of COCO CPU 0=slow,1=fast
-D.TskIPt rmb   2          Task image Pointer table (CC)
-D.MemSz  rmb   1          128/512K memory flag (CC)
-D.SSTskN rmb   1          System State Task Number (COCO)
-D.CCMem  rmb   2          Pointer to beginning of CC Memory
-D.CCStk  rmb   2          Pointer to top of CC Memory
-D.Flip0  rmb   2          Change to Task 0
-D.Flip1  rmb   2          Change to reserved Task 1
-D.VIRQ   rmb   2          VIRQ Polling routine
-D.IRQS   rmb   1          IRQ shadow register (CC Temporary)
-D.CLTb   rmb   2          VIRQ Table address
-D.AltIRQ rmb   2          Alternate IRQ Vector (CC)
+D.Speed  rmb   1          Speed of COCO CPU 0=slow,1=fast ($A0)
+D.TskIPt rmb   2          Task image Pointer table (CC) ($A1)
+D.MemSz  rmb   1          128/512K memory flag (CC) ($A3)
+D.SSTskN rmb   1          System State Task Number (COCO) ($A4)
+D.CCMem  rmb   2          Pointer to beginning of CC Memory ($A5)
+D.CCStk  rmb   2          Pointer to top of CC Memory ($A7)
+D.Flip0  rmb   2          Change to Task 0 ($A9)
+D.Flip1  rmb   2          Change to reserved Task 1 ($AB)
+D.VIRQ   rmb   2          VIRQ Polling routine ($AD)
+D.IRQS   rmb   1          IRQ shadow register (CC Temporary) ($AF)
+D.CLTb   rmb   2          VIRQ Table address ($B0)
+D.AltIRQ rmb   2          Alternate IRQ Vector (CC) ($B2)
 D.GPoll  rmb   2          CC GIME IRQ enable/disable toggle
 D.Clock2 rmb   2          CC Clock2 entry address
          org   $C0
@@ -676,7 +679,7 @@
          IFGT  Level-1
 * -- CC3IO area -- (NitrOS-9 Level 2 and above) *
 MonType  rmb   1          Monitor type (0=CMP,1=RGB,2=MONO)
-MouseInf rmb   1          Mouse resolution/Mouse port
+MouseInf rmb   2          Mouse resolution/Mouse port; was 1, major error RG.
 KeyRptS  rmb   1          Key repeat start constant
 KeyRptD  rmb   1          Key repeat delay constant
          ENDC
--- a/defs/systype	Sun Nov 30 22:00:40 2003 +0000
+++ b/defs/systype	Sun Nov 30 22:25:56 2003 +0000
@@ -21,7 +21,13 @@
 *
 *          2002/06/22  Boisy G. Pitre
 * Removed PIA.U4 and PIA.U8, improved comments
-
+*
+*          2003/11/05  Robert Gault
+* Made changes in window globals and grfdrv memory to handle regW
+* in 6809 systems.
+*
+*          2003/11/30  Boisy G. Pitre
+* Statics now are prefaced with V. to identify them easier in source.
 
          nam   SysType
          IFEQ  Level-1
@@ -129,7 +135,7 @@
 
 *************************************************
 *
-* CoCo 1/2 Section
+* NitrOS-9 Level 1 Section
 *
 *************************************************
 
@@ -139,7 +145,7 @@
 
 *************************************************
 *
-* CoCo 3 Section
+* NitrOS-9 Level 2 Section
 *
 *************************************************
 
@@ -443,34 +449,33 @@
 *
 * STRONG CAUTION:  scfdefs MUST be included first before this file if
 * V.SCF is to be resolved properly in pass 1!!
-         org   V.SCF
-
-WinType  rmb   1          window type (0=Windint/GrfInt,2=VDGInt)      $1D
-InfVld   rmb   1          Rest of info here valid? (0=NO, >0 = YES)    $1E
-DevPar   rmb   2          high bit=window device                       $1F
-ULCase   rmb   1          special key flags (Capslck & keyboard mouse) $21
-KySnsFlg rmb   1          flag for key sense setstat                   $22
-ScrChg   rmb   1          screen change flag                           $23
-SS.SigID rmb   1          data ready process ID                        $24
-SS.SigSg rmb   1          data ready signal code                       $25
-MS.SigID rmb   1          mouse signal process ID                      $26
-MS.SigSg rmb   1          mouse signal signal code                     $27
-MS.Smpl  rmb   1          mouse sample rate                            $28
-MS.Time  rmb   1          mouse timeout value                          $29
-MS.Side  rmb   1          MSB of mouse auto-follow flag                $2A
-PrtSide  rmb   1          auto follow mouse flag                       $2B
-ParmCnt  rmb   1          parameter count                              $2C
-ParmVct  rmb   2          parameter vector                             $2D
-PrmStrt  rmb   2          pointer to params start                      $2F
-NxtPrm   rmb   2          pointer to next param storage                $31
-EndPtr   rmb   1          last character read offset                   $33
-InpPtr   rmb   1          next character read offset                   $34
-WinNum   rmb   1          window table entry #                         $35
-DWNum    rmb   1          dwnum from descriptor                        $36
-CallCde  rmb   1          internal comod call code #                   $37
-CC3Parm  rmb   128-.      global parameter area
-ReadBuf  rmb   256-.      read input buffer (keyboard)
-CC3DSiz  equ   .
+           org   V.SCF
+V.WinType  rmb   1          window type (0=Windint/GrfInt,2=VDGInt)      $1D
+V.InfVld   rmb   1          Rest of info here valid? (0=NO, >0 = YES)    $1E
+V.DevPar   rmb   2          high bit=window device                       $1F
+V.ULCase   rmb   1          special key flags (Capslck & keyboard mouse) $21
+V.KySnsFlg rmb   1          flag for key sense setstat                   $22
+V.ScrChg   rmb   1          screen change flag                           $23
+V.SSigID   rmb   1          data ready process ID                        $24
+V.SSigSg   rmb   1          data ready signal code                       $25
+V.MSigID   rmb   1          mouse signal process ID                      $26
+V.MSigSg   rmb   1          mouse signal signal code                     $27
+V.MSmpl    rmb   1          mouse sample rate                            $28
+V.MTime    rmb   1          mouse timeout value                          $29
+           rmb   1          unused                                       $2A
+V.MAutoF   rmb   1          auto follow mouse flag                       $2B
+V.ParmCnt  rmb   1          parameter count                              $2C
+V.ParmVct  rmb   2          parameter vector                             $2D
+V.PrmStrt  rmb   2          pointer to params start                      $2F
+V.NxtPrm   rmb   2          pointer to next param storage                $31
+V.EndPtr   rmb   1          last character read offset                   $33
+V.InpPtr   rmb   1          next character read offset                   $34
+V.WinNum   rmb   1          window table entry #                         $35
+V.DWNum    rmb   1          dwnum from descriptor                        $36
+V.CallCde  rmb   1          internal comod call code #                   $37
+CC3Parm    rmb   128-.      global parameter area
+ReadBuf    rmb   256-.      read input buffer (keyboard)
+CC3DSiz    equ   .
 
 *****************************************************************************
 * GrfInt/WindInt global memory area
@@ -481,7 +486,7 @@
 G.CntTik rmb   1          Current tick count for cursor updates
 G.GfBusy rmb   1          Grfdrv is busy flag (1=busy)
 g0003    rmb   2          NEW: UNUSED
-g0005    rmb   2          ???
+g0005    rmb   2          Temp save in Windint RG
 G.GrfStk rmb   2          grfdrv stack pointer ($07)
 G.MonTyp rmb   1          monitor type
 g000A    equ   .          Old label for compatibility
@@ -692,7 +697,16 @@
 gr00AF   rmb    2           FFill:orig. start Y coord|Circ/Ell saved end X
 gr00B1   rmb    1           Flag in FFill: 1=1st time through, 0=not 1st time
 gr00B2   rmb    1           Filled (circle,ellipse) flag 0=Not filled
-gr00B3   rmb    256-.       ??? UNUSED
+*gr00B3   rmb    256-.       ??? UNUSED
+gr00B3   rmb   1          temp veriable grfdrv
+gr00B4   rmb   1          temp veriable grfdrv
+gr00B5   rmb   1          regW for grfdrv
+gr00B6   rmb   1          
+gr00B7   rmb   2          
+gr00B9   rmb   2          previously used in grfdrv at $B2 but not for Filled Flag
+gr00BB   rmb   2          previously used in grfdrv at $B4
+gr00BD   rmb   2          previously used in grfdrv at $B6
+gr00BF   rmb    256-.
 * GPLoad buffer - $1200 in system block 0
 GPBuf    rmb   72         common move buffer for gpload/get/put
 gb0000   equ   72         Size of get/put buffer ($48)