Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/hpcarm Use MI md_root.c.
details: https://anonhg.NetBSD.org/src/rev/ee8b8cf5d48b
branches: trunk
changeset: 504227:ee8b8cf5d48b
user: toshii <toshii%NetBSD.org@localhost>
date: Sun Feb 25 15:45:23 2001 +0000
description:
Use MI md_root.c.
diffstat:
sys/arch/hpcarm/conf/files.hpcarm | 4 +-
sys/arch/hpcarm/dev/md_hooks.c | 106 --------------------------------------
sys/arch/hpcarm/hpcarm/machdep.c | 16 +-----
3 files changed, 3 insertions(+), 123 deletions(-)
diffs (165 lines):
diff -r 4d8cdc6cc342 -r ee8b8cf5d48b sys/arch/hpcarm/conf/files.hpcarm
--- a/sys/arch/hpcarm/conf/files.hpcarm Sun Feb 25 15:43:24 2001 +0000
+++ b/sys/arch/hpcarm/conf/files.hpcarm Sun Feb 25 15:45:23 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.hpcarm,v 1.4 2001/02/24 21:43:02 reinoud Exp $
+# $NetBSD: files.hpcarm,v 1.5 2001/02/25 15:45:23 toshii Exp $
#
# First try for arm-specific configuration info
#
@@ -24,7 +24,7 @@
define todservice {}
# Memory disk driver
-file arch/hpcarm/dev/md_hooks.c md & memory_disk_hooks
+file dev/md_root.c memory_disk_hooks
major {md = 18}
# Standard keyboard driver
diff -r 4d8cdc6cc342 -r ee8b8cf5d48b sys/arch/hpcarm/dev/md_hooks.c
--- a/sys/arch/hpcarm/dev/md_hooks.c Sun Feb 25 15:43:24 2001 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-/* $NetBSD: md_hooks.c,v 1.1 2001/02/23 03:48:08 ichiro Exp $ */
-
-/*
- * Copyright (c) 1995 Gordon W. Ross
- * 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. 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 "opt_md.h"
-
-#include <sys/param.h>
-#include <sys/reboot.h>
-#include <sys/device.h>
-#include <sys/systm.h>
-
-#include <uvm/uvm_extern.h>
-
-#include <dev/md.h>
-
-#include "opt_mdsize.h"
-
-#ifdef MINIROOTSIZE
-#define ROOTBYTES (MINIROOTSIZE << DEV_BSHIFT)
-
-/*
- * This array will be patched to contain a file-system image.
- * See the program: src/distrib/sun3/common/rdsetroot.c
- */
-int md_root_size = ROOTBYTES;
-char md_root_image[ROOTBYTES] = "|This is the root ramdisk!\n";
-
-#else /* MINIROOTSIZE */
-
-u_int memory_disc_size = 0; /* set by machdep.c */
-static struct md_conf *bootmd = NULL;
-
-extern int load_memory_disc_from_floppy __P((struct md_conf *md, dev_t dev));
-
-#endif /* MINIROOTSIZE */
-
-void
-md_attach_hook(unit, md)
- int unit;
- struct md_conf *md;
-{
- if (unit == 0) {
-#ifdef MINIROOTSIZE
- /* Setup root ramdisk */
- md->md_addr = (caddr_t) md_root_image;
- md->md_size = (size_t) md_root_size;
- md->md_type = MD_KMEM_FIXED;
-#else /* MINIROOTSIZE */
-#ifdef MEMORY_DISK_SIZE
- if (memory_disc_size == 0 && MEMORY_DISK_SIZE)
- memory_disc_size = (MEMORY_DISK_SIZE << DEV_BSHIFT);
-#endif /* MEMORY_DISK_SIZE */
- if (memory_disc_size != 0) {
- md->md_size = round_page(memory_disc_size);
- md->md_addr = (caddr_t)uvm_km_zalloc(kernel_map, memory_disc_size);
- md->md_type = MD_KMEM_FIXED;
- bootmd = md;
- }
-#endif /* MINIROOTSIZE */
- printf("md%d: allocated %dK (%d blocks)\n", unit, md->md_size / 1024, md->md_size / DEV_BSIZE);
- }
-}
-
-
-/*
- * This is called during open (i.e. mountroot)
- */
-
-void
-md_open_hook(unit, md)
- int unit;
- struct md_conf *md;
-{
- if (unit == 0) {
- /* The root memory disk only works single-user. */
- boothowto |= RB_SINGLE;
-#if !defined(MINIROOTSIZE) && NFDC > 0
- load_memory_disc_from_floppy(bootmd, makedev(17, 1)); /* XXX 1.44MB FD */
-#endif
- }
-}
diff -r 4d8cdc6cc342 -r ee8b8cf5d48b sys/arch/hpcarm/hpcarm/machdep.c
--- a/sys/arch/hpcarm/hpcarm/machdep.c Sun Feb 25 15:43:24 2001 +0000
+++ b/sys/arch/hpcarm/hpcarm/machdep.c Sun Feb 25 15:45:23 2001 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.1 2001/02/23 03:48:11 ichiro Exp $ */
+/* $NetBSD: machdep.c,v 1.2 2001/02/25 15:45:23 toshii Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -85,9 +85,6 @@
#ifndef PMAP_STATIC_L1S
extern int max_processes;
#endif /* !PMAP_STATIC_L1S */
-#if NMD > 0 && defined(MEMORY_DISK_HOOKS) && !defined(MINIROOTSIZE)
-extern u_int memory_disc_size; /* Memory disc size */
-#endif /* NMD && MEMORY_DISK_HOOKS && !MINIROOTSIZE */
pv_addr_t systempage;
pv_addr_t kernelstack;
@@ -906,17 +903,6 @@
max_processes = 255;
}
#endif /* !PMAP_STATUC_L1S */
-#if NMD > 0 && defined(MEMORY_DISK_HOOKS) && !defined(MINIROOTSIZE)
- if (get_bootconf_option(args, "memorydisc", BOOTOPT_TYPE_INT, &integer)
- || get_bootconf_option(args, "memorydisk", BOOTOPT_TYPE_INT, &integer)) {
- memory_disc_size = integer;
- memory_disc_size *= 1024;
- if (memory_disc_size < 32*1024)
- memory_disc_size = 32*1024;
- if (memory_disc_size > 2048*1024)
- memory_disc_size = 2048*1024;
- }
-#endif /* NMD && MEMORY_DISK_HOOKS && !MINIROOTSIZE */
if (get_bootconf_option(args, "quiet", BOOTOPT_TYPE_BOOLEAN, &integer)
|| get_bootconf_option(args, "-q", BOOTOPT_TYPE_BOOLEAN, &integer))
Home |
Main Index |
Thread Index |
Old Index