changeset 1760:27e85b681dab

Fixed DEFS issue in 6809l2 and 6309l2 (thanks Rodney!) Other defs file changes
author boisy
date Fri, 01 Apr 2005 13:00:57 +0000
parents c748bc73facc
children 480df7549772
files defs/boot.d defs/const.d defs/errno.d defs/io.d defs/ioman.d defs/m6809.d defs/module.d defs/proc.d defs/scf.d defs/signal.d defs/stat.d defs/syscall.d defs/sysglobs.d docs/NitrOS-9 Technical Reference.doc level2/defs/makefile rules.mak
diffstat 16 files changed, 85 insertions(+), 80 deletions(-) [+]
line wrap: on
line diff
--- a/defs/boot.d	Fri Apr 01 12:57:06 2005 +0000
+++ b/defs/boot.d	Fri Apr 01 13:00:57 2005 +0000
@@ -1,5 +1,5 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; boot
+; boot - NitrOS-9 Boot Definitions
 ;
 ; $Id$
 ;
@@ -7,7 +7,7 @@
 ; Comment
 ; ------------------------------------------------------------------
 ;          2004/05/17  Boisy G. Pitre
-; Started.
+; Created.
 
            .title   Boot Definitions
 
--- a/defs/const.d	Fri Apr 01 12:57:06 2005 +0000
+++ b/defs/const.d	Fri Apr 01 13:00:57 2005 +0000
@@ -1,5 +1,5 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; const
+; const - Constant Chracter Definitions
 ;
 ; $Id$
 ;
@@ -7,7 +7,7 @@
 ; Comment
 ; ------------------------------------------------------------------
 ;          2004/05/17  Boisy G. Pitre
-; Started.
+; Created.
 
            .title   Constant Character Definitions
 
--- a/defs/errno.d	Fri Apr 01 12:57:06 2005 +0000
+++ b/defs/errno.d	Fri Apr 01 13:00:57 2005 +0000
@@ -1,5 +1,5 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; errno
+; errno - NitrOS-9 Error Definitions
 ;
 ; $Id$
 ;
@@ -7,7 +7,7 @@
 ; Comment
 ; ------------------------------------------------------------------
 ;          2004/07/02  Boisy G. Pitre
-; Started
+; Created.
 
            .title   NitrOS-9 Error Definitions
 
--- a/defs/io.d	Fri Apr 01 12:57:06 2005 +0000
+++ b/defs/io.d	Fri Apr 01 13:00:57 2005 +0000
@@ -1,5 +1,5 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; io
+; io - I/O Constant Definitions
 ;
 ; $Id$
 ;
@@ -7,7 +7,7 @@
 ; Comment
 ; ------------------------------------------------------------------
 ;          2004/05/17  Boisy G. Pitre
-; Started.
+; Created.
 
            .title   I/O Constant Definitions
 
--- a/defs/ioman.d	Fri Apr 01 12:57:06 2005 +0000
+++ b/defs/ioman.d	Fri Apr 01 13:00:57 2005 +0000
@@ -1,21 +1,28 @@
-;*************************************
-; I/O Service Request Code Definitions
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; io.d - I/O Service Request Code Definitions
+;
+; $Id$
 ;
+; Edt/Rev  YYYY/MM/DD  Modified by
+; Comment
+; ------------------------------------------------------------------
+;          2004/07/02  Boisy G. Pitre
+; Created.
 
 I$Attach ==   0h80          ; Attach I/O Device
