Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Replace <dev/sun/sun_boot.h> with <sys/bootinfo.h>, whic...
details: https://anonhg.NetBSD.org/src/rev/2f79d5f85a69
branches: trunk
changeset: 526566:2f79d5f85a69
user: lukem <lukem%NetBSD.org@localhost>
date: Mon May 06 05:27:53 2002 +0000
description:
Replace <dev/sun/sun_boot.h> with <sys/bootinfo.h>, which is intended
to be more generic than ``bbinfo definitions for Sun-based systems''.
Other platforms can store bbinfo-style information here, and possibly
other platform-specific boot information that needs to be accessible
by foriegn platforms in tools such as /usr/sbin/installboot.
diffstat:
sys/dev/sun/Makefile | 4 +-
sys/dev/sun/sun_boot.h | 85 --------------------------------------------------
sys/sys/Makefile | 5 +-
sys/sys/bootinfo.h | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 90 insertions(+), 89 deletions(-)
diffs (208 lines):
diff -r acf0f1d060bc -r 2f79d5f85a69 sys/dev/sun/Makefile
--- a/sys/dev/sun/Makefile Mon May 06 03:20:54 2002 +0000
+++ b/sys/dev/sun/Makefile Mon May 06 05:27:53 2002 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2002/04/24 01:33:55 lukem Exp $
+# $NetBSD: Makefile,v 1.8 2002/05/06 05:27:54 lukem Exp $
INCSDIR= /usr/include/dev/sun
# Only install includes which are used by userland
-INCS= disklabel.h fbio.h kbd_reg.h kbio.h sun_boot.h vuid_event.h
+INCS= disklabel.h fbio.h kbd_reg.h kbio.h vuid_event.h
.include <bsd.kinc.mk>
diff -r acf0f1d060bc -r 2f79d5f85a69 sys/dev/sun/sun_boot.h
--- a/sys/dev/sun/sun_boot.h Mon May 06 03:20:54 2002 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-/* $NetBSD: sun_boot.h,v 1.2 2002/04/24 15:29:45 bjh21 Exp $ */
-
-/*-
- * Copyright (c) 2002 The NetBSD Foundation, Inc.
- * 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 the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
- */
-
-#ifdef _KERNEL
-#include <sys/stdint.h>
-#else
-#include <stdint.h>
-#endif
-
-/*
- * sparc
- */
-
-#define SPARC_BOOT_BLOCK_OFFSET 512
-#define SPARC_BOOT_BLOCK_BLOCKSIZE 512
-#define SPARC_BOOT_BLOCK_MAX_SIZE (512 * 15)
-
- /* Maximum # of 8KB blocks, enough for a 2MB boot program */
-#define SPARC_BBINFO_MAXBLOCKS 256
-
- /* Magic string -- 32 bytes long (including the NUL) */
-#define SPARC_BBINFO_MAGIC "NetBSD/sparc bootxx "
-#define SPARC_BBINFO_MAGICSIZE sizeof(SPARC_BBINFO_MAGIC)
-
-struct sparc_bbinfo {
- uint8_t bbi_magic[SPARC_BBINFO_MAGICSIZE];
- int32_t bbi_block_size;
- int32_t bbi_block_count;
- int32_t bbi_block_table[SPARC_BBINFO_MAXBLOCKS];
-};
-
-
-/*
- * sun68k (sun2, sun3)
- */
-
-#define SUN68K_BOOT_BLOCK_OFFSET 512
-#define SUN68K_BOOT_BLOCK_BLOCKSIZE 512
-#define SUN68K_BOOT_BLOCK_MAX_SIZE (512 * 15)
-
- /* Maximum # of 512 byte blocks, enough for a 32K boot program */
-#define SUN68K_BBINFO_MAXBLOCKS 64
-
- /* Magic string -- 32 bytes long (including the NUL) */
-#define SUN68K_BBINFO_MAGIC "NetBSD/sun68k bootxx "
-#define SUN68K_BBINFO_MAGICSIZE sizeof(SUN68K_BBINFO_MAGIC)
-
-struct sun68k_bbinfo {
- uint8_t bbi_magic[SUN68K_BBINFO_MAGICSIZE];
- int32_t bbi_block_size;
- int32_t bbi_block_count;
- int32_t bbi_block_table[SUN68K_BBINFO_MAXBLOCKS];
-};
diff -r acf0f1d060bc -r 2f79d5f85a69 sys/sys/Makefile
--- a/sys/sys/Makefile Mon May 06 03:20:54 2002 +0000
+++ b/sys/sys/Makefile Mon May 06 05:27:53 2002 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.39 2002/03/31 14:12:38 bjh21 Exp $
+# $NetBSD: Makefile,v 1.40 2002/05/06 05:27:53 lukem Exp $
KDIR= /sys/sys
INCSDIR= /usr/include/sys
-INCS= acct.h agpio.h ansi.h ataio.h audioio.h buf.h bswap.h \
+INCS= acct.h agpio.h ansi.h ataio.h audioio.h \
+ bootinfo.h bswap.h buf.h \
callout.h cdefs.h cdefs_aout.h \
cdefs_elf.h cdio.h chio.h clist.h clockctl.h conf.h core.h device.h \
dir.h dirent.h disk.h disklabel.h disklabel_acorn.h disklabel_mbr.h \
diff -r acf0f1d060bc -r 2f79d5f85a69 sys/sys/bootinfo.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/sys/bootinfo.h Mon May 06 05:27:53 2002 +0000
@@ -0,0 +1,85 @@
+/* $NetBSD: bootinfo.h,v 1.1 2002/05/06 05:27:54 lukem Exp $ */
+
+/*-
+ * Copyright (c) 2002 The NetBSD Foundation, Inc.
+ * 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 the NetBSD
+ * Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+ */
+
+#ifdef _KERNEL
+#include <sys/stdint.h>
+#else
+#include <stdint.h>
+#endif
+
+/*
+ * sparc
+ */
+
+#define SPARC_BOOT_BLOCK_OFFSET 512
+#define SPARC_BOOT_BLOCK_BLOCKSIZE 512
+#define SPARC_BOOT_BLOCK_MAX_SIZE (512 * 15)
+
+ /* Maximum # of 8KB blocks, enough for a 2MB boot program */
+#define SPARC_BBINFO_MAXBLOCKS 256
+
+ /* Magic string -- 32 bytes long (including the NUL) */
+#define SPARC_BBINFO_MAGIC "NetBSD/sparc bootxx "
+#define SPARC_BBINFO_MAGICSIZE sizeof(SPARC_BBINFO_MAGIC)
+
+struct sparc_bbinfo {
+ uint8_t bbi_magic[SPARC_BBINFO_MAGICSIZE];
+ int32_t bbi_block_size;
+ int32_t bbi_block_count;
+ int32_t bbi_block_table[SPARC_BBINFO_MAXBLOCKS];
+};
+
+
+/*
+ * sun68k (sun2, sun3)
+ */
+
+#define SUN68K_BOOT_BLOCK_OFFSET 512
+#define SUN68K_BOOT_BLOCK_BLOCKSIZE 512
+#define SUN68K_BOOT_BLOCK_MAX_SIZE (512 * 15)
+
+ /* Maximum # of 512 byte blocks, enough for a 32K boot program */
+#define SUN68K_BBINFO_MAXBLOCKS 64
+
+ /* Magic string -- 32 bytes long (including the NUL) */
+#define SUN68K_BBINFO_MAGIC "NetBSD/sun68k bootxx "
+#define SUN68K_BBINFO_MAGICSIZE sizeof(SUN68K_BBINFO_MAGIC)
+
+struct sun68k_bbinfo {
+ uint8_t bbi_magic[SUN68K_BBINFO_MAGICSIZE];
+ int32_t bbi_block_size;
+ int32_t bbi_block_count;
+ int32_t bbi_block_table[SUN68K_BBINFO_MAXBLOCKS];
+};
Home |
Main Index |
Thread Index |
Old Index