purge #if sun's

SCCS-vsn: sys/sys/buf.h 4.22
SCCS-vsn: sys/ufs/ffs/dinode.h 4.24
SCCS-vsn: sys/ufs/ffs/inode.h 4.24
SCCS-vsn: sys/ufs/ufs/dinode.h 4.24
SCCS-vsn: sys/ufs/ufs/inode.h 4.24
SCCS-vsn: sys/sys/proc.h 4.24
SCCS-vsn: sys/sys/ttychars.h 4.6
SCCS-vsn: sys/sys/types.h 4.11
SCCS-vsn: sys/sys/user.h 4.30

diff --git a/usr/src/sys/sys/buf.h b/usr/src/sys/sys/buf.h
index 5d92b71..aee758e 100644 (file)
--- a/usr/src/sys/sys/buf.h
+++ b/usr/src/sys/sys/buf.h
@@ -1,4 +1,4 @@
-/*     buf.h   4.21    83/05/18        */
+/*     buf.h   4.22    83/07/01        */

 
 /*
  * The header for buffers in the buffer pool and otherwise used
 
 /*
  * The header for buffers in the buffer pool and otherwise used


@@ -58,11 +58,6 @@ struct buf
        struct  proc *b_proc;           /* proc doing physical or swap I/O */
        int     (*b_iodone)();          /* function called by iodone */
        int     b_pfcent;               /* center page when swapping cluster */
        struct  proc *b_proc;           /* proc doing physical or swap I/O */
        int     (*b_iodone)();          /* function called by iodone */
        int     b_pfcent;               /* center page when swapping cluster */

-#ifdef sun
-       caddr_t b_saddr;                /* saved address */
-       short   b_kmx;                  /* saved kernelmap index */
-       short   b_npte;                 /* number of pte's mapped */
-#endif

 };
 
 #define        BQUEUES         4               /* number of free buffer queues */
 };
 
 #define        BQUEUES         4               /* number of free buffer queues */


@@ -182,22 +177,3 @@ unsigned minphys();
        blkclr(bp->b_un.b_addr, bp->b_bcount); \
        bp->b_resid = 0; \
 }
        blkclr(bp->b_un.b_addr, bp->b_bcount); \
        bp->b_resid = 0; \
 }

-
-#ifdef sun
-/*
- * Declarations for buffer space rmaps
- */
-struct map *buffermap;
-#define BUFMAPSIZE     256
-
-/*
- * "Average" size of a buffer
- * nbuf*AVGBSIZE is total amount of buffer data
- */
-#define        AVGBSIZE        2048
-
-/*
- * Unit of buffer space allocation
- */
-#define        BUFALLOCSIZE    1024
-#endif

diff --git a/usr/src/sys/sys/proc.h b/usr/src/sys/sys/proc.h
index 0f70e34..0014be2 100644 (file)
--- a/usr/src/sys/sys/proc.h
+++ b/usr/src/sys/sys/proc.h
@@ -1,4 +1,4 @@
-/*     proc.h  4.23    83/06/02        */
+/*     proc.h  4.24    83/07/01        */

 
 /*
  * One structure allocated per active
 
 /*
  * One structure allocated per active


@@ -54,9 +54,6 @@ struct        proc {
        struct  proc *p_ysptr;  /* pointer to younger siblings */
        struct  itimerval p_realtimer;
        struct  quota *p_quota; /* quotas for this process */
        struct  proc *p_ysptr;  /* pointer to younger siblings */
        struct  itimerval p_realtimer;
        struct  quota *p_quota; /* quotas for this process */

-#ifdef sun
-       struct  context *p_ctx; /* pointer to current context */
-#endif

 };
 
 #define        PIDHSZ          63
 };
 
 #define        PIDHSZ          63

diff --git a/usr/src/sys/sys/ttychars.h b/usr/src/sys/sys/ttychars.h
index 5868c9c..18e8272 100644 (file)
--- a/usr/src/sys/sys/ttychars.h
+++ b/usr/src/sys/sys/ttychars.h
@@ -1,4 +1,4 @@
-/*     ttychars.h      4.5     83/06/20        */
+/*     ttychars.h      4.6     83/07/01        */

 
 /*
  * User visible structures and constants
 
 /*
  * User visible structures and constants


@@ -26,9 +26,9 @@ struct ttychars {
 #define        CTRL(c) ('c'&037)
 
 /* default special characters */
 #define        CTRL(c) ('c'&037)
 
 /* default special characters */

-#define        CERASE  '#'
-#define        CKILL   '@'
-#define        CINTR   0177            /* DEL, ^? */
+#define        CERASE  0177
+#define        CKILL   CTRL(u)
+#define        CINTR   CTRL(c)

 #define        CQUIT   034             /* FS, ^\ */
 #define        CSTART  CTRL(q)
 #define        CSTOP   CTRL(s)
 #define        CQUIT   034             /* FS, ^\ */
 #define        CSTART  CTRL(q)
 #define        CSTOP   CTRL(s)