-I$Detach ==   0h80          ; Detach I/O Device
-I$Dup    ==   0h80          ; Duplicate Path
-I$Create ==   0h80          ; Create New File
-I$Open   ==   0h80          ; Open Existing File
-I$MakDir ==   0h80          ; Make Directory File
-I$ChgDir ==   0h80          ; Change Default Directory
-I$Delete ==   0h80          ; Delete File
-I$Seek   ==   0h80          ; Change Current Position
-I$Read   ==   0h80          ; Read Data
-I$Write  ==   0h80          ; Write Data
-I$ReadLn ==   0h80          ; Read Line of ASCII Data
-I$WritLn ==   0h80          ; Write Line of ASCII Data
-I$GetStt ==   0h80          ; Get Path Status
-I$SetStt ==   0h80          ; Set Path Status
-I$Close  ==   0h80          ; Close Path
-I$DeletX ==   0h80          ; Delete from current exec dir
+I$Detach ==   0h81          ; Detach I/O Device
+I$Dup    ==   0h82          ; Duplicate Path
+I$Create ==   0h83          ; Create New File
+I$Open   ==   0h84          ; Open Existing File
+I$MakDir ==   0h85          ; Make Directory File
+I$ChgDir ==   0h86          ; Change Default Directory
+I$Delete ==   0h87          ; Delete File
+I$Seek   ==   0h88          ; Change Current Position
+I$Read   ==   0h89          ; Read Data
+I$Write  ==   0h8A          ; Write Data
+I$ReadLn ==   0h8B          ; Read Line of ASCII Data
+I$WritLn ==   0h8C          ; Write Line of ASCII Data
+I$GetStt ==   0h8D          ; Get Path Status
+I$SetStt ==   0h8E          ; Set Path Status
+I$Close  ==   0h8F          ; Close Path
+I$DeletX ==   0h90          ; Delete from current exec dir
--- a/defs/m6809.d	Fri Apr 01 12:57:06 2005 +0000
+++ b/defs/m6809.d	Fri Apr 01 13:00:57 2005 +0000
@@ -1,5 +1,5 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; m6809
+; m6809 - Motorola 6809 Definitions
 ;
 ; $Id$
 ;
@@ -7,7 +7,7 @@
 ; Comment
 ; ------------------------------------------------------------------
 ;          2004/05/17  Boisy G. Pitre
-; Started.
+; Created.
 
            .title  Motorola 6809 Definitions
 
--- a/defs/module.d	Fri Apr 01 12:57:06 2005 +0000
+++ b/defs/module.d	Fri Apr 01 13:00:57 2005 +0000
@@ -1,5 +1,5 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; module
+; module - Module Definitions
 ;
 ; $Id$
 ;
@@ -7,7 +7,7 @@
 ; Comment
 ; ------------------------------------------------------------------
 ;          2004/05/17  Boisy G. Pitre
-; Started.
+; Created.
 
            .title   Module Definitions
 
@@ -43,11 +43,11 @@
 ;
 ; System, File Manager, Device Driver, Program Module
 ;
-M$Exec     ==       10         ; Execution Entry Offset
+M$Exec     ==       9         ; Execution Entry Offset
 ;
 ; Device Driver, Program Module
 ;
-M$Mem      ==       12         ; Stack Requirement
+M$Mem      ==       11         ; Stack Requirement
 ;
 ; Device Driver, Device Descriptor Module
 ;
--- a/defs/proc.d	Fri Apr 01 12:57:06 2005 +0000
+++ b/defs/proc.d	Fri Apr 01 13:00:57 2005 +0000
@@ -1,5 +1,5 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; proc
+; proc - Process Descriptor Constants
 ;
 ; $Id$
 ;
@@ -7,9 +7,9 @@
 ; Comment
 ; ------------------------------------------------------------------
 ;          2004/05/17  Boisy G. Pitre
-; Started.
+; Created.
 
-           .title   Process Constants
+           .title   Process Descriptor Constants
 
            .area    PROC (ABS)
 
@@ -23,32 +23,31 @@
 DefIOSiz   ==     12
 NumPaths   ==     16         ; Number of Local Paths
 
