From d9b97e8dfff725b36c2e2ce5d89295355e4762c4 Mon Sep 17 00:00:00 2001 From: "David E. O'Brien" Date: Mon, 25 Aug 2003 23:28:32 +0000 Subject: [PATCH] Use __FBSDID(). Also some minor copyright style cleanups. --- sys/boot/i386/boot2/boot2.c | 7 +++---- sys/boot/i386/gptboot/gptboot.c | 7 +++---- sys/boot/i386/kgzldr/boot.c | 7 ++++--- sys/boot/i386/kgzldr/lib.c | 7 ++++--- sys/boot/i386/libi386/biosacpi.c | 5 +++-- sys/boot/i386/libi386/bioscd.c | 5 +++-- sys/boot/i386/libi386/biosdisk.c | 5 +++-- sys/boot/i386/libi386/biosmem.c | 5 +++-- sys/boot/i386/libi386/biospci.c | 5 +++-- sys/boot/i386/libi386/biospnp.c | 5 +++-- sys/boot/i386/libi386/biossmap.c | 5 +++-- sys/boot/i386/libi386/bootinfo.c | 5 +++-- sys/boot/i386/libi386/bootinfo32.c | 5 +++-- sys/boot/i386/libi386/bootinfo64.c | 5 +++-- sys/boot/i386/libi386/comconsole.c | 7 ++++--- sys/boot/i386/libi386/devicename.c | 5 +++-- sys/boot/i386/libi386/elf32_freebsd.c | 5 +++-- sys/boot/i386/libi386/elf64_freebsd.c | 5 +++-- sys/boot/i386/libi386/gatea20.c | 6 ++++-- sys/boot/i386/libi386/i386_copy.c | 5 +++-- sys/boot/i386/libi386/i386_module.c | 5 +++-- sys/boot/i386/libi386/nullconsole.c | 10 +++++----- sys/boot/i386/libi386/pread.c | 9 +++++---- sys/boot/i386/libi386/pxe.c | 9 ++++----- sys/boot/i386/libi386/time.c | 5 +++-- sys/boot/i386/libi386/vidconsole.c | 9 +++++---- sys/boot/i386/loader/conf.c | 5 +++-- sys/boot/i386/loader/main.c | 5 +++-- 28 files changed, 95 insertions(+), 73 deletions(-) diff --git a/sys/boot/i386/boot2/boot2.c b/sys/boot/i386/boot2/boot2.c index 75216ed414e6..f3daec7bb284 100644 --- a/sys/boot/i386/boot2/boot2.c +++ b/sys/boot/i386/boot2/boot2.c @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1998 Robert Nordier * All rights reserved. * @@ -13,9 +13,8 @@ * purpose. */ -/* - * $FreeBSD$ - */ +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/sys/boot/i386/gptboot/gptboot.c b/sys/boot/i386/gptboot/gptboot.c index 75216ed414e6..f3daec7bb284 100644 --- a/sys/boot/i386/gptboot/gptboot.c +++ b/sys/boot/i386/gptboot/gptboot.c @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1998 Robert Nordier * All rights reserved. * @@ -13,9 +13,8 @@ * purpose. */ -/* - * $FreeBSD$ - */ +#include +__FBSDID("$FreeBSD$"); #include #include diff --git a/sys/boot/i386/kgzldr/boot.c b/sys/boot/i386/kgzldr/boot.c index cbcd498fadd2..45ed2ee62e16 100644 --- a/sys/boot/i386/kgzldr/boot.c +++ b/sys/boot/i386/kgzldr/boot.c @@ -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$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/boot/i386/kgzldr/lib.c b/sys/boot/i386/kgzldr/lib.c index ebec384a0b27..538875b510e5 100644 --- a/sys/boot/i386/kgzldr/lib.c +++ b/sys/boot/i386/kgzldr/lib.c @@ -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$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include diff --git a/sys/boot/i386/libi386/biosacpi.c b/sys/boot/i386/libi386/biosacpi.c index e247c2486a1d..b4080bdc39a7 100644 --- a/sys/boot/i386/libi386/biosacpi.c +++ b/sys/boot/i386/libi386/biosacpi.c @@ -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$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/boot/i386/libi386/bioscd.c b/sys/boot/i386/libi386/bioscd.c index 88f1c115458b..7259ff59ec04 100644 --- a/sys/boot/i386/libi386/bioscd.c +++ b/sys/boot/i386/libi386/bioscd.c @@ -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$ */ +#include +__FBSDID("$FreeBSD$"); + /* * BIOS CD device handling for CD's that have been booted off of via no * emulation booting as defined in the El Torito standard. diff --git a/sys/boot/i386/libi386/biosdisk.c b/sys/boot/i386/libi386/biosdisk.c index 658a39c0bda4..6d381d45cc70 100644 --- a/sys/boot/i386/libi386/biosdisk.c +++ b/sys/boot/i386/libi386/biosdisk.c @@ -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$ */ +#include +__FBSDID("$FreeBSD$"); + /* * BIOS disk device handling. * diff --git a/sys/boot/i386/libi386/biosmem.c b/sys/boot/i386/libi386/biosmem.c index 718445273f4c..019cf90a30ae 100644 --- a/sys/boot/i386/libi386/biosmem.c +++ b/sys/boot/i386/libi386/biosmem.c @@ -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$ */ +#include +__FBSDID("$FreeBSD$"); + /* * Obtain memory configuration information from the BIOS */ diff --git a/sys/boot/i386/libi386/biospci.c b/sys/boot/i386/libi386/biospci.c index 356ea126b4af..5717bdc8a480 100644 --- a/sys/boot/i386/libi386/biospci.c +++ b/sys/boot/i386/libi386/biospci.c @@ -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$ */ +#include +__FBSDID("$FreeBSD$"); + /* * PnP enumerator using the PCI BIOS. */ diff --git a/sys/boot/i386/libi386/biospnp.c b/sys/boot/i386/libi386/biospnp.c index 611636d85224..b6e765ad3745 100644 --- a/sys/boot/i386/libi386/biospnp.c +++ b/sys/boot/i386/libi386/biospnp.c @@ -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$ */ +#include +__FBSDID("$FreeBSD$"); + /* * PnP BIOS enumerator. */ diff --git a/sys/boot/i386/libi386/biossmap.c b/sys/boot/i386/libi386/biossmap.c index 1548dd901e19..2859a5631dc5 100644 --- a/sys/boot/i386/libi386/biossmap.c +++ b/sys/boot/i386/libi386/biossmap.c @@ -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$ */ +#include +__FBSDID("$FreeBSD$"); + /* * Obtain memory configuration information from the BIOS */ diff --git a/sys/boot/i386/libi386/bootinfo.c b/sys/boot/i386/libi386/bootinfo.c index 5de13a7a9918..50952810b030 100644 --- a/sys/boot/i386/libi386/bootinfo.c +++ b/sys/boot/i386/libi386/bootinfo.c @@ -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$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/boot/i386/libi386/bootinfo32.c b/sys/boot/i386/libi386/bootinfo32.c index 4ee968f56b1a..ceb254c5c914 100644 --- a/sys/boot/i386/libi386/bootinfo32.c +++ b/sys/boot/i386/libi386/bootinfo32.c @@ -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$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/boot/i386/libi386/bootinfo64.c b/sys/boot/i386/libi386/bootinfo64.c index 77e05e88fc40..58b4e3c6b169 100644 --- a/sys/boot/i386/libi386/bootinfo64.c +++ b/sys/boot/i386/libi386/bootinfo64.c @@ -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$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/boot/i386/libi386/comconsole.c b/sys/boot/i386/libi386/comconsole.c index 9440b3a1f34d..0b778b6d2b83 100644 --- a/sys/boot/i386/libi386/comconsole.c +++ b/sys/boot/i386/libi386/comconsole.c @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1998 Michael Smith (msmith@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$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/boot/i386/libi386/devicename.c b/sys/boot/i386/libi386/devicename.c index 31259c1955be..7ae45b17a36d 100644 --- a/sys/boot/i386/libi386/devicename.c +++ b/sys/boot/i386/libi386/devicename.c @@ -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$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/boot/i386/libi386/elf32_freebsd.c b/sys/boot/i386/libi386/elf32_freebsd.c index 3c9397b3a094..a5082013f3d5 100644 --- a/sys/boot/i386/libi386/elf32_freebsd.c +++ b/sys/boot/i386/libi386/elf32_freebsd.c @@ -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$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/boot/i386/libi386/elf64_freebsd.c b/sys/boot/i386/libi386/elf64_freebsd.c index ec9f929741f4..229c25981b5d 100644 --- a/sys/boot/i386/libi386/elf64_freebsd.c +++ b/sys/boot/i386/libi386/elf64_freebsd.c @@ -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$ */ +#include +__FBSDID("$FreeBSD$"); + #define __ELF_WORD_SIZE 64 #include #include diff --git a/sys/boot/i386/libi386/gatea20.c b/sys/boot/i386/libi386/gatea20.c index 67971189451d..1c5f0f05fe1d 100644 --- a/sys/boot/i386/libi386/gatea20.c +++ b/sys/boot/i386/libi386/gatea20.c @@ -1,10 +1,12 @@ /* - * $FreeBSD$ - * From: $NetBSD: gatea20.c,v 1.2 1997/10/29 00:32:49 fvdl Exp $ + * $NetBSD: gatea20.c,v 1.2 1997/10/29 00:32:49 fvdl Exp $ */ /* extracted from freebsd:sys/i386/boot/biosboot/io.c */ +#include +__FBSDID("$FreeBSD$"); + #include #include diff --git a/sys/boot/i386/libi386/i386_copy.c b/sys/boot/i386/libi386/i386_copy.c index f7cc2f01e26f..2dce4f1021b8 100644 --- a/sys/boot/i386/libi386/i386_copy.c +++ b/sys/boot/i386/libi386/i386_copy.c @@ -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$ */ +#include +__FBSDID("$FreeBSD$"); + /* * MD primitives supporting placement of module data * diff --git a/sys/boot/i386/libi386/i386_module.c b/sys/boot/i386/libi386/i386_module.c index a7f5d566e07c..91993df96d76 100644 --- a/sys/boot/i386/libi386/i386_module.c +++ b/sys/boot/i386/libi386/i386_module.c @@ -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$ */ +#include +__FBSDID("$FreeBSD$"); + /* * i386-specific module functionality. * diff --git a/sys/boot/i386/libi386/nullconsole.c b/sys/boot/i386/libi386/nullconsole.c index 70eb2c553f41..ebb1e7edd2b6 100644 --- a/sys/boot/i386/libi386/nullconsole.c +++ b/sys/boot/i386/libi386/nullconsole.c @@ -1,6 +1,7 @@ -/* +/*- * nullconsole.c * + * Author: Doug Ambrisko * Copyright (c) 2000 Whistle Communications, Inc. * All rights reserved. * @@ -32,12 +33,11 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF WHISTLE COMMUNICATIONS IS ADVISED OF THE POSSIBILITY * OF SUCH DAMAGE. - * - * Author: Doug Ambrisko - * - * $FreeBSD$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include diff --git a/sys/boot/i386/libi386/pread.c b/sys/boot/i386/libi386/pread.c index fb73f042216f..870e2540150f 100644 --- a/sys/boot/i386/libi386/pread.c +++ b/sys/boot/i386/libi386/pread.c @@ -1,9 +1,8 @@ /* - * $FreeBSD$ - * From: $NetBSD: pread.c,v 1.2 1997/03/22 01:48:38 thorpej Exp $ + * $NetBSD: pread.c,v 1.2 1997/03/22 01:48:38 thorpej Exp $ */ -/* +/*- * Copyright (c) 1996 * Matthias Drochner. All rights reserved. * @@ -32,9 +31,11 @@ * 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 +__FBSDID("$FreeBSD$"); + /* read into destination in flat addr space */ #include diff --git a/sys/boot/i386/libi386/pxe.c b/sys/boot/i386/libi386/pxe.c index 68081df584b5..b78508a98dbf 100644 --- a/sys/boot/i386/libi386/pxe.c +++ b/sys/boot/i386/libi386/pxe.c @@ -1,8 +1,6 @@ -/* +/*- * Copyright (c) 2000 Alfred Perlstein - * All rights reserved. * Copyright (c) 2000 Paul Saab - * All rights reserved. * Copyright (c) 2000 John Baldwin * All rights reserved. * @@ -26,10 +24,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$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/boot/i386/libi386/time.c b/sys/boot/i386/libi386/time.c index 8176ebb9eaa3..1db9a4a60688 100644 --- a/sys/boot/i386/libi386/time.c +++ b/sys/boot/i386/libi386/time.c @@ -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$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include "bootstrap.h" diff --git a/sys/boot/i386/libi386/vidconsole.c b/sys/boot/i386/libi386/vidconsole.c index 8a6a575c6802..bea6b1e9e0f5 100644 --- a/sys/boot/i386/libi386/vidconsole.c +++ b/sys/boot/i386/libi386/vidconsole.c @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1998 Michael Smith (msmith@freebsd.org) * Copyright (c) 1997 Kazutaka YOKOTA (yokota@zodiac.mech.utsunomiya-u.ac.jp) * All rights reserved. @@ -24,11 +24,12 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * From Id: probe_keyboard.c,v 1.13 1997/06/09 05:10:55 bde Exp - * - * $FreeBSD$ + * Id: probe_keyboard.c,v 1.13 1997/06/09 05:10:55 bde Exp */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include diff --git a/sys/boot/i386/loader/conf.c b/sys/boot/i386/loader/conf.c index 17d8d7d43dbd..e312959997dc 100644 --- a/sys/boot/i386/loader/conf.c +++ b/sys/boot/i386/loader/conf.c @@ -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$ */ +#include +__FBSDID("$FreeBSD$"); + #include #include #include "libi386/libi386.h" diff --git a/sys/boot/i386/loader/main.c b/sys/boot/i386/loader/main.c index ff2ee1034801..77f1bc1cad2c 100644 --- a/sys/boot/i386/loader/main.c +++ b/sys/boot/i386/loader/main.c @@ -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$ */ +#include +__FBSDID("$FreeBSD$"); + /* * MD bootstrap main() and assorted miscellaneous * commands.