diff --git a/usr/src/sys/sys/types.h b/usr/src/sys/sys/types.h
index 0286814..3eac82f 100644 (file)
--- a/usr/src/sys/sys/types.h
+++ b/usr/src/sys/sys/types.h
@@ -1,4 +1,4 @@
-/*     types.h 4.10    83/05/18        */
+/*     types.h 4.11    83/07/01        */

 
 /*
  * Basic system types and major/minor device constructing/busting macros.
 
 /*
  * Basic system types and major/minor device constructing/busting macros.


@@ -25,12 +25,6 @@ typedef      struct  label_t {
        int     val[14];
 } label_t;
 #endif
        int     val[14];
 } label_t;
 #endif

-#ifdef sun
-typedef        struct  _physadr { short r[1]; } *physadr;
-typedef        struct  label_t {
-       int     val[13];
-} label_t;
-#endif

 typedef        struct  _quad { long val[2]; } quad;
 typedef        long    daddr_t;
 typedef        char *  caddr_t;
 typedef        struct  _quad { long val[2]; } quad;
 typedef        long    daddr_t;
 typedef        char *  caddr_t;

diff --git a/usr/src/sys/sys/user.h b/usr/src/sys/sys/user.h
index 45ec95c..7f49129 100644 (file)
--- a/usr/src/sys/sys/user.h
+++ b/usr/src/sys/sys/user.h
@@ -1,4 +1,4 @@
-/*     user.h  4.29    83/06/20        */
+/*     user.h  4.30    83/07/01        */

 
 #ifdef KERNEL
 #include "../machine/pcb.h"
 
 #ifdef KERNEL
 #include "../machine/pcb.h"


@@ -8,8 +8,8 @@
 #else
 #include <machine/pcb.h>
 #include <sys/dmap.h>
 #else
 #include <machine/pcb.h>
 #include <sys/dmap.h>

-#include <time.h>
-#include <resource.h>
+#include <sys/time.h>
+#include <sys/resource.h>

 #endif
 
 /*
 #endif
 
 /*


@@ -132,9 +132,6 @@ struct      user {
                unsigned pr_off;        /* pc offset */
                unsigned pr_scale;      /* pc scaling */
        } u_prof;
                unsigned pr_off;        /* pc offset */
                unsigned pr_scale;      /* pc scaling */
        } u_prof;

-#ifdef sun
-       int     u_lofault;              /* catch faults in locore.s */
-#endif

        int     u_stack[1];
 };
 
        int     u_stack[1];
 };
 

