PERFORCE change 36996 for review
Marcel Moolenaar
marcel at FreeBSD.org
Tue Aug 26 16:58:27 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=36996
Change 36996 by marcel at marcel_nfs on 2003/08/26 16:58:21
IFC @36992
Affected files ...
.. //depot/projects/uart/alpha/alpha/api_up1000.c#5 integrate
.. //depot/projects/uart/alpha/alpha/dec_1000a.c#5 integrate
.. //depot/projects/uart/alpha/alpha/dec_2100_a50.c#5 integrate
.. //depot/projects/uart/alpha/alpha/dec_2100_a500.c#5 integrate
.. //depot/projects/uart/alpha/alpha/dec_axppci_33.c#5 integrate
.. //depot/projects/uart/alpha/alpha/dec_eb164.c#4 integrate
.. //depot/projects/uart/alpha/alpha/dec_eb64plus.c#5 integrate
.. //depot/projects/uart/alpha/alpha/dec_kn20aa.c#5 integrate
.. //depot/projects/uart/alpha/alpha/dec_kn300.c#5 integrate
.. //depot/projects/uart/alpha/alpha/dec_st550.c#5 integrate
.. //depot/projects/uart/alpha/alpha/dec_st6600.c#5 integrate
.. //depot/projects/uart/alpha/alpha/machdep.c#7 integrate
.. //depot/projects/uart/alpha/conf/NOTES#3 integrate
.. //depot/projects/uart/boot/common/bcache.c#2 integrate
.. //depot/projects/uart/boot/common/boot.c#2 integrate
.. //depot/projects/uart/boot/common/commands.c#2 integrate
.. //depot/projects/uart/boot/common/console.c#2 integrate
.. //depot/projects/uart/boot/common/dev_net.c#2 integrate
.. //depot/projects/uart/boot/common/devopen.c#2 integrate
.. //depot/projects/uart/boot/common/interp.c#2 integrate
.. //depot/projects/uart/boot/common/interp_backslash.c#2 integrate
.. //depot/projects/uart/boot/common/interp_forth.c#2 integrate
.. //depot/projects/uart/boot/common/interp_parse.c#2 integrate
.. //depot/projects/uart/boot/common/isapnp.c#2 integrate
.. //depot/projects/uart/boot/common/load.c#2 integrate
.. //depot/projects/uart/boot/common/load_elf.c#2 integrate
.. //depot/projects/uart/boot/common/load_elf32.c#2 integrate
.. //depot/projects/uart/boot/common/load_elf64.c#2 integrate
.. //depot/projects/uart/boot/common/ls.c#2 integrate
.. //depot/projects/uart/boot/common/misc.c#2 integrate
.. //depot/projects/uart/boot/common/module.c#2 integrate
.. //depot/projects/uart/boot/common/panic.c#2 integrate
.. //depot/projects/uart/boot/common/pnp.c#2 integrate
.. //depot/projects/uart/boot/common/ufsread.c#2 integrate
.. //depot/projects/uart/boot/i386/boot2/boot2.c#2 integrate
.. //depot/projects/uart/boot/i386/kgzldr/boot.c#2 integrate
.. //depot/projects/uart/boot/i386/kgzldr/lib.c#2 integrate
.. //depot/projects/uart/boot/i386/libi386/biosacpi.c#4 integrate
.. //depot/projects/uart/boot/i386/libi386/bioscd.c#2 integrate
.. //depot/projects/uart/boot/i386/libi386/biosdisk.c#2 integrate
.. //depot/projects/uart/boot/i386/libi386/biosmem.c#2 integrate
.. //depot/projects/uart/boot/i386/libi386/biospci.c#2 integrate
.. //depot/projects/uart/boot/i386/libi386/biospnp.c#3 integrate
.. //depot/projects/uart/boot/i386/libi386/biossmap.c#2 integrate
.. //depot/projects/uart/boot/i386/libi386/bootinfo.c#2 integrate
.. //depot/projects/uart/boot/i386/libi386/bootinfo32.c#2 integrate
.. //depot/projects/uart/boot/i386/libi386/bootinfo64.c#2 integrate
.. //depot/projects/uart/boot/i386/libi386/comconsole.c#2 integrate
.. //depot/projects/uart/boot/i386/libi386/devicename.c#2 integrate
.. //depot/projects/uart/boot/i386/libi386/elf32_freebsd.c#2 integrate
.. //depot/projects/uart/boot/i386/libi386/elf64_freebsd.c#2 integrate
.. //depot/projects/uart/boot/i386/libi386/gatea20.c#2 integrate
.. //depot/projects/uart/boot/i386/libi386/i386_copy.c#2 integrate
.. //depot/projects/uart/boot/i386/libi386/i386_module.c#2 integrate
.. //depot/projects/uart/boot/i386/libi386/nullconsole.c#2 integrate
.. //depot/projects/uart/boot/i386/libi386/pread.c#2 integrate
.. //depot/projects/uart/boot/i386/libi386/pxe.c#2 integrate
.. //depot/projects/uart/boot/i386/libi386/time.c#2 integrate
.. //depot/projects/uart/boot/i386/libi386/vidconsole.c#2 integrate
.. //depot/projects/uart/boot/i386/loader/conf.c#2 integrate
.. //depot/projects/uart/boot/i386/loader/main.c#2 integrate
.. //depot/projects/uart/cam/scsi/scsi_da.c#7 integrate
.. //depot/projects/uart/conf/files.pc98#5 integrate
.. //depot/projects/uart/conf/options.alpha#3 integrate
.. //depot/projects/uart/dev/ata/ata-all.c#3 integrate
.. //depot/projects/uart/dev/ata/ata-all.h#3 integrate
.. //depot/projects/uart/dev/ata/ata-card.c#3 integrate
.. //depot/projects/uart/dev/ata/ata-cbus.c#3 integrate
.. //depot/projects/uart/dev/ata/ata-chipset.c#5 integrate
.. //depot/projects/uart/dev/ata/ata-disk.c#3 integrate
.. //depot/projects/uart/dev/ata/ata-dma.c#5 integrate
.. //depot/projects/uart/dev/ata/ata-isa.c#3 integrate
.. //depot/projects/uart/dev/ata/ata-lowlevel.c#2 integrate
.. //depot/projects/uart/dev/ata/ata-pci.c#5 integrate
.. //depot/projects/uart/dev/ata/ata-pci.h#4 integrate
.. //depot/projects/uart/dev/ata/ata-queue.c#2 integrate
.. //depot/projects/uart/dev/ata/atapi-cd.c#3 integrate
.. //depot/projects/uart/dev/ata/atapi-fd.c#3 integrate
.. //depot/projects/uart/dev/ata/atapi-tape.c#3 integrate
.. //depot/projects/uart/dev/bktr/bktr_core.c#6 integrate
.. //depot/projects/uart/dev/buslogic/bt.c#5 integrate
.. //depot/projects/uart/dev/isp/isp.c#3 integrate
.. //depot/projects/uart/dev/pccard/pccard.c#4 integrate
.. //depot/projects/uart/dev/sio/sio.c#4 integrate
.. //depot/projects/uart/dev/sio/sio_isa.c#3 integrate
.. //depot/projects/uart/dev/sio/sio_pccard.c#3 integrate
.. //depot/projects/uart/dev/syscons/scgfbrndr.c#3 integrate
.. //depot/projects/uart/dev/syscons/syscons.c#4 integrate
.. //depot/projects/uart/dev/usb/ucom.c#5 integrate
.. //depot/projects/uart/dev/usb/ufm.c#4 integrate
.. //depot/projects/uart/dev/usb/ugen.c#5 integrate
.. //depot/projects/uart/dev/usb/uhid.c#5 integrate
.. //depot/projects/uart/dev/usb/ulpt.c#3 integrate
.. //depot/projects/uart/dev/usb/ums.c#4 integrate
.. //depot/projects/uart/dev/usb/urio.c#4 integrate
.. //depot/projects/uart/dev/usb/usb.c#4 integrate
.. //depot/projects/uart/dev/usb/uscanner.c#6 integrate
.. //depot/projects/uart/gnu/ext2fs/ext2_bitops.h#1 branch
.. //depot/projects/uart/gnu/ext2fs/ext2_linux_balloc.c#3 integrate
.. //depot/projects/uart/gnu/ext2fs/ext2_linux_ialloc.c#3 integrate
.. //depot/projects/uart/gnu/ext2fs/ia64-bitops.h#2 delete
.. //depot/projects/uart/i386/i386/atomic.c#2 integrate
.. //depot/projects/uart/i386/i386/bios.c#2 integrate
.. //depot/projects/uart/i386/i386/db_disasm.c#2 integrate
.. //depot/projects/uart/i386/i386/db_interface.c#2 integrate
.. //depot/projects/uart/i386/i386/db_trace.c#2 integrate
.. //depot/projects/uart/i386/i386/dump_machdep.c#2 integrate
.. //depot/projects/uart/i386/i386/elan-mmcr.c#2 integrate
.. //depot/projects/uart/i386/i386/elf_machdep.c#3 integrate
.. //depot/projects/uart/i386/i386/i386-gdbstub.c#2 integrate
.. //depot/projects/uart/i386/i386/i686_mem.c#3 integrate
.. //depot/projects/uart/i386/i386/identcpu.c#5 integrate
.. //depot/projects/uart/i386/i386/initcpu.c#3 integrate
.. //depot/projects/uart/i386/i386/k6_mem.c#2 integrate
.. //depot/projects/uart/i386/i386/legacy.c#2 integrate
.. //depot/projects/uart/i386/i386/mp_clock.c#3 integrate
.. //depot/projects/uart/i386/i386/mp_machdep.c#6 integrate
.. //depot/projects/uart/i386/i386/mpapic.c#3 integrate
.. //depot/projects/uart/i386/i386/nexus.c#2 integrate
.. //depot/projects/uart/i386/i386/perfmon.c#4 integrate
.. //depot/projects/uart/i386/i386/pmap.c#14 integrate
.. //depot/projects/uart/i386/i386/sys_machdep.c#7 integrate
.. //depot/projects/uart/i386/i386/tsc.c#4 integrate
.. //depot/projects/uart/i386/i386/vm86.c#2 integrate
.. //depot/projects/uart/i386/isa/bs/bshw_dma.c#2 integrate
.. //depot/projects/uart/ia64/conf/NOTES#2 integrate
.. //depot/projects/uart/kern/kern_mac.c#4 integrate
.. //depot/projects/uart/kern/kern_thread.c#10 integrate
.. //depot/projects/uart/kern/sched_ule.c#5 integrate
.. //depot/projects/uart/netinet/raw_ip.c#5 integrate
.. //depot/projects/uart/pc98/pc98/syscons.c#3 delete
.. //depot/projects/uart/pci/if_dc.c#10 integrate
.. //depot/projects/uart/pci/meteor.c#5 integrate
.. //depot/projects/uart/vm/vm_page.h#3 integrate
Differences ...
==== //depot/projects/uart/alpha/alpha/api_up1000.c#5 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/api_up1000.c,v 1.9 2003/08/22 07:20:25 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/api_up1000.c,v 1.10 2003/08/25 03:43:07 marcel Exp $");
#include "opt_ddb.h"
#include "opt_dev_sc.h"
==== //depot/projects/uart/alpha/alpha/dec_1000a.c#5 (text+ko) ====
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_1000a.c,v 1.16 2003/08/22 07:20:25 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_1000a.c,v 1.17 2003/08/25 03:43:07 marcel Exp $");
#include "opt_ddb.h"
#include "opt_dev_sc.h"
==== //depot/projects/uart/alpha/alpha/dec_2100_a50.c#5 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_2100_a50.c,v 1.17 2003/08/22 07:20:25 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_2100_a50.c,v 1.18 2003/08/25 03:43:07 marcel Exp $");
#include "opt_ddb.h"
#include "opt_dev_sc.h"
==== //depot/projects/uart/alpha/alpha/dec_2100_a500.c#5 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_2100_a500.c,v 1.16 2003/08/22 07:20:25 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_2100_a500.c,v 1.17 2003/08/25 03:43:07 marcel Exp $");
#include "opt_ddb.h"
#include "opt_dev_sc.h"
==== //depot/projects/uart/alpha/alpha/dec_axppci_33.c#5 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_axppci_33.c,v 1.20 2003/08/22 07:20:25 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_axppci_33.c,v 1.21 2003/08/25 03:43:07 marcel Exp $");
#include "opt_ddb.h"
#include "opt_dev_sc.h"
==== //depot/projects/uart/alpha/alpha/dec_eb164.c#4 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_eb164.c,v 1.18 2003/08/17 06:42:07 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_eb164.c,v 1.19 2003/08/25 03:43:07 marcel Exp $");
#include "opt_ddb.h"
#include "opt_dev_sc.h"
==== //depot/projects/uart/alpha/alpha/dec_eb64plus.c#5 (text+ko) ====
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_eb64plus.c,v 1.15 2003/08/22 07:20:25 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_eb64plus.c,v 1.16 2003/08/25 03:43:07 marcel Exp $");
#include "opt_ddb.h"
#include "opt_dev_sc.h"
==== //depot/projects/uart/alpha/alpha/dec_kn20aa.c#5 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_kn20aa.c,v 1.17 2003/08/22 07:20:25 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_kn20aa.c,v 1.18 2003/08/25 03:43:07 marcel Exp $");
#include "opt_ddb.h"
#include "opt_dev_sc.h"
==== //depot/projects/uart/alpha/alpha/dec_kn300.c#5 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_kn300.c,v 1.12 2003/08/22 07:20:25 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_kn300.c,v 1.13 2003/08/25 03:43:07 marcel Exp $");
#include "opt_ddb.h"
#include "opt_dev_sc.h"
==== //depot/projects/uart/alpha/alpha/dec_st550.c#5 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_st550.c,v 1.15 2003/08/22 07:20:25 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_st550.c,v 1.16 2003/08/25 03:43:07 marcel Exp $");
#include "opt_ddb.h"
#include "opt_dev_sc.h"
==== //depot/projects/uart/alpha/alpha/dec_st6600.c#5 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_st6600.c,v 1.16 2003/08/22 07:20:25 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_st6600.c,v 1.17 2003/08/25 03:43:07 marcel Exp $");
#include "opt_ddb.h"
#include "opt_dev_sc.h"
==== //depot/projects/uart/alpha/alpha/machdep.c#7 (text+ko) ====
@@ -88,7 +88,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.211 2003/07/31 05:27:00 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.212 2003/08/25 03:43:07 marcel Exp $");
#include "opt_compat.h"
#include "opt_ddb.h"
==== //depot/projects/uart/alpha/conf/NOTES#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/alpha/conf/NOTES,v 1.152 2003/07/21 19:15:25 ticso Exp $
+# $FreeBSD: src/sys/alpha/conf/NOTES,v 1.153 2003/08/25 03:43:08 marcel Exp $
#
# This file contains machine dependent kernel configuration notes. For
# machine independent notes, look in /sys/conf/NOTES.
@@ -40,6 +40,9 @@
options DEC_KN300 # AlphaServer 4100 (Rawhide),
# AlphaServer 1200 (Tincup)
+# Allow building a kernel without sio(4).
+options NO_SIO
+
#####################################################################
# HARDWARE BUS CONFIGURATION
==== //depot/projects/uart/boot/common/bcache.c#2 (text+ko) ====
@@ -22,10 +22,11 @@
* 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.
- *
- * $FreeBSD: src/sys/boot/common/bcache.c,v 1.11 2002/02/25 03:45:09 bde Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/boot/common/bcache.c,v 1.12 2003/08/25 23:30:41 obrien Exp $");
+
/*
* Simple LRU block cache
*/
==== //depot/projects/uart/boot/common/boot.c#2 (text+ko) ====
@@ -22,10 +22,11 @@
* 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.
- *
- * $FreeBSD: src/sys/boot/common/boot.c,v 1.28 2001/09/11 01:09:19 peter Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/boot/common/boot.c,v 1.29 2003/08/25 23:30:41 obrien Exp $");
+
/*
* Loading modules, booting the system
*/
==== //depot/projects/uart/boot/common/commands.c#2 (text+ko) ====
@@ -22,10 +22,11 @@
* 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.
- *
- * $FreeBSD: src/sys/boot/common/commands.c,v 1.18 2003/04/04 16:35:14 phk Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/boot/common/commands.c,v 1.19 2003/08/25 23:30:41 obrien Exp $");
+
#include <stand.h>
#include <string.h>
==== //depot/projects/uart/boot/common/console.c#2 (text+ko) ====
@@ -22,10 +22,11 @@
* 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.
- *
- * $FreeBSD: src/sys/boot/common/console.c,v 1.5 1999/08/28 00:39:46 peter Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/boot/common/console.c,v 1.6 2003/08/25 23:30:41 obrien Exp $");
+
#include <stand.h>
#include <string.h>
==== //depot/projects/uart/boot/common/dev_net.c#2 (text+ko) ====
@@ -1,6 +1,5 @@
/*
- * $FreeBSD: src/sys/boot/common/dev_net.c,v 1.11 2002/07/31 20:17:06 jake Exp $
- * From: $NetBSD: dev_net.c,v 1.12 1997/12/10 20:38:37 gwr Exp $
+ * $NetBSD: dev_net.c,v 1.12 1997/12/10 20:38:37 gwr Exp $
*/
/*-
@@ -39,7 +38,10 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-/*
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/boot/common/dev_net.c,v 1.12 2003/08/25 23:30:41 obrien Exp $");
+
+/*-
* This module implements a "raw device" interface suitable for
* use by the stand-alone I/O library NFS code. This interface
* does not support any "block" access, and exists only for the
==== //depot/projects/uart/boot/common/devopen.c#2 (text+ko) ====
@@ -22,10 +22,10 @@
* 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.
- *
- * $FreeBSD: src/sys/boot/common/devopen.c,v 1.3 1999/08/28 00:39:47 peter Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/boot/common/devopen.c,v 1.4 2003/08/25 23:30:41 obrien Exp $");
#include <stand.h>
#include <string.h>
==== //depot/projects/uart/boot/common/interp.c#2 (text+ko) ====
@@ -22,9 +22,11 @@
* 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.
- *
- * $FreeBSD: src/sys/boot/common/interp.c,v 1.28 2001/11/19 17:30:26 obrien Exp $
*/
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/boot/common/interp.c,v 1.29 2003/08/25 23:30:41 obrien Exp $");
+
/*
* Simple commandline interpreter, toplevel and misc.
*
==== //depot/projects/uart/boot/common/interp_backslash.c#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/*
+/*-
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -11,11 +11,12 @@
* Jordan K. Hubbard
* 29 August 1998
*
- * $FreeBSD: src/sys/boot/common/interp_backslash.c,v 1.5 2000/08/03 09:13:54 jhb Exp $
- *
* Routine for doing backslash elimination.
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/boot/common/interp_backslash.c,v 1.6 2003/08/25 23:30:41 obrien Exp $");
+
#include <stand.h>
#include <string.h>
#include "bootstrap.h"
==== //depot/projects/uart/boot/common/interp_forth.c#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Michael Smith <msmith at freebsd.org>
* All rights reserved.
*
@@ -22,10 +22,11 @@
* 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.
- *
- * $FreeBSD: src/sys/boot/common/interp_forth.c,v 1.22 2002/04/09 20:59:34 dcs Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/boot/common/interp_forth.c,v 1.23 2003/08/25 23:30:41 obrien Exp $");
+
#include <sys/param.h> /* to pick up __FreeBSD_version */
#include <string.h>
#include <stand.h>
==== //depot/projects/uart/boot/common/interp_parse.c#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/*
+/*-
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -11,11 +11,12 @@
* Jordan K. Hubbard
* 29 August 1998
*
- * $FreeBSD: src/sys/boot/common/interp_parse.c,v 1.9 2000/08/03 09:13:54 jhb Exp $
- *
* The meat of the simple parser.
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/boot/common/interp_parse.c,v 1.10 2003/08/25 23:30:41 obrien Exp $");
+
#include <stand.h>
#include <string.h>
#include "bootstrap.h"
==== //depot/projects/uart/boot/common/isapnp.c#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998, Michael Smith
* Copyright (c) 1996, Sujal M. Patel
* All rights reserved.
@@ -23,10 +23,11 @@
* 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.
- *
- * $FreeBSD: src/sys/boot/common/isapnp.c,v 1.6 2000/08/03 09:13:54 jhb Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/boot/common/isapnp.c,v 1.7 2003/08/25 23:30:41 obrien Exp $");
+
/*
* Machine-independant ISA PnP enumerator implementing a subset of the
* ISA PnP specification.
==== //depot/projects/uart/boot/common/load.c#2 (text+ko) ====
@@ -22,10 +22,11 @@
* 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.
- *
- * $FreeBSD: src/sys/boot/common/load.c,v 1.2 1999/08/28 00:39:49 peter Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/boot/common/load.c,v 1.3 2003/08/25 23:30:41 obrien Exp $");
+
#include <stand.h>
#define LOAD_TINYBUF 2048
==== //depot/projects/uart/boot/common/load_elf.c#2 (text+ko) ====
@@ -23,10 +23,11 @@
* 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.
- *
- * $FreeBSD: src/sys/boot/common/load_elf.c,v 1.28 2003/05/12 05:48:09 peter Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/boot/common/load_elf.c,v 1.29 2003/08/25 23:30:41 obrien Exp $");
+
#include <sys/param.h>
#include <sys/exec.h>
#include <sys/linker.h>
==== //depot/projects/uart/boot/common/load_elf32.c#2 (text+ko) ====
@@ -1,3 +1,6 @@
-/* $FreeBSD: src/sys/boot/common/load_elf32.c,v 1.1 2003/05/01 03:56:29 peter Exp $ */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/boot/common/load_elf32.c,v 1.2 2003/08/25 23:30:41 obrien Exp $");
+
#define __ELF_WORD_SIZE 32
+
#include "load_elf.c"
==== //depot/projects/uart/boot/common/load_elf64.c#2 (text+ko) ====
@@ -1,3 +1,6 @@
-/* $FreeBSD: src/sys/boot/common/load_elf64.c,v 1.1 2003/05/01 03:56:29 peter Exp $ */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/boot/common/load_elf64.c,v 1.2 2003/08/25 23:30:41 obrien Exp $");
+
#define __ELF_WORD_SIZE 64
+
#include "load_elf.c"
==== //depot/projects/uart/boot/common/ls.c#2 (text+ko) ====
@@ -1,9 +1,8 @@
/*
- * $FreeBSD: src/sys/boot/common/ls.c,v 1.10 2000/05/01 18:03:15 peter Exp $
- * From: $NetBSD: ls.c,v 1.3 1997/06/13 13:48:47 drochner Exp $
+ * $NetBSD: ls.c,v 1.3 1997/06/13 13:48:47 drochner Exp $
*/
-/*
+/*-
* Copyright (c) 1993
* The Regents of the University of California. All rights reserved.
* Copyright (c) 1996
@@ -38,6 +37,8 @@
* SUCH DAMAGE.
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/boot/common/ls.c,v 1.11 2003/08/25 23:30:41 obrien Exp $");
#include <sys/param.h>
#include <ufs/ufs/dinode.h>
==== //depot/projects/uart/boot/common/misc.c#2 (text+ko) ====
@@ -22,10 +22,11 @@
* 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.
- *
- * $FreeBSD: src/sys/boot/common/misc.c,v 1.7 2000/06/14 10:34:28 ps Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/boot/common/misc.c,v 1.8 2003/08/25 23:30:41 obrien Exp $");
+
#include <string.h>
#include <stand.h>
#include <bootstrap.h>
==== //depot/projects/uart/boot/common/module.c#2 (text+ko) ====
@@ -22,10 +22,11 @@
* 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.
- *
- * $FreeBSD: src/sys/boot/common/module.c,v 1.24 2003/03/03 22:53:35 ru Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/boot/common/module.c,v 1.25 2003/08/25 23:30:41 obrien Exp $");
+
/*
* file/module function dispatcher, support, etc.
*/
==== //depot/projects/uart/boot/common/panic.c#2 (text+ko) ====
@@ -1,9 +1,7 @@
/*
- * $FreeBSD: src/sys/boot/common/panic.c,v 1.6 2001/11/28 14:00:36 dcs Exp $
- * From: $NetBSD: panic.c,v 1.2 1997/03/22 01:48:36 thorpej Exp $
+ * $NetBSD: panic.c,v 1.2 1997/03/22 01:48:36 thorpej Exp $
*/
-
-/*
+/*-
* Copyright (c) 1996
* Matthias Drochner. All rights reserved.
*
@@ -35,6 +33,8 @@
*
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/boot/common/panic.c,v 1.7 2003/08/25 23:30:41 obrien Exp $");
#include <stand.h>
#include <machine/stdarg.h>
==== //depot/projects/uart/boot/common/pnp.c#2 (text+ko) ====
@@ -1,8 +1,11 @@
/*
* mjs copyright
*
- * $FreeBSD: src/sys/boot/common/pnp.c,v 1.15 2000/12/30 20:40:16 phk Exp $
*/
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/boot/common/pnp.c,v 1.16 2003/08/25 23:30:41 obrien Exp $");
+
/*
* "Plug and Play" functionality.
*
==== //depot/projects/uart/boot/common/ufsread.c#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 2002 Networks Associates Technology, Inc.
* All rights reserved.
*
@@ -22,9 +22,8 @@
* purpose.
*/
-/*
- * $FreeBSD: src/sys/boot/common/ufsread.c,v 1.11 2003/02/25 00:10:20 obrien Exp $
- */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/boot/common/ufsread.c,v 1.12 2003/08/25 23:30:41 obrien Exp $");
#include <ufs/ufs/dinode.h>
#include <ufs/ffs/fs.h>
==== //depot/projects/uart/boot/i386/boot2/boot2.c#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Robert Nordier
* All rights reserved.
*
@@ -13,9 +13,8 @@
* purpose.
*/
-/*
- * $FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.63 2003/04/04 16:35:14 phk Exp $
- */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.64 2003/08/25 23:28:31 obrien Exp $");
#include <sys/param.h>
#include <sys/disklabel.h>
==== //depot/projects/uart/boot/i386/kgzldr/boot.c#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1999 Global Technology Associates, Inc.
* All rights reserved.
*
@@ -22,10 +22,11 @@
* 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.
- *
- * $FreeBSD: src/sys/boot/i386/kgzldr/boot.c,v 1.2 1999/08/28 00:40:10 peter Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/boot/i386/kgzldr/boot.c,v 1.3 2003/08/25 23:28:31 obrien Exp $");
+
#include <sys/types.h>
#include <sys/reboot.h>
#include <sys/inflate.h>
==== //depot/projects/uart/boot/i386/kgzldr/lib.c#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1999 Global Technology Associates, Inc.
* All rights reserved.
*
@@ -22,10 +22,11 @@
* 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.
- *
- * $FreeBSD: src/sys/boot/i386/kgzldr/lib.c,v 1.2 1999/08/28 00:40:11 peter Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/boot/i386/kgzldr/lib.c,v 1.3 2003/08/25 23:28:31 obrien Exp $");
+
#include <sys/types.h>
#include <stddef.h>
==== //depot/projects/uart/boot/i386/libi386/biosacpi.c#4 (text+ko) ====
@@ -22,10 +22,11 @@
* 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.
- *
- * $FreeBSD: src/sys/boot/i386/libi386/biosacpi.c,v 1.6 2003/08/07 14:53:14 njl Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosacpi.c,v 1.7 2003/08/25 23:28:31 obrien Exp $");
+
#include <stand.h>
#include <machine/stdarg.h>
#include <bootstrap.h>
==== //depot/projects/uart/boot/i386/libi386/bioscd.c#2 (text+ko) ====
@@ -23,10 +23,11 @@
* 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.
- *
- * $FreeBSD: src/sys/boot/i386/libi386/bioscd.c,v 1.4 2003/04/04 16:35:14 phk Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/bioscd.c,v 1.5 2003/08/25 23:28:31 obrien Exp $");
+
/*
* BIOS CD device handling for CD's that have been booted off of via no
* emulation booting as defined in the El Torito standard.
==== //depot/projects/uart/boot/i386/libi386/biosdisk.c#2 (text+ko) ====
@@ -22,10 +22,11 @@
* 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.
- *
- * $FreeBSD: src/sys/boot/i386/libi386/biosdisk.c,v 1.39 2003/04/04 16:35:14 phk Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosdisk.c,v 1.40 2003/08/25 23:28:31 obrien Exp $");
+
/*
* BIOS disk device handling.
*
==== //depot/projects/uart/boot/i386/libi386/biosmem.c#2 (text+ko) ====
@@ -22,10 +22,11 @@
* 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.
- *
- * $FreeBSD: src/sys/boot/i386/libi386/biosmem.c,v 1.6 2002/09/23 18:54:26 alfred Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosmem.c,v 1.7 2003/08/25 23:28:31 obrien Exp $");
+
/*
* Obtain memory configuration information from the BIOS
*/
==== //depot/projects/uart/boot/i386/libi386/biospci.c#2 (text+ko) ====
@@ -22,10 +22,11 @@
* 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.
- *
- * $FreeBSD: src/sys/boot/i386/libi386/biospci.c,v 1.3 2000/08/03 09:14:01 jhb Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biospci.c,v 1.4 2003/08/25 23:28:31 obrien Exp $");
+
/*
* PnP enumerator using the PCI BIOS.
*/
==== //depot/projects/uart/boot/i386/libi386/biospnp.c#3 (text+ko) ====
@@ -22,10 +22,11 @@
* 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.
- *
- * $FreeBSD: src/sys/boot/i386/libi386/biospnp.c,v 1.8 2003/08/07 15:04:24 jhb Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biospnp.c,v 1.9 2003/08/25 23:28:31 obrien Exp $");
+
/*
* PnP BIOS enumerator.
*/
==== //depot/projects/uart/boot/i386/libi386/biossmap.c#2 (text+ko) ====
@@ -22,10 +22,11 @@
* 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.
- *
- * $FreeBSD: src/sys/boot/i386/libi386/biossmap.c,v 1.1 2003/05/01 03:56:29 peter Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biossmap.c,v 1.2 2003/08/25 23:28:31 obrien Exp $");
+
/*
* Obtain memory configuration information from the BIOS
*/
==== //depot/projects/uart/boot/i386/libi386/bootinfo.c#2 (text+ko) ====
@@ -22,10 +22,11 @@
* 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.
- *
- * $FreeBSD: src/sys/boot/i386/libi386/bootinfo.c,v 1.34 2003/05/01 03:56:29 peter Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/bootinfo.c,v 1.35 2003/08/25 23:28:31 obrien Exp $");
+
#include <stand.h>
#include <sys/param.h>
#include <sys/reboot.h>
==== //depot/projects/uart/boot/i386/libi386/bootinfo32.c#2 (text+ko) ====
@@ -22,10 +22,11 @@
* 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.
- *
- * $FreeBSD: src/sys/boot/i386/libi386/bootinfo32.c,v 1.35 2003/05/01 04:31:33 peter Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/bootinfo32.c,v 1.36 2003/08/25 23:28:31 obrien Exp $");
+
#include <stand.h>
#include <sys/param.h>
#include <sys/reboot.h>
==== //depot/projects/uart/boot/i386/libi386/bootinfo64.c#2 (text+ko) ====
@@ -22,10 +22,11 @@
* 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.
- *
- * $FreeBSD: src/sys/boot/i386/libi386/bootinfo64.c,v 1.35 2003/05/01 04:31:33 peter Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/bootinfo64.c,v 1.36 2003/08/25 23:28:31 obrien Exp $");
+
#include <stand.h>
#include <sys/param.h>
#include <sys/reboot.h>
==== //depot/projects/uart/boot/i386/libi386/comconsole.c#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/*
+/*-
* Copyright (c) 1998 Michael Smith (msmith at freebsd.org)
*
* Redistribution and use in source and binary forms, with or without
@@ -21,10 +21,11 @@
* 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.
- *
- * $FreeBSD: src/sys/boot/i386/libi386/comconsole.c,v 1.8 2000/08/03 09:14:01 jhb Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/comconsole.c,v 1.9 2003/08/25 23:28:31 obrien Exp $");
+
#include <stand.h>
#include <bootstrap.h>
#include <machine/cpufunc.h>
==== //depot/projects/uart/boot/i386/libi386/devicename.c#2 (text+ko) ====
@@ -22,10 +22,11 @@
* 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.
- *
- * $FreeBSD: src/sys/boot/i386/libi386/devicename.c,v 1.5 2001/11/05 18:58:33 jhb Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/devicename.c,v 1.6 2003/08/25 23:28:31 obrien Exp $");
+
#include <stand.h>
#include <string.h>
#include <sys/disklabel.h>
==== //depot/projects/uart/boot/i386/libi386/elf32_freebsd.c#2 (text+ko) ====
@@ -22,10 +22,11 @@
* 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.
- *
- * $FreeBSD: src/sys/boot/i386/libi386/elf32_freebsd.c,v 1.12 2003/05/01 03:56:29 peter Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/elf32_freebsd.c,v 1.13 2003/08/25 23:28:31 obrien Exp $");
+
#include <sys/param.h>
#include <sys/exec.h>
#include <sys/linker.h>
==== //depot/projects/uart/boot/i386/libi386/elf64_freebsd.c#2 (text+ko) ====
@@ -22,10 +22,11 @@
* 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.
- *
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list