src - OpenBSD base system

diff options


context:
space:
mode:

author	Ted Unangst <tedu@cvs.openbsd.org>	2010-06-29 18:47:49 +0000
committer	Ted Unangst <tedu@cvs.openbsd.org>	2010-06-29 18:47:49 +0000
commit	6204d281f7ec7f2f2d69b359c6dbb6beb5215aac (patch)
tree	d53d3d5bf76e989669f3fb4dba4c7acf8b41a112
parent	3a987c18732485ffb64f30fb7e92daae417968b6 (diff)

and the ultrix files go into the attic. ok deraadt miod

Diffstat

-rw-r--r--

sys/compat/ultrix/Makefile

-rw-r--r--

sys/compat/ultrix/files.ultrix

-rw-r--r--

sys/compat/ultrix/syscalls.conf

-rw-r--r--

sys/compat/ultrix/syscalls.master

364

-rw-r--r--

sys/compat/ultrix/ultrix_fs.c

445

-rw-r--r--

sys/compat/ultrix/ultrix_ioctl.c

783

-rw-r--r--

sys/compat/ultrix/ultrix_misc.c

600

-rw-r--r--

sys/compat/ultrix/ultrix_pathname.c

309

-rw-r--r--

sys/compat/ultrix/ultrix_syscall.h

420

-rw-r--r--

sys/compat/ultrix/ultrix_syscallargs.h

334

-rw-r--r--

sys/compat/ultrix/ultrix_syscalls.c

282

-rw-r--r--

sys/compat/ultrix/ultrix_sysent.c

554

-rw-r--r--

sys/compat/ultrix/ultrix_tty.h

-rw-r--r--

sys/compat/ultrix/ultrix_util.h

14 files changed, 0 insertions, 4217 deletions

diff --git a/sys/compat/ultrix/Makefile b/sys/compat/ultrix/Makefile
deleted file mode 100644
index 45e9e14a9d7..00000000000
--- a/sys/compat/ultrix/Makefile
+++ /dev/null

@@ -1,7 +0,0 @@

-# $OpenBSD: Makefile,v 1.2 2001/08/26 03:23:44 deraadt Exp $

-DEP= syscalls.conf syscalls.master ../../kern/makesyscalls.sh

-OBJS= ultrix_sysent.c ultrix_syscalls.c ultrix_syscall.h ultrix_syscallargs.h

-${OBJS}: ${DEP}

- sh ../../kern/makesyscalls.sh syscalls.conf syscalls.master

diff --git a/sys/compat/ultrix/files.ultrix b/sys/compat/ultrix/files.ultrix
deleted file mode 100644
index bf12eb5ee05..00000000000
--- a/sys/compat/ultrix/files.ultrix
+++ /dev/null

@@ -1,15 +0,0 @@

-# $OpenBSD: files.ultrix,v 1.5 1999/11/10 15:55:24 mickey Exp $

-# $NetBSD: files.ultrix,v 1.3 1996/01/07 13:38:49 jonathan Exp $

-# Config file description for machine-independent Ultrix compat code.

-# Included by ports that need it.

-# ports should define any machine-specific files they need in their

-# own file lists.

-file compat/ultrix/ultrix_pathname.c compat_ultrix

-file compat/ultrix/ultrix_ioctl.c compat_ultrix

-file compat/ultrix/ultrix_misc.c compat_ultrix

-file compat/ultrix/ultrix_syscalls.c compat_ultrix & syscall_debug

-file compat/ultrix/ultrix_sysent.c compat_ultrix

-file compat/ultrix/ultrix_fs.c compat_ultrix

diff --git a/sys/compat/ultrix/syscalls.conf b/sys/compat/ultrix/syscalls.conf
deleted file mode 100644
index 9e5d5342863..00000000000
--- a/sys/compat/ultrix/syscalls.conf
+++ /dev/null

@@ -1,12 +0,0 @@

-# $OpenBSD: syscalls.conf,v 1.3 2001/05/16 05:02:20 millert Exp $

-# $NetBSD: syscalls.conf,v 1.1 1994/11/23 17:49:06 dean Exp $

-sysnames="ultrix_syscalls.c"

-sysnumhdr="ultrix_syscall.h"

-syssw="ultrix_sysent.c"

-sysarghdr="ultrix_syscallargs.h"

-libcompatopts=""

-switchname="ultrix_sysent"

-namesname="ultrix_syscallnames"

-constprefix="ULTRIX_SYS_"

diff --git a/sys/compat/ultrix/syscalls.master b/sys/compat/ultrix/syscalls.master
deleted file mode 100644
index 703cda506c0..00000000000
--- a/sys/compat/ultrix/syscalls.master
+++ /dev/null

@@ -1,364 +0,0 @@

- $OpenBSD: syscalls.master,v 1.12 2008/01/05 00:36:13 miod Exp $

-; $NetBSD: syscalls.master,v 1.15 1996/01/07 13:38:57 jonathan Exp $

-; @(#)syscalls.master 8.1 (Berkeley) 7/19/93

-; OpenBSD COMPAT_ULTRIX system call name/number "master" file.

-; (See syscalls.conf to see what it is processed into.)

-; Fields: number type [type-dependent ...]

-; number system call number, must be in order

-; type one of STD, OBSOL, UNIMPL, NODEF, NOARGS, or one of

-; the compatibility options defined in syscalls.conf.

-; types:

-; STD always included

-; OBSOL obsolete, not included in system

-; UNIMPL unimplemented, not included in system

-; NODEF included, but don't define the syscall number

-; NOARGS included, but don't define the syscall args structure

-; The compat options are defined in the syscalls.conf file, and the

-; compat option name is prefixed to the syscall name. Other than

-; that, they're like NODEF (for 'compat' options), or STD (for

-; 'libcompat' options).

-; The type-dependent arguments are as follows:

-; For STD, NODEF, NOARGS, and compat syscalls:

-; { pseudo-proto } [alias]

-; For other syscalls:

-; [comment]

-; #ifdef's, etc. may be included, and are copied to the output files.

-; #include's are copied to the syscall switch definition file only.

-#include <sys/param.h>

-#include <sys/systm.h>

-#include <sys/signal.h>

-#include <sys/mount.h>

-#include <sys/syscallargs.h>

-#include <compat/ultrix/ultrix_syscallargs.h>

-0 NOARGS { int sys_nosys(void); } syscall

-1 NOARGS { int sys_exit(int rval); }

-2 NOARGS { int sys_fork(void); }

-3 NOARGS { int sys_read(int fd, char *buf, u_int nbyte); }

-4 NOARGS { int sys_write(int fd, char *buf, u_int nbyte); }

-5 STD { int ultrix_sys_open(char *path, int flags, \

- int mode); }

-6 NOARGS { int sys_close(int fd); }

-7 NOARGS { int compat_43_sys_wait(void); } owait

-8 STD { int ultrix_sys_creat(char *path, int mode); }

-9 NOARGS { int sys_link(char *path, char *link); }

-10 NOARGS { int sys_unlink(char *path); }

-11 STD { int ultrix_sys_execv(char *path, char **argp); }

-12 NOARGS { int sys_chdir(char *path); }

-13 OBSOL time

-14 STD { int ultrix_sys_mknod(char *path, int mode, int dev); }

-15 NOARGS { int sys_chmod(char *path, int mode); }

-16 NOARGS { int sys_lchown(char *path, int uid, int gid); }

-17 NOARGS { int sys_obreak(char *nsize); } break

-18 OBSOL stat

-19 NOARGS { long compat_43_sys_lseek(int fd, long offset, \

- int whence); }

-20 NOARGS { pid_t sys_getpid(void); }

-21 STD { int ultrix_sys_mount(char *special, char *dir, \

- int rdonly, int type, caddr_t data); }

-22 OBSOL sysV_unmount

-23 NOARGS { int sys_setuid(uid_t uid); }

-24 NOARGS { uid_t sys_getuid(void); }

-25 OBSOL v7 stime

-26 OBSOL v7 ptrace

-27 OBSOL v7 alarm

-28 OBSOL v7 fstat

-29 OBSOL v7 pause

-30 OBSOL v7 utime

-31 OBSOL v7 stty

-32 OBSOL v7 gtty

-33 STD { int ultrix_sys_access(char *path, int flags); }

-34 OBSOL v7 nice

-35 OBSOL v7 ftime

-36 NOARGS { int sys_sync(void); }

-37 NOARGS { int sys_kill(int pid, int signum); }

-38 STD { int ultrix_sys_stat(char *path, \

- struct stat43 *ub); } stat43

-39 OBSOL v7 setpgrp

-40 STD { int ultrix_sys_lstat(char *path, \

- struct stat43 *ub); } olstat

-41 NOARGS { int sys_dup(u_int fd); }

-42 NOARGS { int sys_opipe(void); }

-43 OBSOL v7 times

-44 NOARGS { int sys_profil(caddr_t samples, u_int size, \

- u_int offset, u_int scale); }

-45 UNIMPL

-46 OBSOL v7 setgid

-47 NOARGS { gid_t sys_getgid(void); }

-48 UNIMPL ssig

-49 UNIMPL reserved for USG

-50 UNIMPL reserved for USG

-#ifdef ACCOUNTING

-51 NOARGS { int sys_acct(char *path); }

-#else

-51 UNIMPL acct

-#endif

-52 UNIMPL

-53 UNIMPL syslock

-54 STD { int ultrix_sys_ioctl(int fd, u_long com, caddr_t data); }

-55 NOARGS { int sys_reboot(int opt); }

-56 UNIMPL v7 mpxchan

-57 NOARGS { int sys_symlink(char *path, char *link); }

-58 NOARGS { int sys_readlink(char *path, char *buf, int count); }

-59 STD { int ultrix_sys_execve(char *path, char **argp, \

- char **envp); }

-60 NOARGS { int sys_umask(int newmask); }

-61 NOARGS { int sys_chroot(char *path); }

-62 NOARGS { int compat_43_sys_fstat(int fd, struct stat43 *sb); }

-63 UNIMPL

-64 NOARGS { int compat_43_sys_getpagesize(void); }

-65 UNIMPL mremap

-66 NOARGS { int sys_vfork(void); }

-67 OBSOL vread

-68 OBSOL vwrite

-69 NOARGS { int sys_sbrk(int incr); }

-70 NOARGS { int sys_sstk(int incr); }

-71 STD { int ultrix_sys_mmap(caddr_t addr, size_t len, \

- int prot, u_int flags, int fd, long pos); }

-72 OBSOL vadvise

-73 NOARGS { int sys_munmap(caddr_t addr, size_t len); }

-74 NOARGS { int sys_mprotect(caddr_t addr, size_t len, \

- int prot); }

-75 NOARGS { int sys_madvise(caddr_t addr, size_t len, \

- int behav); }

-76 STD { int ultrix_sys_vhangup(void); }

-77 UNIMPL old vlimit

-78 NOARGS { int sys_mincore(caddr_t addr, int len, char *vec); }

-79 NOARGS { int sys_getgroups(u_int gidsetsize, gid_t *gidset); }

-80 NOARGS { int sys_setgroups(u_int gidsetsize, gid_t *gidset); }

