summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchuck <chuck@cvs.openbsd.org>1996-05-16 02:39:39 +0000
committerchuck <chuck@cvs.openbsd.org>1996-05-16 02:39:39 +0000
commitd99153999e628882701792af823b9a81745606b5 (patch)
tree4e84ce4e3ce72ab263d97275afa3a1e659f62055
parent53fb681a805855622096f20f0bf8098ef2756a92 (diff)
bugdev moved to libsa
filesystem merged with conf.c
-rw-r--r--sys/arch/mvme68k/stand/bootsd/bugdev.c244
-rw-r--r--sys/arch/mvme68k/stand/bootsd/filesystem.c42
2 files changed, 0 insertions, 286 deletions
diff --git a/sys/arch/mvme68k/stand/bootsd/bugdev.c b/sys/arch/mvme68k/stand/bootsd/bugdev.c
deleted file mode 100644
index b351549703f..00000000000
--- a/sys/arch/mvme68k/stand/bootsd/bugdev.c
+++ /dev/null
@@ -1,244 +0,0 @@
-/* $OpenBSD: bugdev.c,v 1.5 1996/04/28 10:48:18 deraadt Exp $ */
-
-/*
- * Copyright (c) 1993 Paul Kranenburg
- * 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 Paul Kranenburg.
- * 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 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/disklabel.h>
-#include <machine/prom.h>
-#include "stand.h"
-
-int bugscopen __P((struct open_file *, ...));
-int bugscclose __P((struct open_file *));
-int bugscioctl __P((struct open_file *, u_long, void *));
-int bugscstrategy __P((void *, int, daddr_t, size_t, void *, size_t *));
-
-void cputobsdlabel __P((struct disklabel *lp, struct cpu_disklabel *clp));
-
-struct devsw devsw[] = {
- { "bugsc", bugscstrategy, bugscopen, bugscclose, bugscioctl },
-};
-int ndevs = (sizeof(devsw)/sizeof(devsw[0]));
-
-extern struct mvmeprom_args bugargs;
-int errno;
-
-struct bugsc_softc {
- int fd; /* Prom file descriptor */
- int poff; /* Partition offset */
- int psize; /* Partition size */
- short ctrl;
- short dev;
-} bugsc_softc[1];
-
-int
-devopen(f, fname, file)
- struct open_file *f;
- const char *fname;
- char **file;
-{
- register struct bugsc_softc *pp = &bugsc_softc[0];
- int error, i, dn = 0, pn = 0;
- char *dev, *cp;
- static char iobuf[MAXBSIZE];
- struct disklabel sdlabel;
-
- dev = bugargs.arg_start;
-
- /*
- * Extract partition # from boot device string.
- */
- for (cp = dev; *cp; cp++) /* void */;
- while (*cp != '/' && cp > dev) {
- if (*cp == ':')
- pn = *(cp+1) - 'a';
- --cp;
- }
-
- pp->fd = bugscopen(f);
-
- if (pp->fd < 0) {
- printf("Can't open device `%s'\n", dev);
- return (ENXIO);
- }
- error = bugscstrategy(pp, F_READ, LABELSECTOR, DEV_BSIZE, iobuf, &i);
- if (error)
- return (error);
- if (i != DEV_BSIZE)
- return (EINVAL);
-
- cputobsdlabel(&sdlabel, (struct cpu_disklabel *)iobuf);
- pp->poff = sdlabel.d_partitions[pn].p_offset;
- pp->psize = sdlabel.d_partitions[pn].p_size;
-
- f->f_dev = devsw;
- f->f_devdata = (void *)pp;
- *file = (char *)fname;
- return (0);
-}
-
-/* silly block scale factor */
-#define BUG_BLOCK_SIZE 256
-#define BUG_SCALE (512/BUG_BLOCK_SIZE)
-int
-bugscstrategy(devdata, func, dblk, size, buf, rsize)
- void *devdata;
- int func;
- daddr_t dblk;
- size_t size;
- void *buf;
- size_t *rsize;
-{
- struct mvmeprom_dskio dio;
- register struct bugsc_softc *pp = (struct bugsc_softc *)devdata;
- daddr_t blk = dblk + pp->poff;
-
- twiddle();
-
- dio.ctrl_lun = pp->ctrl;
- dio.dev_lun = pp->dev;
- dio.status = 0;
- dio.pbuffer = buf;
- dio.blk_num = blk * BUG_SCALE;
- dio.blk_cnt = size / BUG_BLOCK_SIZE; /* assumed size in bytes */
- dio.flag = 0;
- dio.addr_mod = 0;
-#ifdef 0
- printf("bugscstrategy: size=%d blk=%d buf=%x\n", size, blk, buf);
- printf("ctrl %d dev %d\n", dio.ctrl_lun, dio.dev_lun);
-#endif
- mvmeprom_diskrd(&dio);
-
- *rsize = dio.blk_cnt * BUG_BLOCK_SIZE;
-#ifdef 0
-printf("rsize %d status %x\n", *rsize, dio.status);
-#endif
-
- if (dio.status)
- return (EIO);
- return (0);
-}
-
-int
-bugscopen(f)
- struct open_file *f;
-{
-#ifdef DEBUG
- printf("bugscopen:\n");
-#endif
-
- f->f_devdata = (void *)bugsc_softc;
- bugsc_softc[0].ctrl = (short)bugargs.ctrl_lun;
- bugsc_softc[0].dev = (short)bugargs.dev_lun;
- printf("using mvmebug ctrl %d dev %d\n",
- bugsc_softc[0].ctrl, bugsc_softc[0].dev);
- return (0);
-}
-
-int
-bugscclose(f)
- struct open_file *f;
-{
- return (EIO);
-}
-
-int
-bugscioctl(f, cmd, data)
- struct open_file *f;
- u_long cmd;
- void *data;
-{
- return (EIO);
-}
-
-void
-cputobsdlabel(lp, clp)
- struct disklabel *lp;
- struct cpu_disklabel *clp;
-{
- int i;
-
- lp->d_magic = clp->magic1;
- lp->d_type = clp->type;
- lp->d_subtype = clp->subtype;
- bcopy(clp->vid_vd, lp->d_typename, 16);
- bcopy(clp->packname, lp->d_packname, 16);
- lp->d_secsize = clp->cfg_psm;
- lp->d_nsectors = clp->cfg_spt;
- lp->d_ncylinders = clp->cfg_trk; /* trk is really num of cyl! */
- lp->d_ntracks = clp->cfg_hds;
-
- lp->d_secpercyl = clp->secpercyl;
- lp->d_secperunit = clp->secperunit;
- lp->d_secpercyl = clp->secpercyl;
- lp->d_secperunit = clp->secperunit;
- lp->d_sparespertrack = clp->sparespertrack;
- lp->d_sparespercyl = clp->sparespercyl;
- lp->d_acylinders = clp->acylinders;
- lp->d_rpm = clp->rpm;
- lp->d_interleave = clp->cfg_ilv;
- lp->d_trackskew = clp->cfg_sof;
- lp->d_cylskew = clp->cylskew;
- lp->d_headswitch = clp->headswitch;
-
- /* this silly table is for winchester drives */
- switch (clp->cfg_ssr) {
- case 0:
- lp->d_trkseek = 0;
- break;
- case 1:
- lp->d_trkseek = 6;
- break;
- case 2:
- lp->d_trkseek = 10;
- break;
- case 3:
- lp->d_trkseek = 15;
- break;
- case 4:
- lp->d_trkseek = 20;
- break;
- default:
- lp->d_trkseek = 0;
- break;
- }
- lp->d_flags = clp->flags;
- for (i = 0; i < NDDATA; i++)
- lp->d_drivedata[i] = clp->drivedata[i];
- for (i = 0; i < NSPARE; i++)
- lp->d_spare[i] = clp->spare[i];
- lp->d_magic2 = clp->magic2;
- lp->d_checksum = clp->checksum;
- lp->d_npartitions = clp->partitions;
- lp->d_bbsize = clp->bbsize;
- lp->d_sbsize = clp->sbsize;
- bcopy(clp->vid_4, &(lp->d_partitions[0]), sizeof (struct partition) * 4);
- bcopy(clp->cfg_4, &(lp->d_partitions[4]), sizeof (struct partition) * 12);
-}
diff --git a/sys/arch/mvme68k/stand/bootsd/filesystem.c b/sys/arch/mvme68k/stand/bootsd/filesystem.c
deleted file mode 100644
index e61da90466d..00000000000
--- a/sys/arch/mvme68k/stand/bootsd/filesystem.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* $OpenBSD: filesystem.c,v 1.3 1996/04/28 10:48:19 deraadt Exp $ */
-
-/*
- * Copyright (c) 1993 Philip A. Nelson.
- * 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 Philip A. Nelson.
- * 4. The name of Philip A. Nelson may not be used to endorse or promote
- * products derived from this software without specific prior written
- * permission.
- *
- * THIS SOFTWARE IS PROVIDED BY PHILIP NELSON ``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 PHILIP NELSON 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 <stand.h>
-#include <ufs.h>
-
-struct fs_ops file_system[] = {
- { ufs_open, ufs_close, ufs_read, ufs_write, ufs_seek, ufs_stat },
-};
-
-int nfsys = sizeof(file_system)/sizeof(struct fs_ops);
-