/* -> /*- for copyright notices, minor format tweaks as necessary

38 files changed, 56 insertions, 50 deletions

diff --git a/sys/i386/include/_limits.h b/sys/i386/include/_limits.h
index c7cc41e..461f4c3 100644
--- a/sys/i386/include/_limits.h
+++ b/sys/i386/include/_limits.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/sys/i386/include/apicreg.h b/sys/i386/include/apicreg.h
index 2d6c7ea..d5d5dc3 100644
--- a/sys/i386/include/apicreg.h
+++ b/sys/i386/include/apicreg.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 1996, by Peter Wemm and Steve Passe
  * All rights reserved.
  *
diff --git a/sys/i386/include/apm_bios.h b/sys/i386/include/apm_bios.h
index 208d80b..ac75ddf 100644
--- a/sys/i386/include/apm_bios.h
+++ b/sys/i386/include/apm_bios.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * APM (Advanced Power Management) BIOS Device Driver
  *
  * Copyright (c) 1994-1995 by HOSOKAWA, Tatsumi <hosokawa@mt.cs.keio.ac.jp>
diff --git a/sys/i386/include/apm_segments.h b/sys/i386/include/apm_segments.h
index 9111b5c..2d04b9b 100644
--- a/sys/i386/include/apm_segments.h
+++ b/sys/i386/include/apm_segments.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * LP (Laptop Package)
  *
  * Copyright (C) 1994 by HOSOKAWA Tatsumi <hosokawa@mt.cs.keio.ac.jp>
diff --git a/sys/i386/include/bus_at386.h b/sys/i386/include/bus_at386.h
index 38c71ba..4600e35 100644
--- a/sys/i386/include/bus_at386.h
+++ b/sys/i386/include/bus_at386.h
@@ -37,7 +37,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/*
+/*-
  * Copyright (c) 1996 Charles M. Hannum.  All rights reserved.
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
  *
diff --git a/sys/i386/include/bus_dma.h b/sys/i386/include/bus_dma.h
index a278f62..b9c17de 100644
--- a/sys/i386/include/bus_dma.h
+++ b/sys/i386/include/bus_dma.h
@@ -37,7 +37,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-/*
+/*-
  * Copyright (c) 1996 Charles M. Hannum.  All rights reserved.
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
  *
diff --git a/sys/i386/include/bus_memio.h b/sys/i386/include/bus_memio.h
index 3533a67..fe943c7 100644
--- a/sys/i386/include/bus_memio.h
+++ b/sys/i386/include/bus_memio.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 1997 Justin Gibbs.
  * All rights reserved.
  *
diff --git a/sys/i386/include/bus_pc98.h b/sys/i386/include/bus_pc98.h
index 9b2976e..b850121 100644
--- a/sys/i386/include/bus_pc98.h
+++ b/sys/i386/include/bus_pc98.h
@@ -2,7 +2,7 @@
 /*	$NecBSD: busio.h,v 3.25.4.2.2.1 2000/06/12 03:53:08 honda Exp $	*/
 /*	$NetBSD: bus.h,v 1.12 1997/10/01 08:25:15 fvdl Exp $	*/
 
