Use __FBSDID().

25 files changed, 76 insertions, 86 deletions

diff --git a/sys/i4b/capi/capi_l4if.c b/sys/i4b/capi/capi_l4if.c
index 9664e3b..ae7a64b 100644
--- a/sys/i4b/capi/capi_l4if.c
+++ b/sys/i4b/capi/capi_l4if.c
@@ -23,10 +23,11 @@
  * SUCH DAMAGE.
  *
  * capi/capi_l4if.c	The CAPI i4b L4/device interface.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/capi/capi_llif.c b/sys/i4b/capi/capi_llif.c
index 37ba967..ef761bb 100644
--- a/sys/i4b/capi/capi_llif.c
+++ b/sys/i4b/capi/capi_llif.c
@@ -23,10 +23,11 @@
  * SUCH DAMAGE.
  *
  * capi/capi_llif.c	The i4b CAPI link layer interface.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/capi/capi_msgs.c b/sys/i4b/capi/capi_msgs.c
index e2031ec..8ffd8fb 100644
--- a/sys/i4b/capi/capi_msgs.c
+++ b/sys/i4b/capi/capi_msgs.c
@@ -23,10 +23,11 @@
  * SUCH DAMAGE.
  *
  * capi/capi_msgs.c	The CAPI i4b message handlers.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/capi/iavc/iavc_card.c b/sys/i4b/capi/iavc/iavc_card.c
index da2b671..cbc3d0a 100644
--- a/sys/i4b/capi/iavc/iavc_card.c
+++ b/sys/i4b/capi/iavc/iavc_card.c
@@ -24,10 +24,11 @@
  *
  * capi/iavc/iavc_card.c
  *		The AVM ISDN controllers' card specific support routines.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/capi/iavc/iavc_isa.c b/sys/i4b/capi/iavc/iavc_isa.c
index 1027f28..050426d 100644
--- a/sys/i4b/capi/iavc/iavc_isa.c
+++ b/sys/i4b/capi/iavc/iavc_isa.c
@@ -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 <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/capi/iavc/iavc_lli.c b/sys/i4b/capi/iavc/iavc_lli.c
index b29254c..86a38e9 100644
--- a/sys/i4b/capi/iavc/iavc_lli.c
+++ b/sys/i4b/capi/iavc/iavc_lli.c
@@ -24,10 +24,11 @@
  *
  * capi/iavc/iavc_lli.c
  *		The AVM ISDN controllers' Low Level Interface.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/capi/iavc/iavc_pci.c b/sys/i4b/capi/iavc/iavc_pci.c
index 8cef025..89ffb90 100644
--- a/sys/i4b/capi/iavc/iavc_pci.c
+++ b/sys/i4b/capi/iavc/iavc_pci.c
@@ -24,10 +24,11 @@
  *
  * capi/iavc/iavc_pci.c
  *		The AVM ISDN controllers' PCI bus attachment handling.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
diff --git a/sys/i4b/driver/i4b_ctl.c b/sys/i4b/driver/i4b_ctl.c
index 4eb03c3..f71ae63 100644
--- a/sys/i4b/driver/i4b_ctl.c
+++ b/sys/i4b/driver/i4b_ctl.c
@@ -26,13 +26,13 @@
  *
  *	i4b_ctl.c - i4b system control port driver
  *	------------------------------------------
- *
- * $FreeBSD$
- *
  *	last edit-date: [Sun Mar 17 09:49:24 2002]
  *
  *---------------------------------------------------------------------------*/
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/ioccom.h>
 #include <sys/kernel.h>
diff --git a/sys/i4b/driver/i4b_ing.c b/sys/i4b/driver/i4b_ing.c
index ec4eeb7..02e127f 100644
--- a/sys/i4b/driver/i4b_ing.c
+++ b/sys/i4b/driver/i4b_ing.c
@@ -26,13 +26,13 @@
  *
  *	i4b_ing.c - isdn4bsd B-channel to netgraph driver
  *	-------------------------------------------------