-81 NOARGS { int sys_getpgrp(void); }

-82 STD { int ultrix_sys_setpgrp(int pid, int pgid); }

-83 NOARGS { int sys_setitimer(u_int which, \

- struct itimerval *itv, struct itimerval *oitv); }

-84 STD { int ultrix_sys_wait3(int *status, int options, \

- struct rusage *rusage);}

-85 NOARGS { int compat_25_sys_swapon(char *name); }

-86 NOARGS { int sys_getitimer(u_int which, \

- struct itimerval *itv); }

-87 NOARGS { int compat_43_sys_gethostname(char *hostname, \

- u_int len); }

-88 NOARGS { int compat_43_sys_sethostname(char *hostname, \

- u_int len); }

-89 NOARGS { int compat_43_sys_getdtablesize(void); }

-90 NOARGS { int sys_dup2(u_int from, u_int to); }

-91 UNIMPL getdopt

-92 NOARGS { int sys_fcntl(int fd, int cmd, void *arg); }

-93 STD { int ultrix_sys_select(u_int nd, fd_set *in, fd_set *ou, \

- fd_set *ex, struct timeval *tv); }

-94 UNIMPL setdopt

-95 NOARGS { int sys_fsync(int fd); }

-96 NOARGS { int sys_setpriority(int which, int who, int prio); }

-97 NOARGS { int sys_socket(int domain, int type, int protocol); }

-98 NOARGS { int sys_connect(int s, caddr_t name, int namelen); }

-99 NOARGS { int compat_43_sys_accept(int s, caddr_t name, \

- int *anamelen); }

-100 NOARGS { int sys_getpriority(int which, int who); }

-101 NOARGS { int compat_43_sys_send(int s, caddr_t buf, int len, \

- int flags); }

-102 NOARGS { int compat_43_sys_recv(int s, caddr_t buf, int len, \

- int flags); }

-103 NOARGS { int sys_sigreturn(struct sigcontext *sigcntxp); }

-104 NOARGS { int sys_bind(int s, caddr_t name, int namelen); }

-105 STD { int ultrix_sys_setsockopt(int s, int level, \

- int name, caddr_t val, int valsize); }

-106 NOARGS { int sys_listen(int s, int backlog); }

-107 UNIMPL vtimes

-108 NOARGS { int compat_43_sys_sigvec(int signum, \

- struct sigvec *nsv, struct sigvec *osv); }

-109 NOARGS { int compat_43_sys_sigblock(int mask); }

-110 NOARGS { int compat_43_sys_sigsetmask(int mask); }

-111 NOARGS { int sys_sigsuspend(int mask); }

-112 NOARGS { int compat_43_sys_sigstack(struct sigstack *nss, \

- struct sigstack *oss); }

-113 NOARGS { int compat_43_sys_recvmsg(int s, \

- struct omsghdr *msg, int flags); }

-114 NOARGS { int compat_43_sys_sendmsg(int s, caddr_t msg, \

- int flags); }

-115 OBSOL vtrace

-116 NOARGS { int sys_gettimeofday(struct timeval *tp, \

- struct timezone *tzp); }

-117 NOARGS { int sys_getrusage(int who, struct rusage *rusage); }

-118 NOARGS { int sys_getsockopt(int s, int level, int name, \

- caddr_t val, int *avalsize); }

-119 UNIMPL resuba

-120 NOARGS { int sys_readv(int fd, struct iovec *iovp, \

- u_int iovcnt); }

-121 NOARGS { int sys_writev(int fd, struct iovec *iovp, \

- u_int iovcnt); }

-122 NOARGS { int sys_settimeofday(struct timeval *tv, \

- struct timezone *tzp); }

-123 NOARGS { int sys_fchown(int fd, int uid, int gid); }

-124 NOARGS { int sys_fchmod(int fd, int mode); }

-125 NOARGS { int compat_43_sys_recvfrom(int s, caddr_t buf, \

- size_t len, int flags, caddr_t from, \

- int *fromlenaddr); }

-126 NOARGS { int sys_setreuid(uid_t ruid, uid_t euid); }

-127 NOARGS { int sys_setregid(gid_t rgid, gid_t egid); }

-128 NOARGS { int sys_rename(char *from, char *to); }

-129 NOARGS { int compat_43_sys_truncate(char *path, long length); }

-130 NOARGS { int compat_43_sys_ftruncate(int fd, long length); }

-131 NOARGS { int sys_flock(int fd, int how); }

-132 UNIMPL

-133 NOARGS { int sys_sendto(int s, caddr_t buf, size_t len, \

- int flags, caddr_t to, int tolen); }

-134 NOARGS { int sys_shutdown(int s, int how); }

-135 NOARGS { int sys_socketpair(int domain, int type, \

- int protocol, int *rsv); }

-136 NOARGS { int sys_mkdir(char *path, int mode); }

-137 NOARGS { int sys_rmdir(char *path); }

-138 NOARGS { int sys_utimes(char *path, struct timeval *tptr); }

-139 STD { int ultrix_sys_sigcleanup(struct sigcontext *sigcntxp); }

-140 NOARGS { int sys_adjtime(struct timeval *delta, \

- struct timeval *olddelta); }

-141 NOARGS { int compat_43_sys_getpeername(int fdes, caddr_t asa, \

- int *alen); }

-142 NOARGS { int compat_43_sys_gethostid(void); }

-143 UNIMPL old sethostid

-144 NOARGS { int compat_43_sys_getrlimit(u_int which, \

- struct orlimit *rlp); }

-145 NOARGS { int compat_43_sys_setrlimit(u_int which, \

- struct orlimit *rlp); }

-146 NOARGS { int compat_43_sys_killpg(int pgid, int signum); }

-147 UNIMPL

-148 UNIMPL setquota

-149 UNIMPL quota /* needs to be nullop to boot on Ultrix root partition*/

-150 NOARGS { int compat_43_sys_getsockname(int fdes, caddr_t asa, \

- int *alen); }

-151 UNIMPL sysmips /* 4 args */

-152 UNIMPL cacheflush /* 4 args */

-153 UNIMPL cachectl /* 3 args */

-154 UNIMPL

-155 UNIMPL atomic_op

-156 UNIMPL

-157 UNIMPL

-#ifdef NFSSERVER

-158 STD { int ultrix_sys_nfssvc(int fd); }

-#else

-158 UNIMPL

-#endif

-159 NOARGS { int compat_43_sys_getdirentries(int fd, char *buf, \

- u_int count, long *basep); }

-160 STD { int ultrix_sys_statfs(char *path, \

- struct ultrix_statfs *buf); }

-161 STD { int ultrix_sys_fstatfs(int fd, \

- struct ultrix_statfs *buf); }

-162 UNIMPL umount

-#ifdef NFSCLIENT

-163 NOARGS { int async_daemon(void); }

-164 NOARGS { int sys_getfh(char *fname, fhandle_t *fhp); }

-#else

-163 UNIMPL async_daemon

-164 UNIMPL getfh

-#endif

-165 NOARGS { int compat_09_sys_getdomainname(char *domainname, \

- int len); }

-166 NOARGS { int compat_09_sys_setdomainname(char *domainname, \

- int len); }

-167 UNIMPL

-168 STD { int ultrix_sys_quotactl(int cmd, char *special, \

- int uid, caddr_t addr); }

-169 STD { int ultrix_sys_exportfs(char *path, char *ex); }

-170 UNIMPL { int ultrix_sys_mount(char *special, char *dir, \

- int rdonly, int type, caddr_t data); }

-171 UNIMPL 4 hdwconf

-172 UNIMPL msgctl

-173 UNIMPL msgget

-174 UNIMPL msgrcv

-175 UNIMPL msgsnd

-176 UNIMPL semctl

-177 UNIMPL semget

-178 UNIMPL semop

-179 STD { int ultrix_sys_uname(struct ultrix_utsname *name); }

-180 UNIMPL shmsys

-181 UNIMPL 0 plock

-182 UNIMPL 0 lockf

-183 STD { int ultrix_sys_ustat(int dev, \

- struct ultrix_ustat *buf); }

-184 STD { int ultrix_sys_getmnt(int *start, \

- struct ultrix_fs_data *buf, \

- int bufsize, int mode, char *path); }

-185 UNIMPL notdef

-186 UNIMPL notdef

-187 STD { int ultrix_sys_sigpending(int *mask); }

-188 NOARGS { int sys_setsid(void); }

-189 STD { int ultrix_sys_waitpid(int pid, int *status, \

- int options); }

-190 UNIMPL

-191 UNIMPL

-192 UNIMPL

-193 UNIMPL

-194 UNIMPL

-195 UNIMPL

-196 UNIMPL

-197 UNIMPL

-198 UNIMPL

-199 UNIMPL

-200 UNIMPL

-201 UNIMPL

-202 UNIMPL

-203 UNIMPL

-204 UNIMPL

-205 UNIMPL

-206 UNIMPL

-207 UNIMPL

-208 UNIMPL

-209 UNIMPL

-210 UNIMPL

-211 UNIMPL

-212 UNIMPL

-213 UNIMPL

-214 UNIMPL

-215 UNIMPL

-216 UNIMPL

-217 UNIMPL

-218 UNIMPL

-219 UNIMPL

-220 UNIMPL

-221 UNIMPL

-222 UNIMPL

-223 UNIMPL

-224 UNIMPL

-225 UNIMPL

-226 UNIMPL

-227 UNIMPL

-228 UNIMPL

-229 UNIMPL

-230 UNIMPL

-231 UNIMPL

-232 UNIMPL

-233 UNIMPL 1 utc_gettime

-234 UNIMPL 2 utc_adjtime

-235 UNIMPL

-236 UNIMPL

-237 UNIMPL

-238 UNIMPL

-239 UNIMPL

-240 UNIMPL

-241 UNIMPL

-242 UNIMPL

-243 UNIMPL

-244 UNIMPL

-245 UNIMPL

-246 UNIMPL

-247 UNIMPL

-248 UNIMPL

-249 UNIMPL

-250 UNIMPL

-251 UNIMPL

-252 UNIMPL audctl /*Make no-op for installation on Ultrix rootpartition?*/

-253 UNIMPL audgen /*Make no-op for installation on Ultrix rootpartition?*/

-254 UNIMPL startcpu

-255 UNIMPL stopcpu

-256 STD { int ultrix_sys_getsysinfo(unsigned op, char *buffer, \

- unsigned nbytes, int *start, char *arg); }

-257 STD { int ultrix_sys_setsysinfo(unsigned op, char *buffer, \

- unsigned nbytes, unsigned arg, unsigned flag); }

diff --git a/sys/compat/ultrix/ultrix_fs.c b/sys/compat/ultrix/ultrix_fs.c
deleted file mode 100644
index 041306217fe..00000000000
--- a/sys/compat/ultrix/ultrix_fs.c
+++ /dev/null

@@ -1,445 +0,0 @@

-/* $OpenBSD: ultrix_fs.c,v 1.15 2007/10/30 12:09:22 gilles Exp $ */

-/* $NetBSD: ultrix_fs.c,v 1.4 1996/04/07 17:23:06 jonathan Exp $ */