-/*
+/*-
  * [NetBSD for NEC PC-98 series]
  *  Copyright (c) 1997, 1998
  *	NetBSD/pc98 porting staff. All rights reserved.
diff --git a/sys/i386/include/bus_pio.h b/sys/i386/include/bus_pio.h
index 8742dd1..15b5762 100644
--- a/sys/i386/include/bus_pio.h
+++ b/sys/i386/include/bus_pio.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 1997 Justin Gibbs.
  * All rights reserved.
  *
diff --git a/sys/i386/include/clock.h b/sys/i386/include/clock.h
index 1ee8562..88e864f 100644
--- a/sys/i386/include/clock.h
+++ b/sys/i386/include/clock.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Kernel interface to machine-dependent clock driver.
  * Garrett Wollman, September 1994.
  * This file is in the public domain.
diff --git a/sys/i386/include/cputypes.h b/sys/i386/include/cputypes.h
index d7d4711..58d460d 100644
--- a/sys/i386/include/cputypes.h
+++ b/sys/i386/include/cputypes.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 1993 Christopher G. Demetriou
  * All rights reserved.
  *
diff --git a/sys/i386/include/cserial.h b/sys/i386/include/cserial.h
index 3f82f7b..a05ff4b 100644
--- a/sys/i386/include/cserial.h
+++ b/sys/i386/include/cserial.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Ioctl interface to Cronyx serial drivers.
  *
  * Copyright (C) 1997-2002 Cronyx Engineering.
diff --git a/sys/i386/include/db_machdep.h b/sys/i386/include/db_machdep.h
index 567f3ce..27207a8 100644
--- a/sys/i386/include/db_machdep.h
+++ b/sys/i386/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
  * All Rights Reserved.
diff --git a/sys/i386/include/float.h b/sys/i386/include/float.h
index ea2df3c..52b899f 100644
--- a/sys/i386/include/float.h
+++ b/sys/i386/include/float.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 1989 Regents of the University of California.
  * All rights reserved.
  *
diff --git a/sys/i386/include/gdb_machdep.h b/sys/i386/include/gdb_machdep.h
index 3b426a1..95af8d4 100644
--- a/sys/i386/include/gdb_machdep.h
+++ b/sys/i386/include/gdb_machdep.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 2004 Marcel Moolenaar
  * All rights reserved.
  *
diff --git a/sys/i386/include/i4b_cause.h b/sys/i386/include/i4b_cause.h
index c98683a..0e94483 100644
--- a/sys/i386/include/i4b_cause.h
+++ b/sys/i386/include/i4b_cause.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 1997, 2002 Hellmuth Michaelis. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -21,8 +21,9 @@
  * 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.
- *
- *---------------------------------------------------------------------------
+ */
+
+/*---------------------------------------------------------------------------
  *
  *	i4b_cause.h - causes and cause handling for i4b
  *	-----------------------------------------------
diff --git a/sys/i386/include/i4b_debug.h b/sys/i386/include/i4b_debug.h
index ac8f6a8..38ae5ad 100644
--- a/sys/i386/include/i4b_debug.h
+++ b/sys/i386/include/i4b_debug.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 1997, 2002 Hellmuth Michaelis. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -21,8 +21,9 @@
  * 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.
- *
- *---------------------------------------------------------------------------
+ */
+
+/*---------------------------------------------------------------------------
  *
  *	i4b_debug.h - i4b debug header file
  *	-----------------------------------
diff --git a/sys/i386/include/i4b_ioctl.h b/sys/i386/include/i4b_ioctl.h
index 9df6adb..bcf131a 100644
--- a/sys/i386/include/i4b_ioctl.h
+++ b/sys/i386/include/i4b_ioctl.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 1997, 2002 Hellmuth Michaelis. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -21,8 +21,9 @@
  * 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.
- *
- *---------------------------------------------------------------------------
+ */
+
+/*---------------------------------------------------------------------------
  *
  *	i4b_ioctl.h - messages kernel <--> userland
  *	-------------------------------------------
diff --git a/sys/i386/include/i4b_rbch_ioctl.h b/sys/i386/include/i4b_rbch_ioctl.h
index dbaceed..334aa9dc 100644
--- a/sys/i386/include/i4b_rbch_ioctl.h
+++ b/sys/i386/include/i4b_rbch_ioctl.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 1999, 2002 Hellmuth Michaelis. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -21,8 +21,9 @@
  * 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.
- *
- *---------------------------------------------------------------------------
+ */
+
+/*---------------------------------------------------------------------------
  *
  *	i4b_rbch_ioctl.h raw B-channel driver interface ioctls
  *	------------------------------------------------------
diff --git a/sys/i386/include/i4b_tel_ioctl.h b/sys/i386/include/i4b_tel_ioctl.h
index 2f0bb2b..47ffc70 100644
--- a/sys/i386/include/i4b_tel_ioctl.h
+++ b/sys/i386/include/i4b_tel_ioctl.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 1997, 2002  Hellmuth Michaelis. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -21,8 +21,9 @@
  * 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.
- *
- *---------------------------------------------------------------------------
+ */
+
+/*---------------------------------------------------------------------------
  *
  *	i4b_tel_ioctl.h telephony interface ioctls
  *	------------------------------------------
diff --git a/sys/i386/include/i4b_trace.h b/sys/i386/include/i4b_trace.h
index ee05bfd..fbd40af 100644
--- a/sys/i386/include/i4b_trace.h
+++ b/sys/i386/include/i4b_trace.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 1997, 2002 Hellmuth Michaelis. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -21,8 +21,9 @@
  * 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.
- *
- *---------------------------------------------------------------------------
+ */
+
+/*---------------------------------------------------------------------------
  *
  *	i4b_trace.h - header file for trace data read device
  *	----------------------------------------------------
diff --git a/sys/i386/include/if_wl_wavelan.h b/sys/i386/include/if_wl_wavelan.h
index ff0d486..c917681 100644
--- a/sys/i386/include/if_wl_wavelan.h
+++ b/sys/i386/include/if_wl_wavelan.h
@@ -1,5 +1,5 @@
 /* $FreeBSD$ */