- *
- * $FreeBSD$
- *
  *	last edit-date: [Sat Mar  9 14:09:53 2002]
  *
  *---------------------------------------------------------------------------*/ 
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "i4bing.h"
 
 #include "opt_i4b.h"
diff --git a/sys/i4b/driver/i4b_ipr.c b/sys/i4b/driver/i4b_ipr.c
index dd82aba..370e0e4 100644
--- a/sys/i4b/driver/i4b_ipr.c
+++ b/sys/i4b/driver/i4b_ipr.c
@@ -26,9 +26,6 @@
  *
  *	i4b_ipr.c - isdn4bsd IP over raw HDLC ISDN network driver
  *	---------------------------------------------------------
- *
- * $FreeBSD$
- *
  *	last edit-date: [Sun Mar 17 09:32:58 2002]
  *
  *---------------------------------------------------------------------------*
@@ -56,6 +53,9 @@
  *
  *---------------------------------------------------------------------------*/ 
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "i4bipr.h"
 
 #include "opt_i4b.h"
diff --git a/sys/i4b/driver/i4b_isppp.c b/sys/i4b/driver/i4b_isppp.c
index 1ba77b6..dc60fad 100644
--- a/sys/i4b/driver/i4b_isppp.c
+++ b/sys/i4b/driver/i4b_isppp.c
@@ -34,12 +34,13 @@
  *	the "cx" driver for Cronyx's HDLC-in-hardware device).  This driver
  *	is only the glue between sppp and i4b.
  *
- * $FreeBSD$
- *
  *	last edit-date: [Sat Mar  9 14:09:27 2002]
  *
  *---------------------------------------------------------------------------*/
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "i4bisppp.h"
 
 #include <sys/param.h>
diff --git a/sys/i4b/driver/i4b_rbch.c b/sys/i4b/driver/i4b_rbch.c
index ebd4866..d89e2c2 100644
--- a/sys/i4b/driver/i4b_rbch.c
+++ b/sys/i4b/driver/i4b_rbch.c
@@ -26,13 +26,13 @@
  *
  *	i4b_rbch.c - device driver for raw B channel data
  *	---------------------------------------------------
- *
- * $FreeBSD$
- *
  *	last edit-date: [Sun Mar 17 09:51:03 2002]
  *
  *---------------------------------------------------------------------------*/
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "i4brbch.h"
 
 #include <sys/param.h>
diff --git a/sys/i4b/driver/i4b_tel.c b/sys/i4b/driver/i4b_tel.c
index 231886d..e13b5f4 100644
--- a/sys/i4b/driver/i4b_tel.c
+++ b/sys/i4b/driver/i4b_tel.c
@@ -26,13 +26,13 @@
  *
  *	i4b_tel.c - device driver for ISDN telephony
  *	--------------------------------------------
- *
- * $FreeBSD$
- *
  *	last edit-date: [Tue Aug 27 13:54:08 2002]
  *
  *---------------------------------------------------------------------------*/
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "i4btel.h"
 
 #undef I4BTELDEBUG
@@ -60,7 +60,6 @@
 #include <i4b/layer4/i4b_l4.h>
 
 /* minor number: lower 6 bits = unit number */
-
 #define UNITBITS	6
 #define UNITMASK	0x3f
 #define	UNIT(n)		(minor(n) & UNITMASK)
diff --git a/sys/i4b/driver/i4b_trace.c b/sys/i4b/driver/i4b_trace.c
index 7237fc1..e601ed8 100644
--- a/sys/i4b/driver/i4b_trace.c
+++ b/sys/i4b/driver/i4b_trace.c
@@ -26,15 +26,15 @@
  *
  *	i4btrc - device driver for trace data read device
  *	---------------------------------------------------
- *
  *	last edit-date: [Sun Mar 17 09:52:51 2002]
  *