-           .org   0
-P$ID::     .rmb   1          ; Process ID
-P$PID::    .rmb   1          ; Parent's ID
-P$SID::    .rmb   1          ; Sibling's ID
-P$CID::    .rmb   1          ; Child's ID
-P$SP::     .rmb   2          ; Stack ptr
-P$CHAP::   .rmb   1          ; process chapter number
-P$ADDR::   .rmb   1          ; user address beginning page number
-P$PagCnt:: .rmb   1          ; Memory Page Count
-P$User::   .rmb   2          ; User Index
-P$Prior::  .rmb   1          ; Priority
-P$Age::    .rmb   1          ; Age
-P$State:   .rmb   1          ; Process State
-P$Queue::  .rmb   2          ; Queue Link (Process ptr)
-P$IOQP::   .rmb   1          ; Previous I/O Queue Link (Process ID)
-P$IOQN::   .rmb   1          ; Next     I/O Queue Link (Process ID)
-P$PModul:: .rmb   2          ; Primary Module
-P$SWI::    .rmb   2          ; SWI Entry Point
-P$SWI2::   .rmb   2          ; SWI2 Entry Point
-P$SWI3::   .rmb   2          ; SWI3 Entry Point
-P$DIO::    .rmb   DefIOSiz   ; default I/O ptrs
-P$PATH::   .rmb   NumPaths   ; I/O path table
-P$Signal:: .rmb   1          ; Signal Code
-P$SigVec:: .rmb   2          ; Signal Intercept Vector
-P$SigDat:: .rmb   2          ; Signal Intercept Data Address
-P$NIO::    .rmb   4          ; additional DIO pointers for net
+P$ID       ==     0h00          ; Process ID
+P$PID      ==     0h01          ; Parent's ID
+P$SID      ==     0h02          ; Sibling's ID
+P$CID      ==     0h03          ; Child's ID
+P$SP       ==     0h04          ; Stack ptr
+P$CHAP     ==     0h06          ; process chapter number
+P$ADDR     ==     0h07          ; user address beginning page number
+P$PagCnt   ==     0h08          ; Memory Page Count
+P$User     ==     0h09          ; User Index
+P$Prior    ==     0h0B          ; Priority
+P$Age      ==     0h0C          ; Age
+P$State    ==     0h0D          ; Process State
+P$Queue    ==     0h0E          ; Queue Link (Process ptr)
+P$IOQP     ==     0h10          ; Previous I/O Queue Link (Process ID)
+P$IOQN     ==     0h11          ; Next     I/O Queue Link (Process ID)
+P$PModul   ==     0h12          ; Primary Module
+P$SWI      ==     0h14          ; SWI Entry Point
+P$SWI2     ==     0h16          ; SWI2 Entry Point
+P$SWI3     ==     0h18          ; SWI3 Entry Point
+P$DIO      ==     0h1A          ; default I/O ptrs
+P$PATH     ==     P$DIO+DefIOSiz ; I/O path table
+P$Signal   ==     P$PATH+NumPaths   ; Signal Code
+P$SigVec   ==     P$Signal+2          ; Signal Intercept Vector
+P$SigDat   ==     P$SigVec+22          ; Signal Intercept Data Address
+P$NIO      ==     4          ; additional DIO pointers for net
                              ; unused
            .org   0h40
 P$Size     ==     .          ; Size of Process Descriptor
--- a/defs/scf.d	Fri Apr 01 12:57:06 2005 +0000
+++ b/defs/scf.d	Fri Apr 01 13:00:57 2005 +0000
@@ -1,10 +1,10 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; scf
+; scf - Sequential File Manager Definitions
 ;
 ; $Id$
 ;
-; SCF stands for 'Sequential Character Filemanager' and is a package of subroutines
-; that define the logical structure of a serial device.
+; SCF stands for 'Sequential Character Filemanager' and is a package of
+; subroutines that define the logical structure of a serial device.
 ;
 ; The data structures in this file give SCF its 'personality' and are used
 ; by SCF itself, as well as applications that will require disk I/O.
@@ -13,7 +13,7 @@
 ; Comment
 ; ------------------------------------------------------------------
 ;          2004/07/02  Boisy G. Pitre
-; Started
+; Created
 
            .title   Sequential File Manager Definitions
 
