BSD 4_3_Reno release

[unix-history] / usr / src / sys / tahoe / sys_machdep.c

diff --git a/usr/src/sys/tahoe/sys_machdep.c b/usr/src/sys/tahoe/sys_machdep.c
index a524b64..949ca89 100644 (file)
--- a/usr/src/sys/tahoe/sys_machdep.c
+++ b/usr/src/sys/tahoe/sys_machdep.c
@@ -3,17 +3,15 @@
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *
  * All rights reserved.  The Berkeley software License Agreement
  * specifies the terms and conditions for redistribution.
  *

- *     @(#)sys_machdep.c       7.1 (Berkeley) 5/21/88
+ *     @(#)sys_machdep.c       7.5 (Berkeley) 6/28/90

  */
 
 #include "param.h"
 #include "systm.h"
  */
 
 #include "param.h"
 #include "systm.h"

-#include "dir.h"

 #include "user.h"
 #include "ioctl.h"
 #include "file.h"
 #include "proc.h"
 #include "user.h"
 #include "ioctl.h"
 #include "file.h"
 #include "proc.h"

-#include "uio.h"

 #include "kernel.h"
 #include "mtio.h"
 #include "buf.h"
 #include "kernel.h"
 #include "mtio.h"
 #include "buf.h"


@@ -23,49 +21,45 @@
 #ifdef TRACE
 int    nvualarm;
 
 #ifdef TRACE
 int    nvualarm;
 

-vtrace()
-{
-       register struct a {
+/* ARGSUSED */
+vtrace(p, uap, retval)
+       register struct proc *p;
+       register struct args {

                int     request;
                int     value;
        } *uap;
                int     request;
                int     value;
        } *uap;

+       int *retval;
+{

        int vdoualarm();
 
        int vdoualarm();
 

-       uap = (struct a *)u.u_ap;

        switch (uap->request) {
 
        case VTR_DISABLE:               /* disable a trace point */
        case VTR_ENABLE:                /* enable a trace point */
                if (uap->value < 0 || uap->value >= TR_NFLAGS)
        switch (uap->request) {
 
        case VTR_DISABLE:               /* disable a trace point */
        case VTR_ENABLE:                /* enable a trace point */
                if (uap->value < 0 || uap->value >= TR_NFLAGS)

-                       u.u_error = EINVAL;
-               else {
-                       u.u_r.r_val1 = traceflags[uap->value];
-                       traceflags[uap->value] = uap->request;
-               }
+                       return (EINVAL);
+               *retval = traceflags[uap->value];
+               traceflags[uap->value] = uap->request;

                break;
 
        case VTR_VALUE:         /* return a trace point setting */
                if (uap->value < 0 || uap->value >= TR_NFLAGS)
                break;
 
        case VTR_VALUE:         /* return a trace point setting */
                if (uap->value < 0 || uap->value >= TR_NFLAGS)

-                       u.u_error = EINVAL;
-               else
-                       u.u_r.r_val1 = traceflags[uap->value];
+                       return (EINVAL);
+               *retval = traceflags[uap->value];

                break;
 
        case VTR_UALARM:        /* set a real-time ualarm, less than 1 min */
                break;
 
        case VTR_UALARM:        /* set a real-time ualarm, less than 1 min */

-               if (uap->value <= 0 || uap->value > 60 * hz ||
-                   nvualarm > 5)
-                       u.u_error = EINVAL;
-               else {
-                       nvualarm++;
-                       timeout(vdoualarm, (caddr_t)u.u_procp->p_pid,
-                           uap->value);
-               }
+               if (uap->value <= 0 || uap->value > 60 * hz || nvualarm > 5)
+                       return (EINVAL);
+               nvualarm++;
+               timeout(vdoualarm, (caddr_t)p->p_pid, uap->value);

                break;
 
        case VTR_STAMP:
                break;
 
        case VTR_STAMP:

-               trace(TR_STAMP, uap->value, u.u_procp->p_pid);
+               trace(TR_STAMP, uap->value, p->p_pid);

                break;
        }
                break;
        }

+       return (0);

 }
 
 vdoualarm(arg)
 }
 
 vdoualarm(arg)


@@ -79,59 +73,3 @@ vdoualarm(arg)
        nvualarm--;
 }
 #endif
        nvualarm--;
 }
 #endif

-
-#ifdef COMPAT
-/*
- * Note: these tables are sorted by
- * ioctl "code" (in ascending order).
- */
-int dctls[] = { DKIOCHDR, 0 };
-int fctls[] = { FIOCLEX, FIONCLEX, FIOASYNC, FIONBIO, FIONREAD, 0 };
-int mctls[] = { MTIOCTOP, MTIOCGET, 0 };
-int tctls[] = {
-       TIOCGETD, TIOCSETD, TIOCHPCL, TIOCMODG, TIOCMODS,
-       TIOCGETP, TIOCSETP, TIOCSETN, TIOCEXCL, TIOCNXCL,
-       TIOCFLUSH,TIOCSETC, TIOCGETC, TIOCREMOTE,TIOCMGET,
-       TIOCMBIC, TIOCMBIS, TIOCMSET, TIOCSTART,TIOCSTOP,
-       TIOCPKT,  TIOCNOTTY,TIOCSTI,  TIOCOUTQ, TIOCGLTC,
-       TIOCSLTC, TIOCSPGRP,TIOCGPGRP,TIOCCDTR, TIOCSDTR,
-       TIOCCBRK, TIOCSBRK, TIOCLGET, TIOCLSET, TIOCLBIC,
-       TIOCLBIS, 0
-};
-
-/*
- * Map an old style ioctl command to new.
- */
-mapioctl(cmd)
-       int cmd;
-{
-       register int *map, c;
-
-       switch ((cmd >> 8) & 0xff) {
-
-       case 'd':
-               map = dctls;
-               break;
-
-       case 'f':
-               map = fctls;
-               break;
-
-       case 'm':
-               map = mctls;
-               break;
-
-       case 't':
-               map = tctls;
-               break;
-
-       default:
-               return (0);
-       }
-       while ((c = *map) && (c&0xff) < (cmd&0xff))
-               map++;
-       if (c && (c&0xff) == (cmd&0xff))
-               return (c);
-       return (0);
-}
-#endif