-/*

- * Jonathan Stone (hereinafter referred to as the author)

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions

- * are met:

- * 1. Redistributions of source code must retain the above copyright

- * notice, this list of conditions and the following disclaimer.

- * 2. Redistributions in binary form must reproduce the above copyright

- * notice, this list of conditions and the following disclaimer in the

- * documentation and/or other materials provided with the distribution.

- * 3. The name of the author may not be used to endorse or promote products

- * derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND

- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE

- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS

- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT

- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY

- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF

- * SUCH DAMAGE.

- */

-#include <sys/param.h>

-#include <sys/systm.h>

-#include <sys/malloc.h>

-#include <sys/exec.h>

-#include <sys/namei.h>

-#include <sys/mount.h>

-#include <net/if.h>

-#include <netinet/in.h>

-#include <nfs/rpcv2.h>

-#include <nfs/nfsproto.h>

-#include <nfs/nfs.h>

-#include <sys/syscallargs.h>

-#include <compat/ultrix/ultrix_syscallargs.h>

-#include <uvm/uvm_extern.h>

-#define ULTRIX_MAXPATHLEN 1024

-/**

- ** Ultrix filesystem operations: mount(), getmnt().

- ** These are included purely so one can place an (ECOFF or ELF)

- ** NetBSD/pmax kernel in an Ultrix root filesystem, boot it,

- ** and over-write the Ultrix root parition with NetBSD binaries.

- **/

-/*

- * Ultrix file system data structure, as modified by

- * Ultrix getmntent(). This structure is padded to 2560 bytes, for

- * compatibility with the size the Ultrix kernel and user apps expect.

- */

-struct ultrix_fs_data {

- u_int32_t ufsd_flags; /* how mounted */

- u_int32_t ufsd_mtsize; /* max transfer size in bytes */

- u_int32_t ufsd_otsize; /* optimal transfer size in bytes */

- u_int32_t ufsd_bsize; /* fs block size (bytes) for vm code */

- u_int32_t ufsd_fstype; /* see ../h/fs_types.h */

- u_int32_t ufsd_gtot; /* total number of gnodes */

- u_int32_t ufsd_gfree; /* # of free gnodes */

- u_int32_t ufsd_btot; /* total number of 1K blocks */

- u_int32_t ufsd_bfree; /* # of free 1K blocks */

- u_int32_t ufsd_bfreen; /* user consumable 1K blocks */

- u_int32_t ufsd_pgthresh; /* min size in bytes before paging*/

- int32_t ufsd_uid; /* uid that mounted me */

- int16_t ufsd_dev; /* major/minor of fs */

- int16_t ufsd_exroot; /* root mapping from exports */

- char ufsd_devname[ULTRIX_MAXPATHLEN + 4]; /* name of dev */

- char ufsd_path[ULTRIX_MAXPATHLEN + 4]; /* name of mnt point */

- u_int32_t ufsd_nupdate; /* number of writes */

- u_int32_t ufsd_pad[112]; /* pad to 2560 bytes. */

-};

-/*

- * Get statistics on mounted filesystems.

- */

-#if 0

-struct ultrix_getmnt_args {

- int32_t *start;

- struct ultrix_fs_data *buf;

- int32_t bufsize;

- int32_t mode;

- char *path;

-};

-#endif

-/*

- * Ultrix getmnt() flags.

- * The operation getmnt() should perform is incoded in the flag

- * argument. There are two independent attributes.

- *

- * ULTRIX_NOSTAT_xxx will never hang, but it may not return

- * up-to-date statistics. (For NFS clients, it returns whatever is

- * in the cache.) ULTRIX_STAT_xxx returns up-to-date info but may

- * hang (e.g., on dead NFS servers).

- *

- * ULTRIX_xxSTAT_ONE returns statistics on just one filesystem, determined

- * by the parth argument. ULTRIX_xxSTAT_MANY ignores the path argument and

- * returns info on as many filesystems fit in the structure.

- * the start argument, which should be zero on the first call,

- * can be used to iterate over all filesystems.

- *

- */

-#define ULTRIX_NOSTAT_MANY 1

-#define ULTRIX_STAT_MANY 2

-#define ULTRIX_STAT_ONE 3

-#define ULTRIX_NOSTAT_ONE 4

-/*

- * Ultrix gnode-layer filesystem codes.

- */

-#define ULTRIX_FSTYPE_UNKNOWN 0x0

-#define ULTRIX_FSTYPE_ULTRIX 0x1 /* Ultrix UFS: basically 4.2bsd FFS */

-#define ULTRIX_FSTYPE_NFS 0x5 /* NFS v2 */

-/*

- * Ultrix mount(2) options

- */

-#define ULTRIX_NM_RONLY 0x0001 /* mount read-only */

-#define ULTRIX_NM_SOFT 0x0002 /* soft mount (hard is default) */

-#define ULTRIX_NM_WSIZE 0x0004 /* set write size */

-#define ULTRIX_NM_RSIZE 0x0008 /* set read size */

-#define ULTRIX_NM_TIMEO 0x0010 /* set initial timeout */

-#define ULTRIX_NM_RETRANS 0x0020 /* set number of request retries */

-#define ULTRIX_NM_HOSTNAME 0x0040 /* set hostname for error printf */

-#define ULTRIX_NM_PGTHRESH 0x0080 /* set page threshold for exec */

-#define ULTRIX_NM_INT 0x0100 /* allow hard mount keyboard interrupts */

-#define ULTRIX_NM_NOAC 0x0200 /* don't cache attributes */

-/*

- * Construct an Ultrix getmnt() ultrix_fs_data from the native NetBSD

- * struct statfs.

- */

-static void

-make_ultrix_mntent(sp, tem)

- register struct statfs *sp;

- register struct ultrix_fs_data *tem;

- bzero(tem, sizeof (*tem));

- tem->ufsd_flags = sp->f_flags; /* XXX translate */

- tem->ufsd_mtsize = sp->f_bsize; /* XXX max transfer size */

- tem->ufsd_otsize = sp->f_iosize;

- tem->ufsd_bsize = sp->f_bsize;

- /*

- * Translate file system type. NetBSD/1.1 has f_type zero,

- * and uses an fstype string instead.

- * For now, map types not in Ultrix (kernfs, null, procfs...)

- * to UFS, since Ultrix mout will try and call mount_unknown

- * for ULTRIX_FSTYPE_UNKNOWN, but lacks a mount_unknown binary.

- */

- tem->ufsd_fstype = ULTRIX_FSTYPE_NFS;

- if (strcmp(sp->f_fstypename, "ffs") == 0)

- tem->ufsd_fstype = ULTRIX_FSTYPE_ULTRIX;

- tem->ufsd_gtot = sp->f_files; /* total "gnodes" */

- tem->ufsd_gfree = sp->f_ffree; /* free "gnodes" */

- tem->ufsd_btot = sp->f_blocks; /* total 1k blocks */

-#ifdef needsmorethought /* XXX */

- /* tem->ufsd_bfree = sp->f_bfree; */ /* free 1k blocks */

- /* tem->ufsd_bfree = sp->f_bavail; */ /* free 1k blocks */

-#endif

- tem->ufsd_bfreen = sp->f_bavail; /* blocks available to users */

- tem->ufsd_pgthresh = 0; /* not relevant */

- tem->ufsd_uid = 0; /* XXX kept where ?*/

- tem->ufsd_dev = 0; /* ?? */

- tem->ufsd_exroot = 0; /* ?? */

- strlcpy(tem->ufsd_path, sp->f_mntonname, sizeof(tem->ufsd_path));

- strlcpy(tem->ufsd_devname, sp->f_mntfromname,

- sizeof(tem->ufsd_devname));

-#if 0

- /* In NetBSD-1.1, filesystem type is unused and always 0 */

- printf("mntent: %s type %d\n", tem->ufsd_devname, tem->ufsd_fstype);

- printf("mntent: %s tot %d free %d user%d\n",

- tem->ufsd_devname, sp->f_blocks, sp->f_bfree, sp->f_bavail);

-#endif

-int

-ultrix_sys_getmnt(p, v, retval)

- struct proc *p;

- void *v;

- int *retval;

- struct ultrix_sys_getmnt_args *uap = v;

- struct mount *mp, *nmp;

- struct statfs *sp;

- struct ultrix_fs_data *sfsp;

- char *path;

- int mntflags;

- int skip;

- int start;

- long count, maxcount;

- int error = 0;

- path = NULL;

- error = 0;

- maxcount = SCARG(uap, bufsize) / sizeof(struct ultrix_fs_data);

- sfsp = SCARG(uap, buf);

- if (SCARG(uap, mode) == ULTRIX_STAT_ONE ||

- SCARG(uap, mode) == ULTRIX_STAT_MANY)

- mntflags = MNT_WAIT;

- else

- mntflags = MNT_NOWAIT;

- if (SCARG(uap, mode) == ULTRIX_STAT_ONE || SCARG(uap, mode) == ULTRIX_NOSTAT_ONE) {

- /*

- * Only get info on mountpoints that matches the path

- * provided.

- */

- path = malloc(MAXPATHLEN, M_TEMP, M_WAITOK);

- if ((error = copyinstr(SCARG(uap, path), path,

- MAXPATHLEN, NULL)) != 0)

- goto bad;

- maxcount = 1;

- } else {

- /*

- * Get info on any mountpoints, somewhat like readdir().

- * Find out how many mount list entries to skip, and skip

- * them.

- */

- if ((error = copyin((caddr_t)SCARG(uap, start), &start,

- sizeof(*SCARG(uap, start)))) != 0)

- goto bad;

- for (skip = start, mp = CIRCLEQ_FIRST(&mountlist);

- mp != CIRCLEQ_END(&mountlist) && skip-- > 0; mp = nmp)

- nmp = CIRCLEQ_NEXT(mp, mnt_list);

- }