--- a/defs/signal.d	Fri Apr 01 12:57:06 2005 +0000
+++ b/defs/signal.d	Fri Apr 01 13:00:57 2005 +0000
@@ -1,5 +1,5 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; signal
+; signal - Signal Definitions
 ;
 ; $Id$
 ;
@@ -7,9 +7,9 @@
 ; Comment
 ; ------------------------------------------------------------------
 ;          2004/07/02  Boisy G. Pitre
-; Started
+; Created.
 
-           .title   Signal definitions
+           .title   Signal Definitions
 
            .area    sys (ABS)
 
--- a/defs/stat.d	Fri Apr 01 12:57:06 2005 +0000
+++ b/defs/stat.d	Fri Apr 01 13:00:57 2005 +0000
@@ -1,5 +1,5 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; stat
+; stat - GetStat/SetStat Code Definitions
 ;
 ; $Id$
 ;
@@ -7,7 +7,7 @@
 ; Comment
 ; ------------------------------------------------------------------
 ;          2004/07/02  Boisy G. Pitre
-; Started
+; Created.
 
            .title   GetStat/SetStat Code Definitions
 
--- a/defs/syscall.d	Fri Apr 01 12:57:06 2005 +0000
+++ b/defs/syscall.d	Fri Apr 01 13:00:57 2005 +0000
@@ -1,5 +1,5 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; syscall
+; syscall - NitrOS-9 System Call Definitions
 ;
 ; $Id$
 ;
@@ -7,9 +7,9 @@
 ; Comment
 ; ------------------------------------------------------------------
 ;          2004/07/02  Boisy G. Pitre
-; Started
+; Created.
 
-           .title   NitrOS-9 System Definitions
+           .title   NitrOS-9 System Call Definitions
 
            .area    SYS (ABS)
 
--- a/defs/sysglobs.d	Fri Apr 01 12:57:06 2005 +0000
+++ b/defs/sysglobs.d	Fri Apr 01 13:00:57 2005 +0000
@@ -1,5 +1,5 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-; sysglobs
+; sysglobs - System Global Definitions
 ;
 ; $Id$
 ;
@@ -7,9 +7,9 @@
 ; Comment
 ; ------------------------------------------------------------------
 ;          2004/05/17  Boisy G. Pitre
-; Started.
+; Created.
 
-           .title   System Globals
+           .title   System Global Definitions
 
            .area    SYSGLOBS (ABS)
 
Binary file docs/NitrOS-9 Technical Reference.doc has changed
--- a/level2/defs/makefile	Fri Apr 01 12:57:06 2005 +0000
+++ b/level2/defs/makefile	Fri Apr 01 13:00:57 2005 +0000
@@ -3,7 +3,6 @@
 DEPENDS		= ./makefile
 
 DEFOPTS		= -ls -x -z -aLevel=2
-DEFSDIR		= $(BASEDIR)/defs
 PERMDEFS	= Defsfile
 DEFS		= OS9Defs RBFDefs SCFDefs SysType CC3IODefs
 ALLOBJS		= $(DEFS) $(PERMDEFS)
--- a/rules.mak	Fri Apr 01 12:57:06 2005 +0000
+++ b/rules.mak	Fri Apr 01 13:00:57 2005 +0000
@@ -19,7 +19,7 @@
 ifndef	COCOTOOLSBIN
 COCOTOOLSBIN	= $(HOME)/bin
 endif
-DEFDIR		= $(NITROS9DIR)/defs
+DEFSDIR		= $(NITROS9DIR)/defs
 DSKDIR		= $(NITROS9DIR)/dsks
 
 
@@ -29,8 +29,8 @@
 #ASOUT		= o=
 
 # Use the cross assembler
-AS		= $(COCOTOOLSBIN)/mamou -i=$(DEFDIR)
-#AS		= $(COCOTOOLSBIN)/os9asm -i=$(DEFDIR)
+AS		= $(COCOTOOLSBIN)/mamou -i=$(DEFSDIR)
+#AS		= $(COCOTOOLSBIN)/os9asm -i=$(DEFSDIR)
 ASOUT		= -o
 AFLAGS		= -q