- * $FreeBSD$
- *
  *	NOTE: the code assumes that SPLI4B >= splimp !
  *
  *---------------------------------------------------------------------------*/
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "i4btrc.h"
 
 #include <sys/param.h>
diff --git a/sys/i4b/layer1/i4b_hdlc.c b/sys/i4b/layer1/i4b_hdlc.c
index 7c855ff..1c968b1 100644
--- a/sys/i4b/layer1/i4b_hdlc.c
+++ b/sys/i4b/layer1/i4b_hdlc.c
@@ -26,15 +26,14 @@
  *
  *	i4b_hdlc.c - software-HDLC constant tables
  *	------------------------------------------
- *
  *	$Id: i4b_hdlc.h,v 1.5 2000/08/28 07:41:19 hm Exp $
- *
- * $FreeBSD$
- *
  *	last edit-date: [Wed Jul 19 09:41:13 2000]
  *
  *---------------------------------------------------------------------------*/
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 
 /*---------------------------------------------------------------------------*
diff --git a/sys/i4b/layer1/i4b_l1dmux.c b/sys/i4b/layer1/i4b_l1dmux.c
index 645e14c..b130593 100644
--- a/sys/i4b/layer1/i4b_l1dmux.c
+++ b/sys/i4b/layer1/i4b_l1dmux.c
@@ -26,13 +26,13 @@
  *
  *	i4b_l1dmux.c - isdn4bsd layer 1 driver multiplexer
  *	--------------------------------------------------
- *
- * $FreeBSD$
- *
  *      last edit-date: [Wed Jan 10 16:43:24 2001]
  *
  *---------------------------------------------------------------------------*/
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 
diff --git a/sys/i4b/layer1/i4b_l1lib.c b/sys/i4b/layer1/i4b_l1lib.c
index d2e69e4..52a7d7e 100644
--- a/sys/i4b/layer1/i4b_l1lib.c
+++ b/sys/i4b/layer1/i4b_l1lib.c
@@ -26,19 +26,17 @@
  *
  *	i4b_l1lib.c - general useful L1 procedures
  *	------------------------------------------
- *
  *	$Id: i4b_l1lib.c,v 1.3 2000/05/29 15:41:41 hm Exp $
- *
- * $FreeBSD$
- *
  *      last edit-date: [Mon May 29 15:24:21 2000]
  *
  *---------------------------------------------------------------------------*/
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 
-
 #include <machine/i4b_ioctl.h>
 #include <machine/i4b_trace.h>
 
diff --git a/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c b/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c
index fc749f8..33aef81 100644
--- a/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c
+++ b/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c
@@ -26,15 +26,14 @@
  *
  *	i4b_ifpi_isac.c - i4b Fritz PCI ISAC handler
  *	--------------------------------------------
- *
  *	$Id: i4b_ifpi_isac.c,v 1.3 2000/05/29 15:41:41 hm Exp $ 
- *
- * $FreeBSD$
- *
  *      last edit-date: [Mon May 29 15:22:52 2000]
  *
  *---------------------------------------------------------------------------*/
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "opt_i4b.h"
 
 #include <sys/param.h>
@@ -42,7 +41,6 @@
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 
-
 #include <net/if.h>
 
 #include <machine/i4b_debug.h>
diff --git a/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c b/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c
index 418825d..f8cff9e 100644
--- a/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c
+++ b/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c
@@ -26,21 +26,19 @@
  *
  *	i4b_ifpi_l1.c - AVM Fritz PCI layer 1 handler
  *	---------------------------------------------
- *
  *	$Id: i4b_ifpi_l1.c,v 1.4 2000/06/02 16:14:36 hm Exp $ 
- *
- * $FreeBSD$
- *
  *      last edit-date: [Fri Jun  2 14:54:30 2000]
  *
  *---------------------------------------------------------------------------*/
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 
-
 #include <net/if.h>
 
 #include <machine/i4b_debug.h>
