release/3.0.0

9 files changed, 52 insertions, 55 deletions

diff --git a/sys/dev/hea/eni.c b/sys/dev/hea/eni.c
index 8c3e0604c1ac1..977ed9bf2060a 100644
--- a/sys/dev/hea/eni.c
+++ b/sys/dev/hea/eni.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni.c,v 1.4 1998/12/04 22:54:45 archie Exp $
+ *	@(#) $Id: eni.c,v 1.1 1998/09/15 08:22:52 phk Exp $
  *
  */
 
@@ -35,20 +35,20 @@
  *
  */
 
+#ifndef	lint
+static char *RCSid = "@(#) $Id: eni.c,v 1.1 1998/09/15 08:22:52 phk Exp $";
+#endif
+
 #include <netatm/kern_include.h>
 
 #include <dev/hea/eni_stats.h>
 #include <dev/hea/eni.h>
 #include <dev/hea/eni_var.h>
 
-#ifndef	lint
-__RCSID("@(#) $Id: eni.c,v 1.4 1998/12/04 22:54:45 archie Exp $");
-#endif
-
 /*
  * Typedef local functions
  */
-static const char	*eni_pci_probe __P((pcici_t, pcidi_t));
+static char	*eni_pci_probe __P((pcici_t, pcidi_t));
 static void	eni_pci_attach __P((pcici_t, int));
 static int 	eni_get_ack __P((Eni_unit *));
 static int	eni_get_sebyte __P((Eni_unit *));
@@ -98,7 +98,7 @@ DATA_SET ( pcidevice_set, eni_pci_device );
  *	NULL		unrecognized vendor/device
  *
  */
-static const char *
+static char *
 eni_pci_probe ( pcici_t config_id, pcidi_t device_id )
 {
 
@@ -496,12 +496,10 @@ eni_pci_attach ( pcici_t config_id, int unit )
 	 * Make a hw version number from the ID register values.
 	 * Format: {Midway ID}.{Mother board ID}.{Daughter board ID}
 	 */
-	snprintf ( eup->eu_config.ac_hard_vers,
-	    sizeof ( eup->eu_config.ac_hard_vers ),
-		"%ld/%ld/%ld",
-		(val >> ID_SHIFT) & ID_MASK,
+	sprintf ( eup->eu_config.ac_hard_vers, "%ld/%ld/%ld",
+	    (val >> ID_SHIFT) & ID_MASK,
 		(val >> MID_SHIFT) & MID_MASK,
-		(val >> DID_SHIFT) & DID_MASK );
+			(val >> DID_SHIFT) & DID_MASK );
 
 	/*
 	 * There is no software version number
diff --git a/sys/dev/hea/eni_buffer.c b/sys/dev/hea/eni_buffer.c
index 71d2eb9128caa..35d1b13ae4f88 100644
--- a/sys/dev/hea/eni_buffer.c
+++ b/sys/dev/hea/eni_buffer.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni_buffer.c,v 1.1 1998/09/15 08:22:53 phk Exp $
+ *	@(#) $Id: eni_buffer.c,v 1.8 1998/08/26 23:28:53 mks Exp $
  *
  */
 
@@ -35,16 +35,16 @@
  *
  */
 
+#ifndef lint
+static char *RCSid = "@(#) $Id: eni_buffer.c,v 1.8 1998/08/26 23:28:53 mks Exp $";
+#endif
+
 #include <netatm/kern_include.h>
 
 #include <dev/hea/eni_stats.h>
 #include <dev/hea/eni.h>
 #include <dev/hea/eni_var.h>
 
-#ifndef lint
-__RCSID("@(#) $Id: eni_buffer.c,v 1.1 1998/09/15 08:22:53 phk Exp $");
-#endif
-
 static int	eni_test_memory __P((Eni_unit *));
 
 /*
diff --git a/sys/dev/hea/eni_globals.c b/sys/dev/hea/eni_globals.c
index 71253e27a8232..a2a51fa834093 100644
--- a/sys/dev/hea/eni_globals.c
+++ b/sys/dev/hea/eni_globals.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni_globals.c,v 1.1 1998/09/15 08:22:53 phk Exp $
+ *	@(#) $Id: eni_globals.c,v 1.2 1997/05/06 22:07:52 mks Exp $
  *
  */
 
@@ -35,16 +35,16 @@
  *
  */
 
+#ifndef lint
+static char *RCSid = "@(#) $Id: eni_globals.c,v 1.2 1997/05/06 22:07:52 mks Exp $";
+#endif
+
 #include <netatm/kern_include.h>
 
 #include <dev/hea/eni_stats.h>
 #include <dev/hea/eni.h>
 #include <dev/hea/eni_var.h>
 
-#ifndef lint
-__RCSID("@(#) $Id: eni_globals.c,v 1.1 1998/09/15 08:22:53 phk Exp $");
-#endif
-
 /*
  * Device unit table
  */
diff --git a/sys/dev/hea/eni_if.c b/sys/dev/hea/eni_if.c
index 49f5e09516cdc..41ffd485b3f13 100644
--- a/sys/dev/hea/eni_if.c
+++ b/sys/dev/hea/eni_if.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni_if.c,v 1.2 1998/10/31 20:06:45 phk Exp $
+ *	@(#) $Id: eni_if.c,v 1.6 1998/08/26 23:28:53 mks Exp $
  *
  */
 
@@ -35,6 +35,10 @@
  *
  */
 
+#ifndef lint
+static char *RCSid = "@(#) $Id: eni_if.c,v 1.6 1998/08/26 23:28:53 mks Exp $";
+#endif
+
 #include <netatm/kern_include.h>
 
 #include <dev/hea/eni_stats.h>
@@ -42,10 +46,6 @@
 #include <dev/hea/eni_suni.h>
 #include <dev/hea/eni_var.h>
 
-#ifndef lint
-__RCSID("@(#) $Id: eni_if.c,v 1.2 1998/10/31 20:06:45 phk Exp $");
-#endif
-
 static void	eni_get_stats __P((Eni_unit *));
 
 /*
@@ -194,8 +194,7 @@ eni_atm_ioctl ( code, data, arg )
 		 */
 		if ( eup == NULL )
 			return ( ENXIO );
-		snprintf ( ifname, sizeof(ifname),
-		    "%s%d", pip->pif_name, pip->pif_unit );
+		sprintf ( ifname, "%s%d", pip->pif_name, pip->pif_unit );
 
 		/*
 		 * Cast response structure onto user's buffer
diff --git a/sys/dev/hea/eni_init.c b/sys/dev/hea/eni_init.c
index 5706c65adb32b..d8106ab0e763e 100644
--- a/sys/dev/hea/eni_init.c
+++ b/sys/dev/hea/eni_init.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni_init.c,v 1.1 1998/09/15 08:22:53 phk Exp $
+ *	@(#) $Id: eni_init.c,v 1.6 1998/08/26 23:28:53 mks Exp $
  *
  */
 
@@ -35,16 +35,16 @@
  *
  */
 
+#ifndef lint
+static char *RCSid = "@(#) $Id: eni_init.c,v 1.6 1998/08/26 23:28:53 mks Exp $";
+#endif
+
 #include <netatm/kern_include.h>
 
 #include <dev/hea/eni_stats.h>
 #include <dev/hea/eni.h>
 #include <dev/hea/eni_var.h>
 
-#ifndef lint
-__RCSID("@(#) $Id: eni_init.c,v 1.1 1998/09/15 08:22:53 phk Exp $");
-#endif
-
 /*
  * Initialize adapter for PDU processing
  *
diff --git a/sys/dev/hea/eni_intr.c b/sys/dev/hea/eni_intr.c
index ccc0d6bbc5475..44a6790eb88d9 100644
--- a/sys/dev/hea/eni_intr.c
+++ b/sys/dev/hea/eni_intr.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni_intr.c,v 1.2 1998/09/17 09:34:58 phk Exp $
+ *	@(#) $Id: eni_intr.c,v 1.1 1998/09/15 08:22:53 phk Exp $
  *
  */
 
@@ -35,6 +35,10 @@
  *
  */
 
+#ifndef lint
+static char *RCSid = "@(#) $Id: eni_intr.c,v 1.1 1998/09/15 08:22:53 phk Exp $";
+#endif
+
 #include <netatm/kern_include.h>
 
 #include <dev/hea/eni_stats.h>
@@ -42,10 +46,6 @@
 #include <dev/hea/eni_suni.h>
 #include <dev/hea/eni_var.h>
 
-#ifndef lint
-__RCSID("@(#) $Id: eni_intr.c,v 1.2 1998/09/17 09:34:58 phk Exp $");
-#endif
-
 static void	eni_suni_intr __P((Eni_unit *));
 
 /*
diff --git a/sys/dev/hea/eni_receive.c b/sys/dev/hea/eni_receive.c
index 8e8be36d6577b..94ce8c48a2217 100644
--- a/sys/dev/hea/eni_receive.c
+++ b/sys/dev/hea/eni_receive.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni_receive.c,v 1.2 1998/09/17 09:34:58 phk Exp $
+ *	@(#) $Id: eni_receive.c,v 1.1 1998/09/15 08:22:53 phk Exp $
  *
  */
 
@@ -35,16 +35,16 @@
  *
  */
 
+#ifndef lint
+static char *RCSid = "@(#) $Id: eni_receive.c,v 1.1 1998/09/15 08:22:53 phk Exp $";
+#endif
+
 #include <netatm/kern_include.h>
 
 #include <dev/hea/eni_stats.h>
 #include <dev/hea/eni.h>
 #include <dev/hea/eni_var.h>
 
-#ifndef lint
-__RCSID("@(#) $Id: eni_receive.c,v 1.2 1998/09/17 09:34:58 phk Exp $");
-#endif
-
 static void	eni_recv_stack __P((void *, KBuffer *));
 
 #ifdef	DIAGNOSTIC
diff --git a/sys/dev/hea/eni_transmit.c b/sys/dev/hea/eni_transmit.c
index 2721709a8fd6a..25066dfb6060f 100644
--- a/sys/dev/hea/eni_transmit.c
+++ b/sys/dev/hea/eni_transmit.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni_transmit.c,v 1.2 1998/10/18 11:58:57 phk Exp $
+ *	@(#) $Id: eni_transmit.c,v 1.20 1998/07/17 20:20:16 root Exp $
  *
  */
 
@@ -36,16 +36,16 @@
  */
 
 
+#ifndef lint
+static char *RCSid = "@(#) $Id: eni_transmit.c,v 1.20 1998/07/17 20:20:16 root Exp $";
+#endif
+
 #include <netatm/kern_include.h>
 
 #include <dev/hea/eni_stats.h>
 #include <dev/hea/eni.h>
 #include <dev/hea/eni_var.h>
 
-#ifndef lint
-__RCSID("@(#) $Id: eni_transmit.c,v 1.2 1998/10/18 11:58:57 phk Exp $");
-#endif
-
 /*
  * Make a variable which controls printing of PDUs
  * as they travel through the driver.
@@ -467,7 +467,7 @@ retry:
 			/*
 			 * Gotta slide the data up
 			 */
-			eup->eu_stats.eni_st_drv.drv_xm_segnoal++;
+			eup->eu_stats.eni_st_drv.drv_xm_segnoal;
 			bfr = cp - align;
 			KM_COPY ( cp, bfr, KB_LEN ( m ) );
 			KB_HEADMOVE ( m, -align );
diff --git a/sys/dev/hea/eni_vcm.c b/sys/dev/hea/eni_vcm.c
index a88fc01bc67ad..36c2a3dbcec53 100644
--- a/sys/dev/hea/eni_vcm.c
+++ b/sys/dev/hea/eni_vcm.c
@@ -23,7 +23,7 @@
  * Copies of this Software may be made, however, the above copyright
  * notice must be reproduced on all copies.
  *
- *	@(#) $Id: eni_vcm.c,v 1.1 1998/09/15 08:22:54 phk Exp $
+ *	@(#) $Id: eni_vcm.c,v 1.8 1998/06/29 23:03:18 mks Exp $
  *
  */
 
@@ -36,16 +36,16 @@
  */
 
 
+#ifndef lint
+static char *RCSid = "@(#) $Id: eni_vcm.c,v 1.8 1998/06/29 23:03:18 mks Exp $";
+#endif
+
 #include <netatm/kern_include.h>
 
 #include <dev/hea/eni_stats.h>
 #include <dev/hea/eni.h>
 #include <dev/hea/eni_var.h>
 
-#ifndef lint
-__RCSID("@(#) $Id: eni_vcm.c,v 1.1 1998/09/15 08:22:54 phk Exp $");
-#endif
-
 
 /*
  * VCC Stack Instantiation