diff --git a/usr/src/sys/ufs/ffs/dinode.h b/usr/src/sys/ufs/ffs/dinode.h
index ffa410e..79009ef 100644 (file)
--- a/usr/src/sys/ufs/ffs/dinode.h
+++ b/usr/src/sys/ufs/ffs/dinode.h
@@ -1,4 +1,4 @@
-/*     dinode.h        4.23    83/05/21        */
+/*     dinode.h        4.24    83/07/01        */

 
 /*
  * The I node is the focus of all file activity in UNIX.
 
 /*
  * The I node is the focus of all file activity in UNIX.


@@ -65,9 +65,6 @@ struct dinode {
 #ifdef vax
 #define        i_size          i_ic.ic_size.val[0]
 #endif
 #ifdef vax
 #define        i_size          i_ic.ic_size.val[0]
 #endif

-#ifdef sun
-#define        i_size          i_ic.ic_size.val[1]
-#endif

 #define        i_db            i_ic.ic_db
 #define        i_ib            i_ic.ic_ib
 #define        i_atime         i_ic.ic_atime
 #define        i_db            i_ic.ic_db
 #define        i_ib            i_ic.ic_ib
 #define        i_atime         i_ic.ic_atime


@@ -90,9 +87,6 @@ struct dinode {
 #ifdef vax
 #define        di_size         di_ic.ic_size.val[0]
 #endif
 #ifdef vax
 #define        di_size         di_ic.ic_size.val[0]
 #endif

-#ifdef sun
-#define        di_size         di_ic.ic_size.val[1]
-#endif

 #define        di_db           di_ic.ic_db
 #define        di_ib           di_ic.ic_ib
 #define        di_atime        di_ic.ic_atime
 #define        di_db           di_ic.ic_db
 #define        di_ib           di_ic.ic_ib
 #define        di_atime        di_ic.ic_atime

diff --git a/usr/src/sys/ufs/ffs/inode.h b/usr/src/sys/ufs/ffs/inode.h
index a995e44..ebf42f3 100644 (file)
--- a/usr/src/sys/ufs/ffs/inode.h
+++ b/usr/src/sys/ufs/ffs/inode.h
@@ -1,4 +1,4 @@
-/*     inode.h 4.23    83/05/21        */
+/*     inode.h 4.24    83/07/01        */

 
 /*
  * The I node is the focus of all file activity in UNIX.
 
 /*
  * The I node is the focus of all file activity in UNIX.


@@ -65,9 +65,6 @@ struct dinode {
 #ifdef vax
 #define        i_size          i_ic.ic_size.val[0]
 #endif
 #ifdef vax
 #define        i_size          i_ic.ic_size.val[0]
 #endif

-#ifdef sun
-#define        i_size          i_ic.ic_size.val[1]
-#endif

 #define        i_db            i_ic.ic_db
 #define        i_ib            i_ic.ic_ib
 #define        i_atime         i_ic.ic_atime
 #define        i_db            i_ic.ic_db
 #define        i_ib            i_ic.ic_ib
 #define        i_atime         i_ic.ic_atime


@@ -90,9 +87,6 @@ struct dinode {
 #ifdef vax
 #define        di_size         di_ic.ic_size.val[0]
 #endif
 #ifdef vax
 #define        di_size         di_ic.ic_size.val[0]
 #endif

-#ifdef sun
-#define        di_size         di_ic.ic_size.val[1]
-#endif

 #define        di_db           di_ic.ic_db
 #define        di_ib           di_ic.ic_ib
 #define        di_atime        di_ic.ic_atime
 #define        di_db           di_ic.ic_db
 #define        di_ib           di_ic.ic_ib
 #define        di_atime        di_ic.ic_atime

diff --git a/usr/src/sys/ufs/ufs/dinode.h b/usr/src/sys/ufs/ufs/dinode.h
index ffa410e..79009ef 100644 (file)
--- a/usr/src/sys/ufs/ufs/dinode.h
+++ b/usr/src/sys/ufs/ufs/dinode.h
@@ -1,4 +1,4 @@
-/*     dinode.h        4.23    83/05/21        */
+/*     dinode.h        4.24    83/07/01        */

 
 /*
  * The I node is the focus of all file activity in UNIX.
 
 /*
  * The I node is the focus of all file activity in UNIX.


@@ -65,9 +65,6 @@ struct dinode {
 #ifdef vax
 #define        i_size          i_ic.ic_size.val[0]
 #endif
 #ifdef vax
 #define        i_size          i_ic.ic_size.val[0]
 #endif

-#ifdef sun
-#define        i_size          i_ic.ic_size.val[1]
-#endif

 #define        i_db            i_ic.ic_db
 #define        i_ib            i_ic.ic_ib
 #define        i_atime         i_ic.ic_atime
 #define        i_db            i_ic.ic_db
 #define        i_ib            i_ic.ic_ib
 #define        i_atime         i_ic.ic_atime


@@ -90,9 +87,6 @@ struct dinode {
 #ifdef vax
 #define        di_size         di_ic.ic_size.val[0]
 #endif
 #ifdef vax
 #define        di_size         di_ic.ic_size.val[0]
 #endif

-#ifdef sun
-#define        di_size         di_ic.ic_size.val[1]
-#endif

 #define        di_db           di_ic.ic_db
 #define        di_ib           di_ic.ic_ib
 #define        di_atime        di_ic.ic_atime
 #define        di_db           di_ic.ic_db
 #define        di_ib           di_ic.ic_ib
 #define        di_atime        di_ic.ic_atime

diff --git a/usr/src/sys/ufs/ufs/inode.h b/usr/src/sys/ufs/ufs/inode.h
index a995e44..ebf42f3 100644 (file)
--- a/usr/src/sys/ufs/ufs/inode.h
+++ b/usr/src/sys/ufs/ufs/inode.h
@@ -1,4 +1,4 @@
-/*     inode.h 4.23    83/05/21        */
+/*     inode.h 4.24    83/07/01        */

 
 /*
  * The I node is the focus of all file activity in UNIX.
 
 /*
  * The I node is the focus of all file activity in UNIX.


@@ -65,9 +65,6 @@ struct dinode {
 #ifdef vax
 #define        i_size          i_ic.ic_size.val[0]
 #endif
 #ifdef vax
 #define        i_size          i_ic.ic_size.val[0]
 #endif

-#ifdef sun
-#define        i_size          i_ic.ic_size.val[1]
-#endif

 #define        i_db            i_ic.ic_db
 #define        i_ib            i_ic.ic_ib
 #define        i_atime         i_ic.ic_atime
 #define        i_db            i_ic.ic_db
 #define        i_ib            i_ic.ic_ib
 #define        i_atime         i_ic.ic_atime


@@ -90,9 +87,6 @@ struct dinode {
 #ifdef vax
 #define        di_size         di_ic.ic_size.val[0]
 #endif
 #ifdef vax
 #define        di_size         di_ic.ic_size.val[0]
 #endif

-#ifdef sun
-#define        di_size         di_ic.ic_size.val[1]
-#endif

 #define        di_db           di_ic.ic_db
 #define        di_ib           di_ic.ic_ib
 #define        di_atime        di_ic.ic_atime
 #define        di_db           di_ic.ic_db
 #define        di_ib           di_ic.ic_ib
 #define        di_atime        di_ic.ic_atime