diff --git a/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c b/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c
index 66c66a3..42ebff6 100644
--- a/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c
+++ b/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c
@@ -26,21 +26,19 @@
  *
  *	i4b_ifpi_l1fsm.c - AVM Fritz PCI layer 1 I.430 state machine
  *	------------------------------------------------------------
- *
  *	$Id: i4b_ifpi_l1fsm.c,v 1.4 2000/05/29 15:41:41 hm Exp $ 
- *
- * $FreeBSD$
- *
  *      last edit-date: [Mon May 29 15:23:15 2000]
  *
  *---------------------------------------------------------------------------*/
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/socket.h>
 
-
 #include <net/if.h>
 
 #include <machine/i4b_debug.h>
diff --git a/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c b/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c
index 6ab166c..75a8799 100644
--- a/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c
+++ b/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c
@@ -32,15 +32,14 @@
  *
  *	i4b_ifpi_pci.c: AVM Fritz!Card PCI hardware driver
  *	--------------------------------------------------
- *
  *	$Id: i4b_ifpi_pci.c,v 1.4 2000/06/02 11:58:56 hm Exp $
- *
- * $FreeBSD$
- *
  *      last edit-date: [Fri Jan 12 17:01:26 2001]
  *
  *---------------------------------------------------------------------------*/
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "opt_i4b.h"
 
 #include <sys/param.h>
@@ -76,8 +75,8 @@
 #define PCI_AVMA1_DID 0x0a00
 
 /* prototypes */
-static void avma1pp_disable(device_t);
 
+static void avma1pp_disable(device_t);
 static void avma1pp_intr(void *);
 static void hscx_write_reg(int, u_int, u_int, struct l1_softc *);
 static u_char hscx_read_reg(int, u_int, struct l1_softc *);
diff --git a/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c b/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c
index 2550686..6006cb9 100644
--- a/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c
+++ b/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c
@@ -27,14 +27,13 @@
  *
  *	i4b_ifpi2_isac.c - i4b Fritz PCI Version 2 ISACSX handler
  *	--------------------------------------------
- *
  *	$Id$ 
  *
- * $FreeBSD$
- *
- *
  *---------------------------------------------------------------------------*/
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "opt_i4b.h"
 
 #include <sys/param.h>
diff --git a/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c b/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c
index 2dad8b0..eda4d5e 100644
--- a/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c
+++ b/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c
@@ -27,20 +27,18 @@
  *
  *	i4b_ifpi2_l1.c - AVM Fritz PCI Version 2 layer 1 handler
  *	---------------------------------------------
- *
  *	$Id$ 
  *
- * $FreeBSD$
- *
- *
  *---------------------------------------------------------------------------*/
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 
-
 #include <net/if.h>
 
 #include <machine/i4b_debug.h>
diff --git a/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c b/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c
index 7004e28..102a36b 100644
--- a/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c
+++ b/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c
@@ -26,20 +26,18 @@
  *
  *	i4b_ifpi2_l1fsm.c - AVM Fritz PCI layer 1 I.430 state machine
  *	------------------------------------------------------------
- *
  *	$Id$ 
  *
- * $FreeBSD$
- *
- *
  *---------------------------------------------------------------------------*/
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/socket.h>
 
-
 #include <net/if.h>
 
 #include <machine/i4b_debug.h>
diff --git a/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c b/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c
index a6850fc..52212f3 100644
--- a/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c
+++ b/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c
@@ -32,14 +32,13 @@
  *
  *	i4b_ifpi2_pci.c: AVM Fritz!Card PCI hardware driver
  *	--------------------------------------------------
- *
  *	$Id$
  *
- * $FreeBSD$
- *
- *
  *---------------------------------------------------------------------------*/
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include "opt_i4b.h"
 
 #include <sys/param.h>
@@ -77,7 +76,6 @@
 
 /* prototypes */
 static void avma1pp2_disable(device_t);
-
 static void avma1pp2_intr(void *);
 static void hscx_write_reg(int, u_int, struct l1_softc *);
 static u_char hscx_read_reg(int, struct l1_softc *);