Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/alpha/stand move the boot/disk.* code to common/blk...
details: https://anonhg.NetBSD.org/src/rev/e06a3559e05d
branches: trunk
changeset: 471468:e06a3559e05d
user: cgd <cgd%NetBSD.org@localhost>
date: Fri Apr 02 03:17:28 1999 +0000
description:
move the boot/disk.* code to common/blkdev.*, and gut it. The previous
guts were actually functionally equivalent to the current guts, but were
much larger, filled with bugs, and indeed poked around at the disklabel
when some of those bugs prevented them from ever using the disklabel!
diffstat:
sys/arch/alpha/stand/boot/disk.c | 170 ------------------------------
sys/arch/alpha/stand/boot/disk.h | 9 -
sys/arch/alpha/stand/common/blkdev.c | 196 +++++++++++++++++++++++++++++++++++
sys/arch/alpha/stand/common/blkdev.h | 10 +
4 files changed, 206 insertions(+), 179 deletions(-)
diffs (truncated from 401 to 300 lines):
diff -r 31d9ba596895 -r e06a3559e05d sys/arch/alpha/stand/boot/disk.c
--- a/sys/arch/alpha/stand/boot/disk.c Fri Apr 02 03:11:57 1999 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,170 +0,0 @@
-/* $NetBSD: disk.c,v 1.11 1999/03/27 09:01:27 ross Exp $ */
-
-/*
- * Copyright (c) 1992, 1993
- * The Regents of the University of California. All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Van Jacobson of Lawrence Berkeley Laboratory and Ralph Campbell.
- *
- * 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 the University of
- * California, Berkeley and its contributors.
- * 4. 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.
- *
- * @(#)rz.c 8.1 (Berkeley) 6/10/93
- */
-
-#include <lib/libsa/stand.h>
-#include <lib/libkern/libkern.h>
-
-#include <sys/param.h>
-#include <sys/disklabel.h>
-
-#include <machine/prom.h>
-
-#include "stand/common/common.h"
-#include "disk.h"
-
-struct disk_softc {
- int sc_fd; /* PROM channel number */
- int sc_ctlr; /* controller number */
- int sc_unit; /* disk unit number */
- int sc_part; /* disk partition number */
- struct disklabel sc_label; /* disk label for this disk */
-};
-
-int
-diskstrategy(devdata, rw, bn, reqcnt, addrvoid, cnt)
- void *devdata;
- int rw;
- daddr_t bn;
- size_t reqcnt;
- void *addrvoid;
- size_t *cnt; /* out: number of bytes transfered */
-{
- char *addr = addrvoid;
- struct disk_softc *sc;
- struct partition *pp;
- prom_return_t ret;
-
- if ((reqcnt & 0xffffff) != reqcnt ||
- reqcnt == 0)
- asm("call_pal 0");
-
- twiddle();
-
- /* Partial-block transfers not handled. */
- if (reqcnt & (DEV_BSIZE - 1)) {
- *cnt = 0;
- return (EINVAL);
- }
-
- sc = (struct disk_softc *)devdata;
- pp = &sc->sc_label.d_partitions[sc->sc_part];
-
- ret.bits = prom_read(sc->sc_fd, reqcnt, addr, bn + pp->p_offset);
- if (ret.u.status)
- return (EIO);
- *cnt = ret.u.retval;
- return (0);
-}
-
-int
-diskopen(f, ctlr, unit, part)
- struct open_file *f;
- int ctlr, unit, part;
-{
- int i;
- size_t cnt;
- struct disklabel *lp;
- char *msg, buf[DEV_BSIZE];
- struct disk_softc *sc;
-
- if (unit >= 8 || part >= MAXPARTITIONS)
- return (ENXIO);
-
- sc = alloc(sizeof(struct disk_softc));
- bzero(sc, sizeof(struct disk_softc));
- f->f_devdata = (void *)sc;
-
- sc->sc_fd = booted_dev_fd;
- sc->sc_ctlr = ctlr;
- sc->sc_unit = unit;
- sc->sc_part = part;
-
- /* Try to read disk label and partition table information. */
- lp = &sc->sc_label;
- lp->d_secsize = DEV_BSIZE;
- lp->d_secpercyl = 1;
- lp->d_npartitions = MAXPARTITIONS;
- lp->d_partitions[part].p_offset = 0;
- lp->d_partitions[part].p_size = 0x7fffffff;
- i = diskstrategy(sc, F_READ,
- (daddr_t)LABELSECTOR, DEV_BSIZE, buf, &cnt);
- if (i || cnt != DEV_BSIZE) {
- printf("disk%d: error reading disk label\n", unit);
- goto bad;
- } else if (lp->d_magic != DISKMAGIC) {
- /* No label at all. Fake all partitions as whole disk. */
- for (i = 0; i < MAXPARTITIONS; i++) {
- lp->d_partitions[part].p_offset = 0;
- lp->d_partitions[part].p_size = 0x7fffffff;
- }
- } else {
- msg = getdisklabel(buf, lp);
- if (msg) {
- printf("disk%d: %s\n", unit, msg);
- goto bad;
- }
- }
-
- if (part >= lp->d_npartitions || lp->d_partitions[part].p_size == 0) {
-bad: free(sc, sizeof(struct disk_softc));
- return (ENXIO);
- }
- return (0);
-}
-
-int
-diskclose(f)
- struct open_file *f;
-{
- struct disk_softc *sc;
-
- sc = f->f_devdata;
-
- free(sc, sizeof(struct disk_softc));
- f->f_devdata = NULL;
- return (0);
-}
-
-void
-close_primary_device(fd)
- int fd;
-{
- prom_close(fd);
-}
diff -r 31d9ba596895 -r e06a3559e05d sys/arch/alpha/stand/boot/disk.h
--- a/sys/arch/alpha/stand/boot/disk.h Fri Apr 02 03:11:57 1999 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-/* $NetBSD: disk.h,v 1.3 1998/10/15 00:49:34 ross Exp $ */
-
-int diskstrategy __P((void *, int, daddr_t, size_t, void *, size_t *));
-/* int diskopen __P((struct open_file *, int, int, int)); */
-int diskclose __P((struct open_file *));
-
-#define diskioctl noioctl
-
-int booted_dev_fd;
diff -r 31d9ba596895 -r e06a3559e05d sys/arch/alpha/stand/common/blkdev.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/alpha/stand/common/blkdev.c Fri Apr 02 03:17:28 1999 +0000
@@ -0,0 +1,196 @@
+/* $NetBSD: blkdev.c,v 1.1 1999/04/02 03:17:29 cgd Exp $ */
+
+/*
+ * Copyright (c) 1999 Christopher G. Demetriou. 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 Christopher G. Demetriou
+ * for the NetBSD Project.
+ * 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.
+ */
+
+/*
+ * Copyright (c) 1992, 1993
+ * The Regents of the University of California. All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Van Jacobson of Lawrence Berkeley Laboratory and Ralph Campbell.
+ *
+ * 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 the University of
+ * California, Berkeley and its contributors.
+ * 4. 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.
+ *
+ * @(#)rz.c 8.1 (Berkeley) 6/10/93
+ */
+
+#include <lib/libsa/stand.h>
+#include <lib/libkern/libkern.h>
+
+#include <sys/param.h>
+#include <sys/disklabel.h>
+
+#include <machine/prom.h>
+
+#include "stand/common/common.h"
+#include "blkdev.h"
+
+/*
+ * If BOOTXX_FS_TYPE is defined, we'll try to find and use the first
+ * partition with that type mentioned in the disklabel, else default to
+ * using block 0.
+ *
+ * The old boot blocks used to look for a file system starting at block
+ * 0. It's not immediately obvious that change here is necessary or good,
+ * so for now we don't bother looking for the specific type.
+ */
+#undef BOOTXX_FS_TYPE
+
+int blkdev_is_open;
+u_int32_t blkdev_part_offset;
+
+/*
+ * Since we have only one device, and want to squeeze space, we just
+ * short-circuit devopen() to do the disk open as well.
+ *
+ * Devopen is supposed to decode the string 'fname', open the device,
+ * and make 'file' point to the remaining file name. Since we don't
+ * do any device munging, we can just set *file to fname.
+ */
+int
+devopen(f, fname, file)
+ struct open_file *f;
+ const char *fname;
+ char **file; /* out */
+{
Home |
Main Index |
Thread Index |
Old Index