-/* 
+/*-
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/sys/i386/include/kdb.h b/sys/i386/include/kdb.h
index 28b537a..ae8cb4f 100644
--- a/sys/i386/include/kdb.h
+++ b/sys/i386/include/kdb.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 2004 Marcel Moolenaar
  * All rights reserved.
  *
diff --git a/sys/i386/include/limits.h b/sys/i386/include/limits.h
index b7810fd..8e3bb11 100644
--- a/sys/i386/include/limits.h
+++ b/sys/i386/include/limits.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 1988, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/sys/i386/include/metadata.h b/sys/i386/include/metadata.h
index 32497a4..84e6f87 100644
--- a/sys/i386/include/metadata.h
+++ b/sys/i386/include/metadata.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 2003 Peter Wemm <peter@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/i386/include/mptable.h b/sys/i386/include/mptable.h
index d56a418..aad99ed 100644
--- a/sys/i386/include/mptable.h
+++ b/sys/i386/include/mptable.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 1996, by Steve Passe
  * All rights reserved.
  *
diff --git a/sys/i386/include/pci_cfgreg.h b/sys/i386/include/pci_cfgreg.h
index 4bbfe72..c0f322a 100644
--- a/sys/i386/include/pci_cfgreg.h
+++ b/sys/i386/include/pci_cfgreg.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 1997, Stefan Esser <se@freebsd.org>
  * All rights reserved.
  *
diff --git a/sys/i386/include/pcvt_ioctl.h b/sys/i386/include/pcvt_ioctl.h
index a1dcbf4..721539c 100644
--- a/sys/i386/include/pcvt_ioctl.h
+++ b/sys/i386/include/pcvt_ioctl.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 1992, 2000 Hellmuth Michaelis
  * Copyright (c) 1992, 1995 Joerg Wunsch.
  * Copyright (c) 1992, 1993 Brian Dunford-Shore and Holger Veit.
diff --git a/sys/i386/include/perfmon.h b/sys/i386/include/perfmon.h
index f012ee5..891c05e 100644
--- a/sys/i386/include/perfmon.h
+++ b/sys/i386/include/perfmon.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright 1996 Massachusetts Institute of Technology
  *
  * Permission to use, copy, modify, and distribute this software and
diff --git a/sys/i386/include/pmap.h b/sys/i386/include/pmap.h
index 7c54006..5471ddf 100644
--- a/sys/i386/include/pmap.h
+++ b/sys/i386/include/pmap.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 1991 Regents of the University of California.
  * All rights reserved.
  *
diff --git a/sys/i386/include/proc.h b/sys/i386/include/proc.h
index 5b2c286..2ac31fb 100644
--- a/sys/i386/include/proc.h
+++ b/sys/i386/include/proc.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 1991 Regents of the University of California.
  * All rights reserved.
  *
diff --git a/sys/i386/include/profile.h b/sys/i386/include/profile.h
index 4e59ca0..79dd308 100644
--- a/sys/i386/include/profile.h
+++ b/sys/i386/include/profile.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/sys/i386/include/ptrace.h b/sys/i386/include/ptrace.h
index adfc79c..eef24f8 100644
--- a/sys/i386/include/ptrace.h
+++ b/sys/i386/include/ptrace.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/sys/i386/include/resource.h b/sys/i386/include/resource.h
index 28fcc98..edde5eb 100644
--- a/sys/i386/include/resource.h
+++ b/sys/i386/include/resource.h
@@ -1,5 +1,5 @@
 /* $FreeBSD$ */
-/*
+/*-
  * Copyright 1998 Massachusetts Institute of Technology
  *
  * Permission to use, copy, modify, and distribute this software and
diff --git a/sys/i386/include/runq.h b/sys/i386/include/runq.h
index 2a21bfa..e906fa1 100644
--- a/sys/i386/include/runq.h
+++ b/sys/i386/include/runq.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 2001 Jake Burkholder <jake@FreeBSD.org>
  * All rights reserved.
  *
diff --git a/sys/i386/include/signal.h b/sys/i386/include/signal.h
index cd3cf4b..cdeedb2 100644
--- a/sys/i386/include/signal.h
+++ b/sys/i386/include/signal.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 1986, 1989, 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
  *
diff --git a/sys/i386/include/smp.h b/sys/i386/include/smp.h
index eb6a635..6bad810a 100644
--- a/sys/i386/include/smp.h
+++ b/sys/i386/include/smp.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * ----------------------------------------------------------------------------
  * "THE BEER-WARE LICENSE" (Revision 42):
  * <phk@FreeBSD.org> wrote this file.  As long as you retain this notice you
diff --git a/sys/i386/include/smptests.h b/sys/i386/include/smptests.h
index c1ca6ff..e25c226 100644
--- a/sys/i386/include/smptests.h
+++ b/sys/i386/include/smptests.h
@@ -1,4 +1,4 @@
-/*
+/*-
  * Copyright (c) 1996, by Steve Passe
  * All rights reserved.
  *