From: mickey Date: Sun, 16 Feb 1997 14:51:58 +0000 (+0000) Subject: test/debug device, readdir->Makefile X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=04b8b51f85114b416791b0fc66966e4f69108084;p=openbsd test/debug device, readdir->Makefile --- diff --git a/sys/lib/libsa/Makefile b/sys/lib/libsa/Makefile index 0c796eca8d9..577abb73982 100644 --- a/sys/lib/libsa/Makefile +++ b/sys/lib/libsa/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 1997/02/06 22:57:03 downsj Exp $ +# $OpenBSD: Makefile,v 1.15 1997/02/16 14:52:00 mickey Exp $ # $NetBSD: Makefile,v 1.13 1996/10/02 16:19:51 ws Exp $ LIB= sa @@ -35,7 +35,10 @@ SRCS+= divdi3.c qdivrem.c # io routines 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 + 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 new file mode 100644 index 00000000000..a74e16428f7 --- /dev/null +++ b/sys/lib/libsa/unixdev.c @@ -0,0 +1,179 @@ +/* $OpenBSD: unixdev.c,v 1.1 1997/02/16 14:51:58 mickey 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. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by Michael Shalayeff. + * 4. 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 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 +#include +#include +#include +#define open uopen +#include +#undef open +#include "libsa.h" +#include "unixdev.h" + +int +unixstrategy(devdata, rw, blk, size, buf, rsize) + void *devdata; + int rw; + daddr_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, ...) +{ + register int fd; + register va_list ap; + register char **file, *p = NULL; + + 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(f) + struct open_file *f; +{ + return uclose((int)f->f_devdata); +} + +int +unixioctl(f, cmd, data) + struct open_file *f; + u_long cmd; + void *data; +{ + return uioctl((int)f->f_devdata, cmd, data); +} + +off_t +ulseek( fd, off, wh) + int fd; + off_t off; + int wh; +{ + /* XXX zecond zero is unclear to me, but it works */ + return syscall((quad_t)SYS_lseek, fd, 0, off, 0, wh); +} + + +int +unix_probe() +{ + return 1; +} + +void +unix_putc(c) + int c; +{ + uwrite(1, &c, 1); +} + +int +unix_getc() +{ + int c; + return uread(0, &c, 1)<1? -1: c; +} + +int +unix_ischar() +{ + return 0; +} + +void +usleep(n) + u_int n; +{ + +} + +time_t +getsecs() +{ + return 1; +} + +void +atexit() +{ + +} + +void +__main() +{ +} diff --git a/sys/lib/libsa/unixdev.h b/sys/lib/libsa/unixdev.h new file mode 100644 index 00000000000..86bf0587e7e --- /dev/null +++ b/sys/lib/libsa/unixdev.h @@ -0,0 +1,55 @@ +/* $OpenBSD: unixdev.h,v 1.1 1997/02/16 14:51:59 mickey 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. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by Michael Shalayeff. + * 4. 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 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 __P((void *, int, daddr_t, size_t, void *, size_t *)); +int unixopen __P((struct open_file *, ...)); +int unixclose __P((struct open_file *)); +int unixioctl __P((struct open_file *, u_long, void *)); +off_t ulseek __P((int, off_t, int)); + +int unix_probe __P((void)); +int unix_getc __P((void)); +void unix_putc __P((int)); +int unix_ischar __P((void)); + +/* unixsys.S */ +int uopen __P((const char *, int, ...)); +int uread __P((int, void *, size_t)); +int uwrite __P((int, void *, size_t)); +int uioctl __P((int, u_long, char *)); +int uclose __P((int)); +void uexit __P((int)); +int syscall __P((int, ...));