changeset 1869:a51439f6b206

Massive checkin
author boisy
date Sat, 30 Jul 2005 03:36:05 +0000
parents cba8a54bc509
children 79edc5d44491
files 3rdparty/packages/uemacs/makefile 3rdparty/packages/uemacs/ueed.h 3rdparty/packages/uemacs/uemain.h 3rdparty/packages/uemacs/uemain1.c 3rdparty/packages/uucpbb/src/getopt.c 3rdparty/packages/uucpbb/src/makefile.coco 3rdparty/packages/uucpbb/src/uucp.h level1/cmds/attr.a level1/cmds/load.a level1/cmds/tee.a level1/cmds/touch.a level1/cmds/tsmon.a level2/makefile
diffstat 13 files changed, 315 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/3rdparty/packages/uemacs/makefile	Fri Jul 29 19:40:14 2005 +0000
+++ b/3rdparty/packages/uemacs/makefile	Sat Jul 30 03:36:05 2005 +0000
@@ -1,11 +1,10 @@
 #  makefile for Micro emacs for os9/68000
 # temp files on ram disk
-%.r: %.c
-	$(CC) $(CFLAGS) $< -r -v=/Users/boisy/Projects/mwcc/defs
+include $(NITROS9DIR)/rules.mak
 
-CC	= cc09
+CC	= c3
 
-CFLAGS =
+CFLAGS += -y -q
 
 MAINR  = uemain1.r uemain2.r uemain3.r uemain4.r uemaintable.r
 DISPR  = uedisplay1.r uedisplay2.r uedisplay3.r
--- a/3rdparty/packages/uemacs/ueed.h	Fri Jul 29 19:40:14 2005 +0000
+++ b/3rdparty/packages/uemacs/ueed.h	Sat Jul 30 03:36:05 2005 +0000
@@ -11,7 +11,7 @@
 /* #define V7      0                       /* V7 UN*X or Coherent          */
 /* #define VMS     0                       /* VAX/VMS                      */
 /* #define CPM     0                       /* CP/M-86                      */
-#define OS9     1                       /* os9/6809 level 1 (coco)      */
+/* #define OS9     1                       /* os9/6809 level 1 (coco)      */
 /* #define OSK     1                       /* os9/68000 predefined         */
 /* #define MSDOS   0                       /* MS-DOS predefined            */
 
--- a/3rdparty/packages/uemacs/uemain.h	Fri Jul 29 19:40:14 2005 +0000
+++ b/3rdparty/packages/uemacs/uemain.h	Sat Jul 30 03:36:05 2005 +0000
@@ -268,5 +268,5 @@
 
 #endif
 
-#define NULL 0
+/* #define NULL 0 */
 
--- a/3rdparty/packages/uemacs/uemain1.c	Fri Jul 29 19:40:14 2005 +0000
+++ b/3rdparty/packages/uemacs/uemain1.c	Sat Jul 30 03:36:05 2005 +0000
@@ -25,7 +25,7 @@
  *      - Fixes to ^X= command   
  */
   
-/* #include        <stdio.h> */
+#include        <stdio.h>
 #include        "ueed.h"
 #ifdef VMS
 #include        <ssdef.h>