- for (count = 0, mp = CIRCLEQ_FIRST(&mountlist);

- mp != CIRCLEQ_END(&mountlist) && count < maxcount; mp = nmp) {

- nmp = CIRCLEQ_NEXT(mp, mnt_list);

- if (sfsp != NULL) {

- struct ultrix_fs_data tem;

- sp = &mp->mnt_stat;

- /*

- * If requested, refresh the fsstat cache.

- */

- if ((mntflags & MNT_WAIT) != 0 &&

- (error = VFS_STATFS(mp, sp, p)) != 0)

- continue;

- /*

- * XXX what does this do? -- cgd

- */

- sp->f_flags = mp->mnt_flag & MNT_VISFLAGMASK;

- if (path == NULL ||

- strcmp(path, sp->f_mntonname) == 0) {

- make_ultrix_mntent(sp, &tem);

- if ((error = copyout((caddr_t)&tem, sfsp,

- sizeof(tem))) != 0)

- goto bad;

- sfsp++;

- count++;

- }

- if (sfsp != NULL && count > maxcount)

- *retval = maxcount;

- else

- *retval = count;

-bad:

- if (path)

- free(path, M_TEMP);

- return (error);

-/* Old-style inet sockaddr (no len field) as passed to Ultrix mount(2) */

-struct osockaddr_in {

- short sin_family;

- u_short sin_port;

- struct in_addr sin_addr;

- char sin_zero[8];

-};

-/*

- * fstype-dependent structure passed to Ultrix mount(2) when

- * mounting NFS filesystems

- */

-struct ultrix_nfs_args {

- struct osockaddr_in *addr; /* file server address */

- void *fh; /* file handle to be mounted */

- int flags; /* flags */

- int wsize; /* write size in bytes */

- int rsize; /* read size in bytes */

- int timeo; /* initial timeout in .1 secs */

- int retrans; /* times to retry send */

- char *hostname; /* server's hostname */

- char *optstr; /* string of nfs mount options*/

- int gfs_flags; /* gnode flags (ugh) */

- int pg_thresh; /* paging threshold ? */

-};

-/*

- * fstype-dependent structure passed to Ultrix mount(2) when

- * mounting local (4.2bsd FFS) filesystems

- */

-struct ultrix_ufs_args {

- u_long ufs_flags; /* mount flags?*/

- u_long ufs_pgthresh; /* minimum file size to page */

-};

-int

-ultrix_sys_mount(p, v, retval)

- struct proc *p;

- void *v;

- int *retval;

- struct ultrix_sys_mount_args *uap = v;

- int error;

- int otype = SCARG(uap, type);

- char fsname[MFSNAMELEN];

- char * fstype;

- struct sys_mount_args nuap;

- caddr_t sg = stackgap_init(p->p_emul);

- caddr_t usp = stackgap_alloc(&sg, 1024 /* XXX */);

- bzero(&nuap, sizeof(nuap));

- SCARG(&nuap, flags) = 0;

- /*

- * Translate Ultrix integer mount codes for UFS and NFS to

- * NetBSD fstype strings. Other Ultrix filesystem types

- * (msdos, DEC ods-2) are not supported.

- */

- if (otype == ULTRIX_FSTYPE_ULTRIX)

- fstype = "ufs";

- else if (otype == ULTRIX_FSTYPE_NFS)

- fstype = "nfs";

- else

- return (EINVAL);

- /* Translate the Ultrix mount-readonly option parameter */

- if (SCARG(uap, rdonly))

- SCARG(&nuap, flags) |= MNT_RDONLY;

- /* Copy string-ified version of mount type back out to user space */

- SCARG(&nuap, type) = (char *)usp;

- if ((error = copyout(fstype, (void *)SCARG(&nuap, type),

- strlen(fstype)+1)) != 0) {

- return (error);

- }

- usp += strlen(fstype)+1;

-#ifdef later

- parse ultrix mount option string and set NetBSD flags

-#endif

- SCARG(&nuap, path) = SCARG(uap, dir);

- if (otype == ULTRIX_FSTYPE_ULTRIX) {

- /* attempt to mount a native, rather than 4.2bsd, ffs */

- struct ufs_args ua;

- ua.fspec = SCARG(uap, special);

- bzero(&ua.export_info, sizeof(ua.export_info));

- SCARG(&nuap, data) = usp;

- if ((error = copyout(&ua, SCARG(&nuap, data),

- sizeof ua)) !=0) {

- return(error);

- }

- /*

- * Ultrix mount has no MNT_UPDATE flag.

- * Attempt to see if this is the root we're mounting,

- * and if so, set MNT_UPDATE so we can mount / read-write.

- */

- fsname[0] = 0;

- if ((error = copyinstr((caddr_t)SCARG(&nuap, path), fsname,

- sizeof fsname, (u_int *)0)) != 0)

- return(error);

- if (strcmp(fsname, "/") == 0) {

- SCARG(&nuap, flags) |= MNT_UPDATE;

- printf("COMPAT_ULTRIX: mount with MNT_UPDATE on %s\n",

- fsname);

- }

- } else if (otype == ULTRIX_FSTYPE_NFS) {

- struct ultrix_nfs_args una;

- struct nfs_args na;

- struct osockaddr_in osa;

- struct sockaddr_in *sap = (struct sockaddr_in *)& osa;

- bzero(&osa, sizeof(osa));

- bzero(&una, sizeof(una));

- if ((error = copyin(SCARG(uap, data), &una, sizeof una)) !=0) {

- return (error);

- }

- /*

- * This is the only syscall boundary the

- * address of the server passes, so do backwards

- * compatibility on 4.3style sockaddrs here.

- */

- if ((error = copyin(una.addr, &osa, sizeof osa)) != 0) {

- printf("ultrix_mount: nfs copyin osa\n");

- return (error);

- }

- sap->sin_family = (u_char)osa.sin_family;

- sap->sin_len = sizeof(*sap);

- /* allocate space above caller's stack for nfs_args */

- SCARG(&nuap, data) = usp;

- usp += sizeof (na);

- /* allocate space above caller's stack for server sockaddr */

- na.version = NFS_ARGSVERSION;

- na.addr = (struct sockaddr *)usp;

- usp += sizeof(*sap);

- na.addrlen = sap->sin_len;

- na.sotype = SOCK_DGRAM;

- na.proto = IPPROTO_UDP;

- na.fh = una.fh;

- na.fhsize = NFSX_V2FH;

- na.flags = /*una.flags;*/ NFSMNT_NOCONN;

- na.wsize = una.wsize;

- na.rsize = una.rsize;

- na.timeo = una.timeo;

- na.retrans = una.retrans;

- na.hostname = una.hostname;

- if ((error = copyout(sap, na.addr, sizeof (*sap) )) != 0)

- return (error);

- if ((error = copyout(&na, SCARG(&nuap, data), sizeof na)) != 0)

- return (error);

- }

- return (sys_mount(p, &nuap, retval));

diff --git a/sys/compat/ultrix/ultrix_ioctl.c b/sys/compat/ultrix/ultrix_ioctl.c
deleted file mode 100644
index cd719ea24e5..00000000000
--- a/sys/compat/ultrix/ultrix_ioctl.c
+++ /dev/null

@@ -1,783 +0,0 @@

-/* $OpenBSD: ultrix_ioctl.c,v 1.11 2004/09/19 21:34:43 mickey Exp $ */

-/* $NetBSD: ultrix_ioctl.c,v 1.3.4.1 1996/06/13 18:22:37 jonathan Exp $ */

-/* from : NetBSD: sunos_ioctl.c,v 1.21 1995/10/07 06:27:31 mycroft Exp */

-/*

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions

- * are met:

- * 1. Redistributions of source code must retain the above copyright

- * notice, this list of conditions and the following disclaimer.

- * 2. The name of the author may not be used to endorse or promote products

- * derived from this software without specific prior written permission

- *

- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR

- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.

- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,

- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT

- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF

- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- *

- * loosely from: Header: sunos_ioctl.c,v 1.7 93/05/28 04:40:43 torek Exp

- */

-#include <sys/param.h>

-#include <sys/proc.h>

-#include <sys/systm.h>

-#include <sys/file.h>

-#include <sys/filedesc.h>

-#include <sys/ioctl.h>

-#include <sys/termios.h>

-#include <sys/tty.h>

-#include <sys/socket.h>

-#include <sys/audioio.h>

-#include <net/if.h>

-#include <sys/mount.h>

-#include <compat/ultrix/ultrix_syscallargs.h>

-#include <sys/syscallargs.h>

-#include <compat/sunos/sunos.h>

-#include "ultrix_tty.h"

-#define emul_termio ultrix_termio

-#define emul_termios ultrix_termios

-/*

- * SunOS ioctl calls.

- * This file is something of a hodge-podge.

- * Support gets added as things turn up....

- */

-static const struct speedtab sptab[] = {

- { 0, 0 },

- { 50, 1 },

- { 75, 2 },

- { 110, 3 },

- { 134, 4 },

- { 135, 4 },

- { 150, 5 },

- { 200, 6 },

- { 300, 7 },

- { 600, 8 },

- { 1200, 9 },

- { 1800, 10 },

- { 2400, 11 },

- { 4800, 12 },

- { 9600, 13 },

- { 19200, 14 },

- { 38400, 15 },

- { -1, -1 }

-};

-static const u_long s2btab[] = {

- 0,

- 50,

- 75,

- 110,

- 134,

- 150,

- 200,

- 300,

- 600,

- 1200,

- 1800,

- 2400,

- 4800,

- 9600,

- 19200,

- 38400,

-};

-/*

- * Translate a single tty control char from the emulation value

- * to native termios, and vice-versa. Special-case

- * the value of POSIX_VDISABLE, mapping it to and from 0.

- */

-#define NATIVE_TO_EMUL_CC(bsd_cc) \

- (((bsd_cc) != _POSIX_VDISABLE) ? (bsd_cc) : 0)

-#define EMUL_TO_NATIVE_CC(emul_cc) \

- (emul_cc) ? (emul_cc) : _POSIX_VDISABLE;

-/*

- * these two conversion functions have mostly been done

- * with some perl cut&paste, then handedited to comment

- * out what doesn't exist under NetBSD.

- * A note from Markus's code:

- * (l & BITMASK1) / BITMASK1 * BITMASK2 is translated

- * optimally by gcc m68k, much better than any ?: stuff.

- * Code may vary with different architectures of course.

- *

- * I don't know what optimizer you used, but seeing divu's and

- * bfextu's in the m68k assembly output did not encourage me...

- * as well, gcc on the sparc definately generates much better

- * code with ?:.

- */

-static void

-stios2btios(st, bt)

- struct emul_termios *st;

- struct termios *bt;

- register u_long l, r;

- l = st->c_iflag;

- r = ((l & 0x00000001) ? IGNBRK : 0);

- r |= ((l & 0x00000002) ? BRKINT : 0);

- r |= ((l & 0x00000004) ? IGNPAR : 0);

- r |= ((l & 0x00000008) ? PARMRK : 0);

- r |= ((l & 0x00000010) ? INPCK : 0);

- r |= ((l & 0x00000020) ? ISTRIP : 0);

- r |= ((l & 0x00000040) ? INLCR : 0);

- r |= ((l & 0x00000080) ? IGNCR : 0);

- r |= ((l & 0x00000100) ? ICRNL : 0);

- /* ((l & 0x00000200) ? IUCLC : 0) */

- r |= ((l & 0x00000400) ? IXON : 0);

- r |= ((l & 0x00000800) ? IXANY : 0);

- r |= ((l & 0x00001000) ? IXOFF : 0);

- r |= ((l & 0x00002000) ? IMAXBEL : 0);

- bt->c_iflag = r;

- l = st->c_oflag;

- r = ((l & 0x00000001) ? OPOST : 0);

- /* ((l & 0x00000002) ? OLCUC : 0) */

- r |= ((l & 0x00000004) ? ONLCR : 0);

- /* ((l & 0x00000008) ? OCRNL : 0) */

- /* ((l & 0x00000010) ? ONOCR : 0) */

- /* ((l & 0x00000020) ? ONLRET : 0) */

- /* ((l & 0x00000040) ? OFILL : 0) */

- /* ((l & 0x00000080) ? OFDEL : 0) */

- /* ((l & 0x00000100) ? NLDLY : 0) */

- /* ((l & 0x00000100) ? NL1 : 0) */

- /* ((l & 0x00000600) ? CRDLY : 0) */

- /* ((l & 0x00000200) ? CR1 : 0) */

- /* ((l & 0x00000400) ? CR2 : 0) */

- /* ((l & 0x00000600) ? CR3 : 0) */

- /* ((l & 0x00001800) ? TABDLY : 0) */

- /* ((l & 0x00000800) ? TAB1 : 0) */

- /* ((l & 0x00001000) ? TAB2 : 0) */

- r |= ((l & 0x00001800) ? OXTABS : 0);

- /* ((l & 0x00002000) ? BSDLY : 0) */

- /* ((l & 0x00002000) ? BS1 : 0) */

- /* ((l & 0x00004000) ? VTDLY : 0) */

- /* ((l & 0x00004000) ? VT1 : 0) */

- /* ((l & 0x00008000) ? FFDLY : 0) */

- /* ((l & 0x00008000) ? FF1 : 0) */

- /* ((l & 0x00010000) ? PAGEOUT : 0) */

- /* ((l & 0x00020000) ? WRAP : 0) */

- bt->c_oflag = r;

- l = st->c_cflag;

- switch (l & 0x00000030) {

- case 0:

- r = CS5;

- break;

- case 0x00000010:

- r = CS6;

- break;

- case 0x00000020:

- r = CS7;

- break;

- case 0x00000030:

- r = CS8;

- break;

- }

- r |= ((l & 0x00000040) ? CSTOPB : 0);

- r |= ((l & 0x00000080) ? CREAD : 0);

- r |= ((l & 0x00000100) ? PARENB : 0);

- r |= ((l & 0x00000200) ? PARODD : 0);

- r |= ((l & 0x00000400) ? HUPCL : 0);

- r |= ((l & 0x00000800) ? CLOCAL : 0);

- /* ((l & 0x00001000) ? LOBLK : 0) */

- r |= ((l & 0x80000000) ? (CRTS_IFLOW|CCTS_OFLOW) : 0);

- bt->c_cflag = r;

- bt->c_ispeed = bt->c_ospeed = s2btab[l & 0x0000000f];

- l = st->c_lflag;

- r = ((l & 0x00000001) ? ISIG : 0);

- r |= ((l & 0x00000002) ? ICANON : 0);

- /* ((l & 0x00000004) ? XCASE : 0) */

- r |= ((l & 0x00000008) ? ECHO : 0);

- r |= ((l & 0x00000010) ? ECHOE : 0);

- r |= ((l & 0x00000020) ? ECHOK : 0);

- r |= ((l & 0x00000040) ? ECHONL : 0);

- r |= ((l & 0x00000080) ? NOFLSH : 0);

- r |= ((l & 0x00000100) ? TOSTOP : 0);

- r |= ((l & 0x00000200) ? ECHOCTL : 0);

- r |= ((l & 0x00000400) ? ECHOPRT : 0);

- r |= ((l & 0x00000800) ? ECHOKE : 0);

- /* ((l & 0x00001000) ? DEFECHO : 0) */

- r |= ((l & 0x00002000) ? FLUSHO : 0);

- r |= ((l & 0x00004000) ? PENDIN : 0);

- bt->c_lflag = r;

- bt->c_cc[VINTR] = EMUL_TO_NATIVE_CC(st->c_cc[0]);

- bt->c_cc[VQUIT] = EMUL_TO_NATIVE_CC(st->c_cc[1]);

- bt->c_cc[VERASE] = EMUL_TO_NATIVE_CC(st->c_cc[2]);

- bt->c_cc[VKILL] = EMUL_TO_NATIVE_CC(st->c_cc[3]);

- bt->c_cc[VEOF] = EMUL_TO_NATIVE_CC(st->c_cc[4]);

- bt->c_cc[VEOL] = EMUL_TO_NATIVE_CC(st->c_cc[5]);

- bt->c_cc[VEOL2] = EMUL_TO_NATIVE_CC(st->c_cc[6]);

- /* not present on NetBSD */

- /* bt->c_cc[VSWTCH] = EMUL_TO_NATIVE_CC(st->c_cc[7]); */

- bt->c_cc[VSTART] = EMUL_TO_NATIVE_CC(st->c_cc[10]);

- bt->c_cc[VSTOP] = EMUL_TO_NATIVE_CC(st->c_cc[11]);

- bt->c_cc[VSUSP] = EMUL_TO_NATIVE_CC(st->c_cc[12]);

- bt->c_cc[VDSUSP] = EMUL_TO_NATIVE_CC(st->c_cc[13]);

- bt->c_cc[VREPRINT] = EMUL_TO_NATIVE_CC(st->c_cc[14]);

- bt->c_cc[VDISCARD] = EMUL_TO_NATIVE_CC(st->c_cc[15]);

- bt->c_cc[VWERASE] = EMUL_TO_NATIVE_CC(st->c_cc[16]);

- bt->c_cc[VLNEXT] = EMUL_TO_NATIVE_CC(st->c_cc[17]);

- bt->c_cc[VSTATUS] = EMUL_TO_NATIVE_CC(st->c_cc[18]);

-#ifdef COMPAT_ULTRIX

- /* Ultrix termio/termios has real vmin/vtime */

- bt->c_cc[VMIN] = EMUL_TO_NATIVE_CC(st->c_cc[8]);

- bt->c_cc[VTIME] = EMUL_TO_NATIVE_CC(st->c_cc[9]);

-#else

- /* if `raw mode', create native VMIN/VTIME from SunOS VEOF/VEOL */

- bt->c_cc[VMIN] = (bt->c_lflag & ICANON) ? 1 : bt->c_cc[VEOF];

- bt->c_cc[VTIME] = (bt->c_lflag & ICANON) ? 1 : bt->c_cc[VEOL];

-#endif

-/*

- * Convert bsd termios to "sunos" emulated termios

- */

-static void

-btios2stios(bt, st)

- struct termios *bt;

- struct emul_termios *st;

- register u_long l, r;

- l = bt->c_iflag;

- r = ((l & IGNBRK) ? 0x00000001 : 0);

- r |= ((l & BRKINT) ? 0x00000002 : 0);

- r |= ((l & IGNPAR) ? 0x00000004 : 0);

- r |= ((l & PARMRK) ? 0x00000008 : 0);

- r |= ((l & INPCK) ? 0x00000010 : 0);

- r |= ((l & ISTRIP) ? 0x00000020 : 0);

- r |= ((l & INLCR) ? 0x00000040 : 0);

- r |= ((l & IGNCR) ? 0x00000080 : 0);

- r |= ((l & ICRNL) ? 0x00000100 : 0);

- /* ((l & IUCLC) ? 0x00000200 : 0) */

- r |= ((l & IXON) ? 0x00000400 : 0);

- r |= ((l & IXANY) ? 0x00000800 : 0);

- r |= ((l & IXOFF) ? 0x00001000 : 0);

- r |= ((l & IMAXBEL) ? 0x00002000 : 0);

- st->c_iflag = r;

- l = bt->c_oflag;

- r = ((l & OPOST) ? 0x00000001 : 0);

- /* ((l & OLCUC) ? 0x00000002 : 0) */

- r |= ((l & ONLCR) ? 0x00000004 : 0);

- /* ((l & OCRNL) ? 0x00000008 : 0) */

- /* ((l & ONOCR) ? 0x00000010 : 0) */

- /* ((l & ONLRET) ? 0x00000020 : 0) */

- /* ((l & OFILL) ? 0x00000040 : 0) */

- /* ((l & OFDEL) ? 0x00000080 : 0) */

- /* ((l & NLDLY) ? 0x00000100 : 0) */

- /* ((l & NL1) ? 0x00000100 : 0) */

- /* ((l & CRDLY) ? 0x00000600 : 0) */

- /* ((l & CR1) ? 0x00000200 : 0) */

- /* ((l & CR2) ? 0x00000400 : 0) */

- /* ((l & CR3) ? 0x00000600 : 0) */

- /* ((l & TABDLY) ? 0x00001800 : 0) */

- /* ((l & TAB1) ? 0x00000800 : 0) */

- /* ((l & TAB2) ? 0x00001000 : 0) */

- r |= ((l & OXTABS) ? 0x00001800 : 0);

- /* ((l & BSDLY) ? 0x00002000 : 0) */

- /* ((l & BS1) ? 0x00002000 : 0) */

- /* ((l & VTDLY) ? 0x00004000 : 0) */

- /* ((l & VT1) ? 0x00004000 : 0) */

- /* ((l & FFDLY) ? 0x00008000 : 0) */

- /* ((l & FF1) ? 0x00008000 : 0) */

- /* ((l & PAGEOUT) ? 0x00010000 : 0) */

- /* ((l & WRAP) ? 0x00020000 : 0) */

- st->c_oflag = r;

- l = bt->c_cflag;

- switch (l & CSIZE) {

- case CS5:

- r = 0;

- break;

- case CS6:

- r = 0x00000010;

- break;

- case CS7:

- r = 0x00000020;

- break;

- case CS8:

- r = 0x00000030;

- break;

- }

- r |= ((l & CSTOPB) ? 0x00000040 : 0);

- r |= ((l & CREAD) ? 0x00000080 : 0);

- r |= ((l & PARENB) ? 0x00000100 : 0);

- r |= ((l & PARODD) ? 0x00000200 : 0);

- r |= ((l & HUPCL) ? 0x00000400 : 0);

- r |= ((l & CLOCAL) ? 0x00000800 : 0);

- /* ((l & LOBLK) ? 0x00001000 : 0) */

- r |= ((l & (CRTS_IFLOW|CCTS_OFLOW)) ? 0x80000000 : 0);

- st->c_cflag = r;

- l = bt->c_lflag;

- r = ((l & ISIG) ? 0x00000001 : 0);

- r |= ((l & ICANON) ? 0x00000002 : 0);

- /* ((l & XCASE) ? 0x00000004 : 0) */

- r |= ((l & ECHO) ? 0x00000008 : 0);

- r |= ((l & ECHOE) ? 0x00000010 : 0);

- r |= ((l & ECHOK) ? 0x00000020 : 0);

- r |= ((l & ECHONL) ? 0x00000040 : 0);

- r |= ((l & NOFLSH) ? 0x00000080 : 0);

- r |= ((l & TOSTOP) ? 0x00000100 : 0);

- r |= ((l & ECHOCTL) ? 0x00000200 : 0);

- r |= ((l & ECHOPRT) ? 0x00000400 : 0);

- r |= ((l & ECHOKE) ? 0x00000800 : 0);

- /* ((l & DEFECHO) ? 0x00001000 : 0) */

- r |= ((l & FLUSHO) ? 0x00002000 : 0);

- r |= ((l & PENDIN) ? 0x00004000 : 0);

- st->c_lflag = r;

- l = ttspeedtab(bt->c_ospeed, sptab);

- if (l >= 0)

- st->c_cflag |= l;

- st->c_cc[0] = NATIVE_TO_EMUL_CC(bt->c_cc[VINTR]);

- st->c_cc[1] = NATIVE_TO_EMUL_CC(bt->c_cc[VQUIT]);

- st->c_cc[2] = NATIVE_TO_EMUL_CC(bt->c_cc[VERASE]);

- st->c_cc[3] = NATIVE_TO_EMUL_CC(bt->c_cc[VKILL]);

- st->c_cc[4] = NATIVE_TO_EMUL_CC(bt->c_cc[VEOF]);

- st->c_cc[5] = NATIVE_TO_EMUL_CC(bt->c_cc[VEOL]);

- st->c_cc[6] = NATIVE_TO_EMUL_CC(bt->c_cc[VEOL2]);

-/* XXX - the next line was an ifdef instead of an ifndef - but i still

- have to find out what to do here

-*/

-#ifndef COMPAT_ULTRIX

- st->c_cc[7] = NATIVE_TO_EMUL_CC(bt->c_cc[VSWTCH]);

-#else

- st->c_cc[7] = 0;

-#endif

- st->c_cc[10] = NATIVE_TO_EMUL_CC(bt->c_cc[VSTART]);

- st->c_cc[11] = NATIVE_TO_EMUL_CC(bt->c_cc[VSTOP]);

- st->c_cc[12]= NATIVE_TO_EMUL_CC(bt->c_cc[VSUSP]);

- st->c_cc[13]= NATIVE_TO_EMUL_CC(bt->c_cc[VDSUSP]);

- st->c_cc[14]= NATIVE_TO_EMUL_CC(bt->c_cc[VREPRINT]);

- st->c_cc[15]= NATIVE_TO_EMUL_CC(bt->c_cc[VDISCARD]);

- st->c_cc[16]= NATIVE_TO_EMUL_CC(bt->c_cc[VWERASE]);

- st->c_cc[17]= NATIVE_TO_EMUL_CC(bt->c_cc[VLNEXT]);

- st->c_cc[18]= NATIVE_TO_EMUL_CC(bt->c_cc[VSTATUS]);

-#ifdef COMPAT_ULTRIX

- st->c_cc[8]= NATIVE_TO_EMUL_CC(bt->c_cc[VMIN]);

- st->c_cc[9]= NATIVE_TO_EMUL_CC(bt->c_cc[VTIME]);

-#else

- if (!(bt->c_lflag & ICANON)) {

- /* SunOS stores VMIN/VTIME in VEOF/VEOL (if ICANON is off) */

- st->c_cc[4] = bt->c_cc[VMIN];

- st->c_cc[5] = bt->c_cc[VTIME];

- }

-#endif

-#ifdef COMPAT_SUNOS

- st->c_line = 0; /* 4.3bsd "old" line discipline */

-#else

- st->c_line = 2; /* 4.3bsd "new" line discipline */

-#endif

-#define TERMIO_NCC 10 /* ultrix termio NCC is 10 */

-/*

- * Convert emulated struct termios to termio(?)

- */

-static void

-stios2stio(ts, t)

- struct emul_termios *ts;

- struct emul_termio *t;

- t->c_iflag = ts->c_iflag;

- t->c_oflag = ts->c_oflag;

- t->c_cflag = ts->c_cflag;

- t->c_lflag = ts->c_lflag;

- t->c_line = ts->c_line;

- bcopy(ts->c_cc, t->c_cc, TERMIO_NCC);

-/*

- * Convert the other way

- */

-static void

-stio2stios(t, ts)

- struct emul_termio *t;

- struct emul_termios *ts;

- ts->c_iflag = t->c_iflag;

- ts->c_oflag = t->c_oflag;

- ts->c_cflag = t->c_cflag;

- ts->c_lflag = t->c_lflag;

- ts->c_line = t->c_line;

- bcopy(t->c_cc, ts->c_cc, TERMIO_NCC); /* don't touch the upper fields! */

-int

-ultrix_sys_ioctl(p, v, retval)

- register struct proc *p;

- void *v;

- register_t *retval;

- struct ultrix_sys_ioctl_args *uap = v;

- struct filedesc *fdp = p->p_fd;

- struct file *fp;

- register int (*ctl)();

- int error;

- if ((fp = fd_getfile(fdp, SCARG(uap, fd))) == NULL)

- return EBADF;

- FREF(fp);

- if ((fp->f_flag & (FREAD|FWRITE)) == 0) {

- error = EBADF;

- goto out;

- }

- ctl = fp->f_ops->fo_ioctl;

- switch (SCARG(uap, com)) {

- case _IOR('t', 0, int):

- SCARG(uap, com) = TIOCGETD;

- break;

- case _IOW('t', 1, int):

- {

- int disc;

- if ((error = copyin(SCARG(uap, data), (caddr_t)&disc,

- sizeof disc)) != 0)

- goto out;

- /* map SunOS NTTYDISC into our termios discipline */

- if (disc == 2)

- disc = 0;

- /* all other disciplines are not supported by NetBSD */

- if (disc) {

- error = ENXIO;

- goto out;

- }

- error = (*ctl)(fp, TIOCSETD, (caddr_t)&disc, p);

- goto out;

- }

- case _IOW('t', 101, int): /* sun SUNOS_TIOCSSOFTCAR */

- {

- int x; /* unused */

- error = copyin((caddr_t)&x, SCARG(uap, data), sizeof x);

- goto out;

- }

- case _IOR('t', 100, int): /* sun SUNOS_TIOCSSOFTCAR */

- {

- int x = 0;

- error = copyout((caddr_t)&x, SCARG(uap, data), sizeof x);

- goto out;

- }

- case _IO('t', 36): /* sun TIOCCONS, no parameters */

- {

- int on = 1;

- error = (*ctl)(fp, TIOCCONS, (caddr_t)&on, p);

- goto out;

- }

- case _IOW('t', 37, struct sunos_ttysize):

- {

- struct winsize ws;

- struct sunos_ttysize ss;

- if ((error = (*ctl)(fp, TIOCGWINSZ, (caddr_t)&ws, p)) != 0)

- goto out;

- if ((error = copyin (SCARG(uap, data), &ss, sizeof (ss))) != 0)

- goto out;

- ws.ws_row = ss.ts_row;

- ws.ws_col = ss.ts_col;

- error = ((*ctl)(fp, TIOCSWINSZ, (caddr_t)&ws, p));

- goto out;

- }

- case _IOW('t', 38, struct sunos_ttysize):

- {

- struct winsize ws;

- struct sunos_ttysize ss;

- if ((error = (*ctl)(fp, TIOCGWINSZ, (caddr_t)&ws, p)) != 0)

- goto out;

- ss.ts_row = ws.ws_row;

- ss.ts_col = ws.ws_col;

- error = copyout ((caddr_t)&ss, SCARG(uap, data), sizeof (ss));

- goto out;

- }

- case _IOW('t', 130, int):

- SCARG(uap, com) = TIOCSPGRP;

- break;

- case _IOR('t', 131, int):

- SCARG(uap, com) = TIOCGPGRP;

- break;

- case _IO('t', 132):

- SCARG(uap, com) = TIOCSCTTY;

- break;

- /* Emulate termio or termios tcget() */

- case ULTRIX_TCGETA:

- case ULTRIX_TCGETS:

- {

- struct termios bts;

- struct ultrix_termios sts;

- struct ultrix_termio st;

- if ((error = (*ctl)(fp, TIOCGETA, (caddr_t)&bts, p)) != 0)

- goto out;

- btios2stios (&bts, &sts);

- if (SCARG(uap, com) == ULTRIX_TCGETA) {

- stios2stio (&sts, &st);

- error = copyout((caddr_t)&st, SCARG(uap, data),

- sizeof (st));

- goto out;

- } else {

- error = copyout((caddr_t)&sts, SCARG(uap, data),

- sizeof (sts));

- goto out;

- }

- /*NOTREACHED*/

- }

- /* Emulate termio tcset() */

- case ULTRIX_TCSETA:

- case ULTRIX_TCSETAW:

- case ULTRIX_TCSETAF:

- {

- struct termios bts;

- struct ultrix_termios sts;

- struct ultrix_termio st;

- if ((error = copyin(SCARG(uap, data), (caddr_t)&st,

- sizeof (st))) != 0)

- goto out;

- /* get full BSD termios so we don't lose information */

- if ((error = (*ctl)(fp, TIOCGETA, (caddr_t)&bts, p)) != 0)

- goto out;

- /*

- * convert to sun termios, copy in information from

- * termio, and convert back, then set new values.

- */

- btios2stios(&bts, &sts);

- stio2stios(&st, &sts);

- stios2btios(&sts, &bts);

- /*

- * map ioctl code: ultrix tcsets are numbered in reverse order

- */

- error = (*ctl)(fp, ULTRIX_TCSETA - SCARG(uap, com) + TIOCSETA,

- (caddr_t)&bts, p);

- printf("ultrix TCSETA %lx returns %d\n",

- ULTRIX_TCSETA - SCARG(uap, com), error);

- goto out;

- }

- /* Emulate termios tcset() */

- case ULTRIX_TCSETS:

- case ULTRIX_TCSETSW:

- case ULTRIX_TCSETSF:

- {

- struct termios bts;

- struct ultrix_termios sts;

- if ((error = copyin (SCARG(uap, data), (caddr_t)&sts,

- sizeof (sts))) != 0)

- goto out;

- stios2btios (&sts, &bts);

- error = (*ctl)(fp, ULTRIX_TCSETS - SCARG(uap, com) + TIOCSETA,

- (caddr_t)&bts, p);

- goto out;

- }

-/*

- * Pseudo-tty ioctl translations.

- */

- case _IOW('t', 32, int): { /* TIOCTCNTL */

- int error, on;

- error = copyin (SCARG(uap, data), (caddr_t)&on, sizeof (on));

- if (error != 0)

- goto out;

- error = (*ctl)(fp, TIOCUCNTL, (caddr_t)&on, p);

- goto out;

- }

- case _IOW('t', 33, int): { /* TIOCSIGNAL */

- int error, sig;

- error = copyin (SCARG(uap, data), (caddr_t)&sig, sizeof (sig));

- if (error != 0)

- goto out;

- error = (*ctl)(fp, TIOCSIG, (caddr_t)&sig, p);

- goto out;

- }

-/*

- * Socket ioctl translations.

- */

-#define IN_TYPE(a, type_t) { \

- type_t localbuf; \

- if ((error = copyin (SCARG(uap, data), \

- (caddr_t)&localbuf, sizeof (type_t))) != 0) \

- goto out; \

- error = (*ctl)(fp, a, (caddr_t)&localbuf, p); \

- goto out; \

-#define INOUT_TYPE(a, type_t) { \

- type_t localbuf; \

- if ((error = copyin (SCARG(uap, data), (caddr_t)&localbuf, \

- sizeof (type_t))) != 0) \

- goto out; \

- if ((error = (*ctl)(fp, a, (caddr_t)&localbuf, p)) != 0) \

- goto out; \

- error = copyout ((caddr_t)&localbuf, SCARG(uap, data), sizeof (type_t)); \

- goto out; \

-#define IFREQ_IN(a) { \

- struct ifreq ifreq; \

- if ((error = copyin (SCARG(uap, data), (caddr_t)&ifreq, sizeof (ifreq))) != 0) \

- goto out; \

- error = (*ctl)(fp, a, (caddr_t)&ifreq, p); \

- goto out; \

-#define IFREQ_INOUT(a) { \

- struct ifreq ifreq; \

- if ((error = copyin (SCARG(uap, data), (caddr_t)&ifreq, sizeof (ifreq))) != 0) \

- goto out; \

- if ((error = (*ctl)(fp, a, (caddr_t)&ifreq, p)) != 0) \

- goto out; \

- error = copyout ((caddr_t)&ifreq, SCARG(uap, data), sizeof (ifreq)); \

- goto out; \

- case _IOW('i', 12, struct ifreq):

- /* SIOCSIFADDR */

- break;

- case _IOWR('i', 13, struct ifreq):

- IFREQ_INOUT(OSIOCGIFADDR);

- case _IOW('i', 14, struct ifreq):

- /* SIOCSIFDSTADDR */

- break;

- case _IOWR('i', 15, struct ifreq):

- IFREQ_INOUT(OSIOCGIFDSTADDR);

- case _IOW('i', 16, struct ifreq):

- /* SIOCSIFFLAGS */

- break;

- case _IOWR('i', 17, struct ifreq):

- /* SIOCGIFFLAGS */

- break;

- case _IOW('i', 21, struct ifreq):

- IFREQ_IN(SIOCSIFMTU);

- case _IOWR('i', 22, struct ifreq):

- IFREQ_INOUT(SIOCGIFMTU);

- case _IOWR('i', 23, struct ifreq):

- IFREQ_INOUT(SIOCGIFBRDADDR);

- case _IOW('i', 24, struct ifreq):

- IFREQ_IN(SIOCSIFBRDADDR);

- case _IOWR('i', 25, struct ifreq):

- IFREQ_INOUT(OSIOCGIFNETMASK);

- case _IOW('i', 26, struct ifreq):

- IFREQ_IN(SIOCSIFNETMASK);

- case _IOWR('i', 27, struct ifreq):

- IFREQ_INOUT(SIOCGIFMETRIC);

- case _IOWR('i', 28, struct ifreq):

- IFREQ_IN(SIOCSIFMETRIC);

- case _IOW('i', 30, struct arpreq):

- /* SIOCSARP */

- break;

- case _IOWR('i', 31, struct arpreq):

- /* SIOCGARP */

- break;

- case _IOW('i', 32, struct arpreq):

- /* SIOCDARP */

- break;

- case _IOW('i', 18, struct ifreq): /* SIOCSIFMEM */

- case _IOWR('i', 19, struct ifreq): /* SIOCGIFMEM */

- case _IOW('i', 40, struct ifreq): /* SIOCUPPER */

- case _IOW('i', 41, struct ifreq): /* SIOCLOWER */

- case _IOW('i', 44, struct ifreq): /* SIOCSETSYNC */

- case _IOWR('i', 45, struct ifreq): /* SIOCGETSYNC */

- case _IOWR('i', 46, struct ifreq): /* SIOCSDSTATS */

- case _IOWR('i', 47, struct ifreq): /* SIOCSESTATS */

- case _IOW('i', 48, int): /* SIOCSPROMISC */

- case _IOW('i', 49, struct ifreq): /* SIOCADDMULTI */

- case _IOW('i', 50, struct ifreq): /* SIOCDELMULTI */

- error = EOPNOTSUPP;

- goto out;

- case _IOWR('i', 20, struct ifconf): /* SIOCGIFCONF */

- {

- struct ifconf ifconf;

- /*

- * XXX: two more problems

- * 1. our sockaddr's are variable length, not always sizeof(sockaddr)

- * 2. this returns a name per protocol, ie. it returns two "lo0"'s

- */

- if ((error = copyin (SCARG(uap, data), (caddr_t)&ifconf,

- sizeof (ifconf))) != 0)

- goto out;

- if ((error = (*ctl)(fp, OSIOCGIFCONF,

- * (caddr_t)&ifconf, p)) !=0 )

- goto out;

- error = copyout ((caddr_t)&ifconf, SCARG(uap, data),

- sizeof (ifconf));

- goto out;

- }

- error = (sys_ioctl(p, uap, retval));

-out:

- FRELE(fp);

- return (error);

diff --git a/sys/compat/ultrix/ultrix_misc.c b/sys/compat/ultrix/ultrix_misc.c
deleted file mode 100644
index ae56326ac42..00000000000
--- a/sys/compat/ultrix/ultrix_misc.c
+++ /dev/null

@@ -1,600 +0,0 @@

-/* $OpenBSD: ultrix_misc.c,v 1.31 2009/03/05 19:52:24 kettenis Exp $ */

-/* $NetBSD: ultrix_misc.c,v 1.23 1996/04/07 17:23:04 jonathan Exp $ */

-/*

- * Jonathan Stone (hereinafter referred to as the author)

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions

- * are met:

- * 1. Redistributions of source code must retain the above copyright

- * notice, this list of conditions and the following disclaimer.

- * 2. Redistributions in binary form must reproduce the above copyright

- * notice, this list of conditions and the following disclaimer in the

- * documentation and/or other materials provided with the distribution.

- * 3. The name of the author may not be used to endorse or promote products

- * derived from this software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND

- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE

- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS

- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT

- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY

- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF

- * SUCH DAMAGE.

- */

-/*

- *

- * This software was developed by the Computer Systems Engineering group

- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and

- * contributed to Berkeley.

- *

- * All advertising materials mentioning features or use of this software

- * must display the following acknowledgement:

- * This product includes software developed by the University of

- * California, Lawrence Berkeley Laboratory.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions

- * are met:

- * 1. Redistributions of source code must retain the above copyright

- * notice, this list of conditions and the following disclaimer.

- * 2. Redistributions in binary form must reproduce the above copyright

- * notice, this list of conditions and the following disclaimer in the

- * documentation and/or other materials provided with the distribution.

- * 3. Neither the name of the University nor the names of its contributors

- * may be used to endorse or promote products derived from this software

- * without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND

- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE

- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS

- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT

- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY

- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF

- * SUCH DAMAGE.

- *

- * @(#)sun_misc.c 8.1 (Berkeley) 6/18/93

- *

- * from: Header: sun_misc.c,v 1.16 93/04/07 02:46:27 torek Exp

- */

-/*

- * SunOS compatibility module.

- *

- * SunOS system calls that are implemented differently in BSD are

- * handled here.

- */

-#include <sys/param.h>

-#include <sys/systm.h>

-#include <sys/namei.h>

-#include <sys/dirent.h>

-#include <sys/proc.h>

-#include <sys/file.h>

-#include <sys/filedesc.h>

-/*#include <sys/stat.h>*/

-/*#include <sys/ioctl.h>*/

-#include <sys/kernel.h>

-#include <sys/core.h>

-#include <sys/exec.h>

-#include <sys/malloc.h>

-#include <sys/mbuf.h>

-#include <sys/mman.h>

-#include <sys/mount.h>

-#include <sys/resource.h>

-#include <sys/resourcevar.h>

-#include <sys/signal.h>

-#include <sys/signalvar.h>

-#include <sys/socket.h>

-#include <sys/vnode.h>

-#include <sys/uio.h>

-#include <sys/wait.h>

-#include <sys/utsname.h>

-#include <sys/unistd.h>

-#include <sys/syscallargs.h>

-#include <compat/ultrix/ultrix_syscall.h>

-#include <compat/ultrix/ultrix_syscallargs.h>

-#include <compat/ultrix/ultrix_util.h>

-#include <netinet/in.h>

-#include <miscfs/specfs/specdev.h>

-#include <nfs/rpcv2.h>

-#include <nfs/nfsproto.h>

-#include <nfs/nfs.h>

-#include <uvm/uvm_extern.h>

-#include <sys/conf.h> /* iszerodev() */

-#include <sys/socketvar.h> /* sosetopt() */

-extern struct sysent ultrix_sysent[];

-#ifdef SYSCALL_DEBUG

-extern char *ultrix_syscallnames[];

-#endif

-/*

- * Select the appropriate setregs callback for the target architecture.

- */

-#ifdef __mips__

-#define ULTRIX_EXEC_SETREGS cpu_exec_ecoff_setregs

-#endif /* __mips__ */

-#ifdef __vax__

-#define ULTRIX_EXEC_SETREGS setregs

-#endif /* __vax__ */

-extern void ULTRIX_EXEC_SETREGS(struct proc *, struct exec_package *,

- u_long, register_t *);

-extern char sigcode[], esigcode[];

-struct emul emul_ultrix = {

- "ultrix",

- NULL,

- sendsig,

- ULTRIX_SYS_syscall,

- ULTRIX_SYS_MAXSYSCALL,

- ultrix_sysent,

-#ifdef SYSCALL_DEBUG

- ultrix_syscallnames,

-#else

- NULL,

-#endif

- 0,

- copyargs,

- ULTRIX_EXEC_SETREGS,

- NULL,

- coredump_trad,

- sigcode,

- esigcode,

-};

-#define GSI_PROG_ENV 1

-int

-ultrix_sys_getsysinfo(p, v, retval)

- struct proc *p;

- void *v;

- register_t *retval;

- struct ultrix_sys_getsysinfo_args *uap = v;

- static short progenv = 0;

- switch (SCARG(uap, op)) {

- /* operations implemented: */

- case GSI_PROG_ENV:

- if (SCARG(uap, nbytes) < sizeof(short))

- return EINVAL;

- *retval = 1;

- return (copyout(&progenv, SCARG(uap, buffer), sizeof(short)));

- default:

- *retval = 0; /* info unavail */

- return 0;

- }

-int

-ultrix_sys_setsysinfo(p, v, retval)

- struct proc *p;

- void *v;

- register_t *retval;

-#ifdef notyet

- struct ultrix_sys_setsysinfo_args *uap = v;

-#endif

- *retval = 0;

- return 0;

-int

-ultrix_sys_waitpid(p, v, retval)

- struct proc *p;

- void *v;

- register_t *retval;

- struct ultrix_sys_waitpid_args *uap = v;

- struct sys_wait4_args ua;

- SCARG(&ua, pid) = SCARG(uap, pid);

- SCARG(&ua, status) = SCARG(uap, status);

- SCARG(&ua, options) = SCARG(uap, options);

- SCARG(&ua, rusage) = 0;

- return (sys_wait4(p, &ua, retval));

-int

-ultrix_sys_wait3(p, v, retval)

- struct proc *p;

- void *v;

- register_t *retval;

- struct ultrix_sys_wait3_args *uap = v;

- struct sys_wait4_args ua;

- SCARG(&ua, pid) = -1;

- SCARG(&ua, status) = SCARG(uap, status);

- SCARG(&ua, options) = SCARG(uap, options);

- SCARG(&ua, rusage) = SCARG(uap, rusage);

- return (sys_wait4(p, &ua, retval));

-/*

- * Ultrix binaries pass in FD_MAX as the first arg to select().

- * On Ultrix, FD_MAX is 4096, which is more than the NetBSD sys_select()

- * can handle.

- * Since we can't have more than the (native) FD_MAX descriptors open,

- * limit nfds to at most FD_MAX.

- */

-int

-ultrix_sys_select(p, v, retval)

- struct proc *p;

- void *v;

- register_t *retval;

- struct sys_select_args *uap = v;

- struct timeval atv;

- int error;

- /* Limit number of FDs selected on to the native maximum */

- if (SCARG(uap, nd) > FD_SETSIZE)

- SCARG(uap, nd) = FD_SETSIZE;

- /* Check for negative timeval */

- if (SCARG(uap, tv)) {

- error = copyin((caddr_t)SCARG(uap, tv), (caddr_t)&atv,

- sizeof(atv));

- if (error)

- goto done;

-#ifdef DEBUG

- /* Ultrix clients sometimes give negative timeouts? */

- if (atv.tv_sec < 0 || atv.tv_usec < 0)

- printf("ultrix select( %ld, %ld): negative timeout\n",

- atv.tv_sec, atv.tv_usec);

- /*tvp = (timeval *)STACKGAPBASE;*/

-#endif

- }

- error = sys_select(p, (void *) uap, retval);

- if (error == EINVAL)

- printf("ultrix select: bad args?\n");

-done:

- return error;

-#if defined(NFSCLIENT)

-int

-async_daemon(p, v, retval)

- struct proc *p;

- void *v;

- register_t *retval;

- struct sys_nfssvc_args ouap;

- SCARG(&ouap, flag) = NFSSVC_BIOD;

- SCARG(&ouap, argp) = NULL;

- return (sys_nfssvc(p, &ouap, retval));

-#endif /* NFSCLIENT */

-#define SUN__MAP_NEW 0x80000000 /* if not, old mmap & cannot handle */

-int

-ultrix_sys_mmap(p, v, retval)

- struct proc *p;

- void *v;

- register_t *retval;

- struct ultrix_sys_mmap_args *uap = v;

- struct sys_mmap_args ouap;

- /*

- * Verify the arguments.

- */

- if (SCARG(uap, prot) & ~(PROT_READ|PROT_WRITE|PROT_EXEC))

- return (EINVAL); /* XXX still needed? */

- if ((SCARG(uap, flags) & SUN__MAP_NEW) == 0)

- return (EINVAL);

- SCARG(&ouap, flags) = SCARG(uap, flags) & ~SUN__MAP_NEW;

- SCARG(&ouap, addr) = SCARG(uap, addr);

- if ((SCARG(&ouap, flags) & MAP_FIXED) == 0 &&

- SCARG(&ouap, addr) != 0 &&

- SCARG(&ouap, addr) < (void *)round_page((vaddr_t)p->p_vmspace->vm_daddr+MAXDSIZ))

- SCARG(&ouap, addr) = (void *)round_page((vaddr_t)p->p_vmspace->vm_daddr+MAXDSIZ);

- SCARG(&ouap, len) = SCARG(uap, len);

- SCARG(&ouap, prot) = SCARG(uap, prot);

- SCARG(&ouap, fd) = SCARG(uap, fd);

- SCARG(&ouap, pos) = SCARG(uap, pos);

- return (sys_mmap(p, &ouap, retval));

-int

-ultrix_sys_setsockopt(p, v, retval)

- struct proc *p;

- void *v;

- register_t *retval;

- register struct ultrix_sys_setsockopt_args *uap = v;

- struct file *fp;

- struct mbuf *m = NULL;

- int error;

- if ((error = getsock(p->p_fd, SCARG(uap, s), &fp)) != 0)

- return (error);

-#define SO_DONTLINGER (~SO_LINGER)

- if (SCARG(uap, name) == SO_DONTLINGER) {

- m = m_get(M_WAIT, MT_SOOPTS);

- mtod(m, struct linger *)->l_onoff = 0;

- m->m_len = sizeof(struct linger);

- error = (sosetopt((struct socket *)fp->f_data, SCARG(uap, level),

- SO_LINGER, m));

- goto bad;

- }

- if (SCARG(uap, valsize) > MLEN) {

- error = EINVAL;

- goto bad;

- }

- if (SCARG(uap, val)) {

- m = m_get(M_WAIT, MT_SOOPTS);

- if ((error = copyin(SCARG(uap, val), mtod(m, caddr_t),

- (u_int)SCARG(uap, valsize))) != 0) {

- (void) m_free(m);

- goto bad;

- }

- m->m_len = SCARG(uap, valsize);

- }

- error = (sosetopt((struct socket *)fp->f_data, SCARG(uap, level),

- SCARG(uap, name), m));

-bad:

- FRELE(fp);

- return (error);

-struct ultrix_utsname {

- char sysname[9];

- char nodename[9];

- char nodeext[65-9];

- char release[9];

- char version[9];

- char machine[9];

-};

-int

-ultrix_sys_uname(p, v, retval)

- struct proc *p;

- void *v;

- register_t *retval;

- struct ultrix_sys_uname_args *uap = v;

- struct ultrix_utsname sut;

- extern char machine[];

- bzero(&sut, sizeof(sut));

- bcopy(ostype, sut.sysname, sizeof(sut.sysname) - 1);

- bcopy(hostname, sut.nodename, sizeof(sut.nodename));

- sut.nodename[sizeof(sut.nodename)-1] = '\0';

- bcopy(osrelease, sut.release, sizeof(sut.release) - 1);

- bcopy("1", sut.version, sizeof(sut.version) - 1);

- bcopy(machine, sut.machine, sizeof(sut.machine) - 1);

- return copyout((caddr_t)&sut, (caddr_t)SCARG(uap, name),

- sizeof(struct ultrix_utsname));

-int

-ultrix_sys_setpgrp(p, v, retval)

- struct proc *p;

- void *v;

- register_t *retval;

- struct ultrix_sys_setpgrp_args *uap = v;

- /*

- * difference to our setpgid call is to include backwards

- * compatibility to pre-setsid() binaries. Do setsid()

- * instead of setpgid() in those cases where the process

- * tries to create a new session the old way.

- */

- if (!SCARG(uap, pgid) &&

- (!SCARG(uap, pid) || SCARG(uap, pid) == p->p_pid))

- return sys_setsid(p, uap, retval);

- else

- return sys_setpgid(p, uap, retval);

-#if defined (NFSSERVER)

-int

-ultrix_sys_nfssvc(p, v, retval)

- struct proc *p;

- void *v;

- register_t *retval;

-#if 0 /* XXX */

- struct ultrix_sys_nfssvc_args *uap = v;

- struct emul *e = p->p_emul;

- struct sys_nfssvc_args outuap;

- struct sockaddr sa;

- int error;

- bzero(&outuap, sizeof outuap);

- SCARG(&outuap, fd) = SCARG(uap, fd);

- SCARG(&outuap, mskval) = STACKGAPBASE;

- SCARG(&outuap, msklen) = sizeof sa;

- SCARG(&outuap, mtchval) = outuap.mskval + sizeof sa;

- SCARG(&outuap, mtchlen) = sizeof sa;

- bzero(&sa, sizeof sa);

- if (error = copyout(&sa, SCARG(&outuap, mskval), SCARG(&outuap, msklen)))

- return (error);

- if (error = copyout(&sa, SCARG(&outuap, mtchval), SCARG(&outuap, mtchlen)))

- return (error);

- return nfssvc(p, &outuap, retval);

-#else

- return (ENOSYS);

-#endif

-#endif /* NFSSERVER */

-struct ultrix_ustat {

- int32_t f_tfree; /* total free */

- ino_t f_tinode; /* total inodes free */

- char f_fname[6]; /* filsys name */

- char f_fpack[6]; /* filsys pack name */

-};

-int

-ultrix_sys_ustat(p, v, retval)

- struct proc *p;

- void *v;

- register_t *retval;

- struct ultrix_sys_ustat_args *uap = v;

- struct ultrix_ustat us;

- int error;

- bzero(&us, sizeof us);

- /*

- * XXX: should set f_tfree and f_tinode at least

- * How do we translate dev -> fstat? (and then to ultrix_ustat)

- */

- if ((error = copyout(&us, SCARG(uap, buf), sizeof us)) != 0)

- return (error);

- return 0;

-int

-ultrix_sys_quotactl(p, v, retval)

- struct proc *p;

- void *v;

- register_t *retval;

-#ifdef notyet

- struct ultrix_sys_quotactl_args *uap = v;

-#endif

- return EINVAL;

-int

-ultrix_sys_vhangup(p, v, retval)

- struct proc *p;

- void *v;

- register_t *retval;

- return 0;

-int

-ultrix_sys_exportfs(p, v, retval)

- struct proc *p;

- void *v;

- register_t *retval;

-#ifdef notyet

- struct ultrix_sys_exportfs_args *uap = v;

-#endif

- /*

- * XXX: should perhaps translate into a mount(2)

- * with MOUNT_EXPORT?

- */

- return 0;

-int

-ultrix_sys_sigpending(p, v, retval)

- struct proc *p;

- void *v;

- register_t *retval;

- struct ultrix_sys_sigpending_args *uap = v;

- int mask = p->p_siglist & p->p_sigmask;

- return (copyout((caddr_t)&mask, (caddr_t)SCARG(uap, mask), sizeof(int)));

-int

-ultrix_sys_sigcleanup(p, v, retval)

- struct proc *p;

- void *v;

- register_t *retval;

- struct ultrix_sys_sigcleanup_args *uap = v;

- return sys_sigreturn(p, (struct sys_sigreturn_args *)uap, retval);

-int

-ultrix_sys_sigreturn(p, v, retval)

- struct proc *p;

- void *v;

- register_t *retval;

- struct ultrix_sys_sigcleanup_args *uap = v;

-#ifdef DEBUG

- printf("ultrix sigreturn\n");

-#endif

- return sys_sigreturn(p, (struct sys_sigreturn_args *)uap, retval);

-int

-ultrix_sys_execve(p, v, retval)

- struct proc *p;

- void *v;

- register_t *retval;

- struct ultrix_sys_execve_args /* {

- syscallarg(char *) path;

- syscallarg(char **) argv;

- syscallarg(char **) envp;

- } */ *uap = v;

- struct sys_execve_args ap;

- caddr_t sg;

- sg = stackgap_init(p->p_emul);

- ULTRIX_CHECK_ALT_EXIST(p, &sg, SCARG(uap, path));

- SCARG(&ap, path) = SCARG(uap, path);

- SCARG(&ap, argp) = SCARG(uap, argp);

- SCARG(&ap, envp) = SCARG(uap, envp);

- return (sys_execve(p, &ap, retval));

diff --git a/sys/compat/ultrix/ultrix_pathname.c b/sys/compat/ultrix/ultrix_pathname.c
deleted file mode 100644
index 6ccc140f129..00000000000
--- a/sys/compat/ultrix/ultrix_pathname.c
+++ /dev/null

@@ -1,309 +0,0 @@

-/* $OpenBSD: ultrix_pathname.c,v 1.9 2003/06/02 23:28:01 millert Exp $ */

-/* $NetBSD: ultrix_pathname.c,v 1.2 1996/04/07 17:23:07 jonathan Exp $ */