Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/nathanw_sa]: src/sys/arch/prep Back out last changes.
details: https://anonhg.NetBSD.org/src/rev/015e6f9aed6e
branches: nathanw_sa
changeset: 504784:015e6f9aed6e
user: nonaka <nonaka%NetBSD.org@localhost>
date: Tue Jun 19 11:56:28 2001 +0000
description:
Back out last changes.
diffstat:
sys/arch/prep/include/bootinfo.h | 70 ++++++++++++
sys/arch/prep/stand/boot/boot.c | 218 +++++++++++++++++++++++++++++++++++++++
sys/arch/prep/stand/boot/boot.h | 84 +++++++++++++++
3 files changed, 372 insertions(+), 0 deletions(-)
diffs (truncated from 384 to 300 lines):
diff -r c9d14ebfff0a -r 015e6f9aed6e sys/arch/prep/include/bootinfo.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/prep/include/bootinfo.h Tue Jun 19 11:56:28 2001 +0000
@@ -0,0 +1,70 @@
+/* $NetBSD: bootinfo.h,v 1.3.8.2 2001/06/19 11:56:28 nonaka Exp $ */
+
+/*
+ * Copyright (c) 1997
+ * Matthias Drochner. 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 for the NetBSD Project
+ * by Matthias Drochner.
+ * 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.
+ *
+ */
+
+#ifndef _MACHINE_BOOTINFO_H_
+#define _MACHINE_BOOTINFO_H_
+
+struct btinfo_common {
+ int next; /* offset of next item, or zero */
+ int type;
+};
+
+#define BTINFO_RESIDUAL 0
+#define BTINFO_CONSOLE 1
+#define BTINFO_CLOCK 2
+
+struct btinfo_residual {
+ struct btinfo_common common;
+ char* addr;
+};
+
+struct btinfo_console {
+ struct btinfo_common common;
+ char devname[4];
+ int addr;
+ int speed;
+};
+
+struct btinfo_clock {
+ struct btinfo_common common;
+ int ticks_per_sec;
+};
+
+#ifdef _KERNEL
+void *lookup_bootinfo __P((int));
+#endif
+
+#define BOOTINFO_MAXSIZE 0xd0
+
+#endif /* _MACHINE_BOOTINFO_H_ */
diff -r c9d14ebfff0a -r 015e6f9aed6e sys/arch/prep/stand/boot/boot.c
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/prep/stand/boot/boot.c Tue Jun 19 11:56:28 2001 +0000
@@ -0,0 +1,218 @@
+/* $NetBSD: boot.c,v 1.5.8.2 2001/06/19 11:56:29 nonaka Exp $ */
+
+/*
+ * Copyright (C) 1995, 1996 Wolfgang Solfrank.
+ * Copyright (C) 1995, 1996 TooLs GmbH.
+ * 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 TooLs GmbH.
+ * 4. The name of TooLs GmbH may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``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 TOOLS GMBH 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 <lib/libsa/stand.h>
+#include <lib/libsa/loadfile.h>
+#include <sys/reboot.h>
+#include <sys/boot_flag.h>
+#include <machine/bootinfo.h>
+#include <machine/cpu.h>
+#include <machine/residual.h>
+
+#include "boot.h"
+
+char *names[] = {
+ "in()",
+#if 0
+ "fd(0,0,0)netbsd", "fd(0,0,0)netbsd.gz",
+ "fd(0,0,0)netbsd.old", "fd(0,0,0)netbsd.old.gz",
+ "fd(0,0,0)onetbsd", "fd(0,0,0)onetbsd.gz"
+#endif
+};
+#define NUMNAMES (sizeof (names) / sizeof (names[0]))
+
+#define NAMELEN 128
+char namebuf[NAMELEN];
+char nametmp[NAMELEN];
+
+char bootinfo[BOOTINFO_MAXSIZE];
+struct btinfo_residual btinfo_residual;
+struct btinfo_console btinfo_console;
+struct btinfo_clock btinfo_clock;
+
+RESIDUAL residual;
+u_long ladr;
+
+extern u_long ns_per_tick;
+extern char bootprog_name[], bootprog_rev[], bootprog_maker[], bootprog_date[];
+
+void boot __P((void *, u_long));
+static void exec_kernel __P((char *));
+
+void
+boot(resp, loadaddr)
+ void *resp;
+ u_long loadaddr;
+{
+ int n = 0;
+ int addr, speed;
+ char *name, *cnname, *p;
+ ladr = loadaddr;
+
+ /*
+ * console init
+ */
+ cnname = cninit(&addr, &speed);
+
+ /* make bootinfo */
+ /*
+ * residual data
+ */
+ btinfo_residual.common.next = sizeof(btinfo_residual);
+ btinfo_residual.common.type = BTINFO_RESIDUAL;
+ if (resp) {
+ memcpy(&residual, resp, sizeof(residual));
+ btinfo_residual.addr = (void *)&residual;
+ } else {
+ printf("Warning: no residual data.\n");
+ btinfo_residual.addr = 0;
+ }
+
+ /*
+ * console
+ */
+ btinfo_console.common.next = sizeof(btinfo_console);
+ btinfo_console.common.type = BTINFO_CONSOLE;
+ strcpy(btinfo_console.devname, cnname);
+ btinfo_console.addr = addr;
+ btinfo_console.speed = speed;
+
+ /*
+ * clock
+ */
+ btinfo_clock.common.next = 0;
+ btinfo_clock.common.type = BTINFO_CLOCK;
+ btinfo_clock.ticks_per_sec = resp ?
+ residual.VitalProductData.ProcessorBusHz / 4 : TICKS_PER_SEC;
+
+ p = bootinfo;
+ memcpy(p, (void *)&btinfo_residual, sizeof(btinfo_residual));
+ p += sizeof(btinfo_residual);
+ memcpy(p, (void *)&btinfo_console, sizeof(btinfo_console));
+ p += sizeof(btinfo_console);
+ memcpy(p, (void *)&btinfo_clock, sizeof(btinfo_clock));
+
+ /*
+ * attached kernel check
+ */
+ init_in();
+
+ printf("\n");
+ printf(">> %s, Revision %s\n", bootprog_name, bootprog_rev);
+ printf(">> (%s, %s)\n", bootprog_maker, bootprog_date);
+
+ for (;;) {
+ name = names[n++];
+ if (n >= NUMNAMES)
+ n = 0;
+
+ exec_kernel(name);
+ }
+}
+
+/*
+ * Exec kernel
+ */
+static void
+exec_kernel(name)
+ char *name;
+{
+ int howto = 0;
+ char c, *ptr;
+ u_long marks[MARK_MAX];
+#ifdef DBMONITOR
+ int go_monitor;
+ extern int db_monitor __P((void));
+#endif /* DBMONITOR */
+
+ret:
+ printf("\nBoot: ");
+ memset(namebuf, 0, sizeof (namebuf));
+ (void)tgets(namebuf);
+
+ ptr = namebuf;
+#ifdef DBMONITOR
+ go_monitor = 0;
+ if (*ptr == '!') {
+ if (*(++ptr) == NULL) {
+ db_monitor();
+ printf("\n");
+ goto ret;
+ } else {
+ go_monitor++;
+ }
+ }
+#endif /* DBMONITOR */
+ while ((c = *ptr)) {
+ while (c == ' ')
+ c = *++ptr;
+ if (!c)
+ goto next;
+ if (c == '-') {
+ while ((c = *++ptr) && c != ' ')
+ BOOT_FLAG(c, howto);
+ } else {
+ name = ptr;
+ while ((c = *++ptr) && c != ' ');
+ if (c)
+ *ptr++ = 0;
+ }
+ }
+
+next:
+ printf("Loading %s", name);
+ if (howto)
+ printf(" (howto 0x%x)", howto);
+ printf("\n");
+
+ marks[MARK_START] = 0;
+ if (loadfile(name, marks, LOAD_ALL) == 0) {
+#ifdef DBMONITOR
+ if (go_monitor) {
+ db_monitor();
+ printf("\n");
+ }
+#endif /* DBMONITOR */
+
+ printf("start=0x%lx\n\n", marks[MARK_ENTRY]);
+ delay(1000);
+ __syncicache((void *)marks[MARK_ENTRY],
+ (u_int)marks[MARK_SYM] - (u_int)marks[MARK_ENTRY]);
+
+ run((void *)marks[MARK_SYM],
+ (void *)marks[MARK_END],
+ (void *)howto,
+ (void *)bootinfo,
+ (void *)marks[MARK_ENTRY]);
+ }
+}
diff -r c9d14ebfff0a -r 015e6f9aed6e sys/arch/prep/stand/boot/boot.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/prep/stand/boot/boot.h Tue Jun 19 11:56:28 2001 +0000
@@ -0,0 +1,84 @@
Home |
Main Index |
Thread Index |
Old Index