@@ -113,7 +113,9 @@
         if (c == (CTRL|'X'))                    /* ^X is a prefix       */
                 c = CTLX | getctl();
         if (kbdmip != NULL) {                   /* Save macro strokes.  */
-                if (c!=(CTLX|')') && kbdmip>&kbdm[NKBDM-6]) {
+                if (kbdmip == kbdm[NKBDM-6])
+/*                if (c != ( CTLX | ')' ) && kbdmip > &kbdm[NKBDM-6]) */
+		{
                         ctrlg(FALSE, 0);
                         goto loop;
                 }
--- a/3rdparty/packages/uucpbb/src/getopt.c	Fri Jul 29 19:40:14 2005 +0000
+++ b/3rdparty/packages/uucpbb/src/getopt.c	Sat Jul 30 03:36:05 2005 +0000
@@ -69,7 +69,7 @@
 #endif
 
 #ifdef USE_INDEX
-#include <strings.h>                     /* C library string functions */
+#include <string.h>                     /* C library string functions */
 #define strchr index
 #else
 #include <string.h>                      /* C library string functions */
--- a/3rdparty/packages/uucpbb/src/makefile.coco	Fri Jul 29 19:40:14 2005 +0000
+++ b/3rdparty/packages/uucpbb/src/makefile.coco	Sat Jul 30 03:36:05 2005 +0000
@@ -5,7 +5,7 @@
 # NOTE: This package must be compiled by the SUPERUSER (user 0) in order
 #       for it to work properly.
 
-CC      = cc
+CC      = cc09
 
 # Temporary directory.  This device must have at least 120K of free space
 TMP     = /dd/tmp
--- a/3rdparty/packages/uucpbb/src/uucp.h	Fri Jul 29 19:40:14 2005 +0000
+++ b/3rdparty/packages/uucpbb/src/uucp.h	Sat Jul 30 03:36:05 2005 +0000
@@ -35,10 +35,10 @@
 #undef USE_INDEX
 #include <string.h>
 #else                          /* all other C compilers */
-#define USE_INDEX 1
-#define strchr(a,b) index(a,b)
-#define strrchr(a,b) rindex(a,b)
-#include <strings.h>
+#define USE_INDEX 0
+/*#define strchr(a,b) index(a,b) */
+/* #define strrchr(a,b) rindex(a,b) */
+#include <string.h>
 #endif
 
 #include "os_misc.h"                                        /* Added --REB */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/level1/cmds/attr.a	Sat Jul 30 03:36:05 2005 +0000
@@ -0,0 +1,265 @@
+
+* Attr - Modify file attributes
+*
+* $Id$
+*
+* Edt/Rev  YYYY/MM/DD  Modified by
+* Comment
+* ------------------------------------------------------------------
+*  11      ????/??/??
+* From Tandy OS-9 Level Two VR 02.00.01.
+
+         nam   Attr
+         ttl   Modify file attributes
+
+* Disassembled 98/09/11 11:44:51 by Disasm v1.6 (C) 1988 by RML
+
+         use   defsfile.d
+
+DOHELP   set   0
+
+tylg     set   Prgrm+Objct
+atrv     set   ReEnt+rev
+rev      set   $00
+edition  set   11
+
+
+         psect tee_a,Prgrm+Objct,ReEnt+rev,edition,200,start
+
+         vsect dp
+fpath    rmb   1
+rawpath  rmb   1
+parmptr  rmb   2
+cmdperms rmb   2
+u0006    rmb   1
+u0007    rmb   1
+pathopts rmb   20
+u001C    rmb   2
+u001E    rmb   1
+u001F    rmb   9
+u0028    rmb   32
+filename rmb   32
+fdesc    rmb   16
+u0078    rmb   46
+         endsect
+
+         IFNE  DOHELP
+HelpMsg  fcb   C$LF
+         fcc   "Use: Attr <pathname> {[-]<opts>}"
+         fcb   C$LF
+         fcc   " opts: -d s r w e pr pw pe -a"
+         fcb   C$CR
+         ENDC
+NotOwner fcb   C$LF
+         fcc   "You do not own that file."
+         fcb   C$CR
+UseMkDir fcb   C$LF
+         fcc   "Use Makdir to create a directory"
+         fcb   C$CR
+DirNtEmt fcb   C$LF
+         fcc   "ERROR; the directory is not empty"
+         fcb   C$CR
+Attrs    fcc   "dsewrewr"
+         fcb   $FF
+
+start    stx   parmptr		save param ptr
+         clr   u0007
+         com   u0007
+* Open file at X as file
+         clra  
+         os9   I$Open		open file on commandline
+         bcc   L00D9		branch if ok
+* If error, try to open as directory with read permission
+         ldx   parmptr		get saved param ptr
+         lda   #DIR.+READ.	load perms
+         os9   I$Open		open as directory
+         bcc   L00D9		branch if ok
+* One last time, try open as directory only
+         ldx   parmptr		get param ptr
+         lda   #DIR.		load different perms
+         os9   I$Open		try one more time
+         bcs   L0114		branch if error
+L00D9    sta   fpath		save off path
+         stx   cmdperms	save updated parm ptr
+         leax  pathopts		point X to buffer
+         ldb   #SS.Opt		load with status code
+         os9   I$GetStt		get status
+         bcs   L0114		branch if error
+         clrb  
+         lda   ,x		get path type
+         cmpa  #DT.RBF		check if rbf path
+         lbne  ShowHelp		branch if not
+         ldx   parmptr		else get parm ptr
+         leay  filename		 point to buffer
+         lda   ,x+		get file name character
+         cmpa  #PDELIM		path delimiter?
+         bne   L0106		no
+L00FA    sta   ,y+		else save char in Y
+         lda   ,x+		get next file name char
+         cmpa  #C$PERD		period?
+         bcs   L0106		branch if not
+         cmpa  #PDELIM		path delimiter?
+         bne   L00FA		branch if not
+L0106    lda   #PENTIR
+         ldb   #C$SPAC
+         std   ,y++
+         leax  filename		point X to filename
+         lda   #READ.+WRITE.	load perms
+         os9   I$Open		open in raw mode
+L0114    lbcs  ShowHelp		branch if error
+         sta   rawpath
+         lda   fpath
+         clr   u001F
+         pshs  u
+         ldx   u001C		get MS 16 bits
+         ldu   u001E		get LS 16 bits
+         lda   rawpath		get path
+         os9   I$Seek		seek
+         puls  u
+         bcs   ShowHelp		branch if error
+         leax  fdesc		point to buffer
+         ldy   #FD.SEG
+         os9   I$Read
+         bcs   ShowHelp
+         os9   F$ID		get ID
+         cmpy  #$0000		super user?
+         beq   L014B		branch if so
+         cmpy  fdesc+FD.OWN	is user same as file's owner?
+         bne   L01C1		branch if not
+L014B    ldx   cmdperms		point to perms on cmd line
+         lbsr  L021D
+         bcs   L018B
+L0152    lbsr  L021D
+         bcc   L0152
+         clrb  
+         lda   ,x
+         cmpa  #C$CR
+         bne   ShowHelp
+         pshs  u
+         ldx   u001C
+         ldu   u001E
+         lda   rawpath
+         os9   I$Seek		seek
+         puls  u
+         bcs   ShowHelp		branch if error
+         leax  fdesc		point to file desc
+         ldy   #1		only 1 byte
+         os9   I$Write		write out new attributes
+         bcs   ShowHelp		branch if error
+         os9   I$Close		close file
+         bcs   ShowHelp		branch if error
+         lda   fpath		get file path
+         os9   I$Close		close file
+         bcs   ShowHelp		branch if error
+         ldb   u0007
+         beq   L01BE
+L018B    ldb   fdesc		get attribute
+         leax  >Attrs,pcr
+         leay  u0078
+         lda   ,x+
+L0197    lslb  
+         bcs   L019C
+         lda   #'-
+L019C    sta   ,y+
+         lda   ,x+
+         bpl   L0197
+         lda   #C$CR
+         sta   ,y+
+         leax  u0078
+         clrb  
+         bra   L01B0
+ShowHelp equ   *
+         IFNE  DOHELP
+         leax  >HelpMsg,pcr
+         ELSE
+         clrb
+         bra  L01BE
+         ENDC
+L01B0    pshs  b
+         lda   #2
+         ldy   #256
+         os9   I$WritLn
+         comb  
+         puls  b
+L01BE    os9   F$Exit
+L01C1    clrb  
+         leax  >NotOwner,pcr
+         bra   L01B0
+L01C8    leax  >UseMkDir,pcr
+         clrb  
+         bra   L01B0
+L01CF    pshs  u,y,x
+         lda   fpath
+         ldx   #$0000
+         ldu   #DIR.SZ*2
+         os9   I$Seek
+         ldu   $04,s
+         bcs   L01BE
+L01E0    leax  u0028
+         ldy   #DIR.SZ
+         os9   I$Read
+         bcs   L01F7
+         tst   ,x
+         beq   L01E0
+         leax  >DirNtEmt,pcr
+         clrb  
+         bra   L01B0
+L01F7    puls  u,y,x
+         cmpb  #E$EOF
+         bne   ShowHelp
+         rts   
+L01FE    fdb   $ff41
+         fdb   $ff80,$44ff,$4053,$ff01,$52ff,$0257,$ff04,$45ff
+         fdb   $0850,$52ff,$1050,$57ff,$2050,$45ff
+         fcb   $00
+L021D    clr   u0006
+L021F    lda   ,x+
+         cmpa  #C$SPAC
+         beq   L021F
+         cmpa  #C$COMA
+         beq   L021F
+         cmpa  #'-
+         bne   L0231
+         com   u0006
+         lda   ,x+
+L0231    leax  -1,x
+         leay  >L01FE,pcr
+L0237    ldb   ,y+
+         pshs  y,x
+         beq   L027F
+L023D    lda   ,x+
+         eora  ,y+
+         anda  #$DF
+         beq   L023D
+         lda   -1,y
+         bmi   L0251
+         puls  y,x
+L024B    lda   ,y+
+         bpl   L024B
+         bra   L0237
+L0251    lda   ,-x
+         cmpa  #$30
+         bcc   L027F
+         cmpb  #$FF
+         beq   L0278
+         bitb  #$80
+         beq   L0268
+         tst   u0006
+         lbeq  L01C8
+         lbsr  L01CF
+L0268    puls  y,b,a
+         lda   fdesc
+         eora  u0006
+         ora   -$01,y
+         eora  u0006
+         sta   fdesc
+         clrb  
+         rts   
+L0278    eorb  u0006
+         stb   u0007
+         clrb  
+         puls  pc,y,b,a
+L027F    coma  
+         puls  pc,y,x
+
+         endsect
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/level1/cmds/load.a	Sat Jul 30 03:36:05 2005 +0000
@@ -0,0 +1,34 @@
+********************************************************************
+* Load - Load a module
+*
+* $Id$
+*
+* Edt/Rev  YYYY/MM/DD  Modified by
+* Comment
+* ------------------------------------------------------------------
+*   4      ????/??/??
+* From Tandy OS-9 Level One VR 02.00.00.
+
+         nam   Load
+         ttl   Load a module
+
+         use   defsfile.d
+
+rev      set   $00
+edition  set   4
+
+         psect load_a,Prgrm+Objct,ReEnt+rev,edition,200,start
+
+         vsect dp
+u0000    rmb   200
+         endsect
+
+start    os9   F$Load   
+         bcs   Exit
+         lda   ,x
+         cmpa  #C$CR
+         bne   start
+         clrb  
+Exit     os9   F$Exit   
+
+         endsect
--- a/level1/cmds/tee.a	Fri Jul 29 19:40:14 2005 +0000
+++ b/level1/cmds/tee.a	Sat Jul 30 03:36:05 2005 +0000
@@ -16,9 +16,6 @@
 
          use   defsfile.d
 
-Prgrm    set   $10
-Objct    set   $01
-ReEnt    set   $80
 rev      set   $00
 edition  set   2
 
--- a/level1/cmds/touch.a	Fri Jul 29 19:40:14 2005 +0000
+++ b/level1/cmds/touch.a	Sat Jul 30 03:36:05 2005 +0000
@@ -15,9 +15,6 @@
 
          use   defsfile.d
 
-Prgrm    set   $10 
-Objct    set   $01
-ReEnt    set   $80
 rev      set   $00
 edition  set   2
 
--- a/level1/cmds/tsmon.a	Fri Jul 29 19:40:14 2005 +0000
+++ b/level1/cmds/tsmon.a	Sat Jul 30 03:36:05 2005 +0000
@@ -14,9 +14,6 @@
 
          use   defsfile.d
 
-Prgrm    set   $10 
-Objct    set   $01
-ReEnt    set   $80
 rev      set   $00
 edition  set   2
 
--- a/level2/makefile	Fri Jul 29 19:40:14 2005 +0000
+++ b/level2/makefile	Sat Jul 30 03:36:05 2005 +0000
@@ -5,7 +5,7 @@
 
 DISTRO		= $(CPU)L$(LEVEL)
 DISTRONAME	= nos9$(CPU)l$(LEVEL)
-DISTROVER	= $(DISTRO)$(NITROS9VER)
+DISTROVER	= $(DISTRONAME)$(NITROS9VER)
 BOOTFILE_40D	= bootfiles/bootfile_40d
 BOOTFILE_80D	= bootfiles/bootfile_80d
 BOOTFILE_40D_50HZ	= bootfiles/bootfile_40d_50hz