Remove orphaned files.

3 files changed, 1 insertions, 239 deletions

diff --git a/sys/lib/libsa/Makefile b/sys/lib/libsa/Makefile
index 4f84076267c..0324e76765f 100644
--- a/sys/lib/libsa/Makefile
+++ b/sys/lib/libsa/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.26 2014/11/19 20:01:33 miod Exp $
+#	$OpenBSD: Makefile,v 1.27 2015/09/18 13:42:31 miod Exp $
 #	$NetBSD: Makefile,v 1.13 1996/10/02 16:19:51 ws Exp $
 
 LIB=	sa
@@ -36,9 +36,6 @@ SRCS+=	divdi3.c qdivrem.c
 SRCS+=	close.c closeall.c dev.c disklabel.c dkcksum.c cons.c ioctl.c \
 	lseek.c open.c nullfs.c read.c stat.c fstat.c write.c readdir.c
 
-# unix device
-# SRCS+=	unixdev.c
-
 # boot filesystems
 SRCS+=	ufs.c cd9660.c
 
diff --git a/sys/lib/libsa/unixdev.c b/sys/lib/libsa/unixdev.c
deleted file mode 100644
index 6dc6a828dd6..00000000000
--- a/sys/lib/libsa/unixdev.c
+++ /dev/null
@@ -1,183 +0,0 @@
-/*	$OpenBSD: unixdev.c,v 1.9 2011/03/13 00:13:53 deraadt Exp $	*/
-
-/*
- * Copyright (c) 1996-1998 Michael Shalayeff
- * All rights reserved.
- *
- * 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.
- *
- * 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 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.
- *
- */
-
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/syscall.h>
-#define open uopen
-#include <sys/fcntl.h>
-#include <dev/cons.h>
-#undef open
-#include "libsa.h"
-#include <lib/libsa/unixdev.h>
-
-int
-unixstrategy(void *devdata, int rw, daddr32_t blk, size_t size, void *buf,
-    size_t *rsize)
-{
-	int	rc = 0;
-
-#ifdef	UNIX_DEBUG
-	printf("unixstrategy: %s %d bytes @ %d\n",
-	    (rw==F_READ?"reading":"writing"), size, blk);
-#endif
-	if ((rc = ulseek((int)devdata, blk * DEV_BSIZE, 0)) >= 0)
-		rc = (rw==F_READ) ? uread((int)devdata, buf, size) :
-		    uwrite((int)devdata, buf, size);
-
-	if (rc >= 0) {
-		*rsize = (size_t)rc;
-		rc = 0;
-	} else
-		rc = errno;
-
-	return rc;
-}
-
-int
-unixopen(struct open_file *f, ...)
-{
-	char **file, *p = NULL;
-	va_list ap;
-	int fd;
-
-	va_start(ap, f);
-	file = va_arg(ap, char **);
-	va_end(ap);
-
-#ifdef	UNIX_DEBUG
-	printf("unixopen: %s\n", *file);
-#endif
-
-	if (strncmp("/dev/", *file, 5) == 0) {
-		/* p = strchr(p + 5, '/') */
-		for (p = *file + 5; *p != '\0' && *p != '/'; p++)
-			;
-		if (*p == '/')
-			*p = '\0';
-	}
-
-	f->f_devdata = (void *)(fd = uopen(*file, O_RDWR, 0));
-
-	*file = p;
-	if (p != NULL)
-		*p = '/';
-
-	return fd < 0 ? -1 : 0;
-}
-
-int
-unixclose(struct open_file *f)
-{
-	return uclose((int)f->f_devdata);
-}
-
-int
-unixioctl(struct open_file *f, u_long cmd, void *data)
-{
-	return uioctl((int)f->f_devdata, cmd, data);
-}
-
-off_t
-ulseek(int fd, off_t off, int wh)
-{
-	return __syscall((quad_t)SYS_lseek, fd, 0, off, wh);
-}
-
-
-void
-unix_probe(struct consdev *cn)
-{
-	cn->cn_pri = CN_MIDPRI;
-	cn->cn_dev = makedev(0,0);
-	printf("ux%d ", minor(cn->cn_dev));
-}
-
-void
-unix_init(struct consdev *cn)
-{
-}
-
-void
-unix_putc(dev_t dev, int c)
-{
-	uwrite(1, &c, 1);
-}
-
-int
-unix_getc(dev_t dev)
-{
-	if (dev & 0x80) {
-		struct timeval tv;
-		fd_set fdset;
-		int rc;
-
-		tv.tv_sec = 0;
-		tv.tv_usec = 100000;
-		FD_ZERO(&fdset);
-		FD_SET(0, &fdset);
-
-		if ((rc = syscall(SYS_select, 1, &fdset, NULL, NULL, &tv)) <= 0)
-			return 0;
-		else
-			return 1;
-	} else {
-		char c;
-
-		return uread(0, &c, 1)<1? -1: c;
-	}
-}
-
-time_t
-getsecs(void)
-{
-	return 1;
-}
-
-void
-time_print(void)
-{
-}
-
-void
-atexit(void)
-{
-}
-
-int
-cnspeed(dev_t dev, int sp)
-{
-	return 9600;
-}
-
-void
-__main(void)
-{
-}
diff --git a/sys/lib/libsa/unixdev.h b/sys/lib/libsa/unixdev.h
deleted file mode 100644
index c7bc5e56297..00000000000
--- a/sys/lib/libsa/unixdev.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*	$OpenBSD: unixdev.h,v 1.7 2011/03/13 00:13:53 deraadt Exp $	*/
-
-/*
- * Copyright (c) 1996 Michael Shalayeff
- * All rights reserved.
- *
- * 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.
- *
- * 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 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.
- *
- */
-
-
-/* unixdev.c */
-int unixstrategy(void *, int, daddr32_t, size_t, void *, size_t *);
-int unixopen(struct open_file *, ...);
-int unixclose(struct open_file *);
-int unixioctl(struct open_file *, u_long, void *);
-
-void unix_probe(struct consdev *);
-void unix_init(struct consdev *);
-int unix_getc(dev_t);
-void unix_putc(dev_t, int);
-int unix_ischar(dev_t);
-
-/* unixsys.S */
-int uopen(const char *, int, ...);
-int uread(int, void *, size_t);
-int uwrite(int, void *, size_t);
-int uioctl(int, u_long, char *);
-int uclose(int);
-off_t ulseek(int, off_t, int);
-void uexit(int) __attribute__((noreturn));
-int syscall(int, ...);
-int __syscall(quad_t, ...);