summaryrefslogtreecommitdiff
path: root/sys/dev/hfa
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev/hfa')
-rw-r--r--sys/dev/hfa/fore_buffer.c8
-rw-r--r--sys/dev/hfa/fore_command.c11
-rw-r--r--sys/dev/hfa/fore_globals.c8
-rw-r--r--sys/dev/hfa/fore_if.c11
-rw-r--r--sys/dev/hfa/fore_init.c11
-rw-r--r--sys/dev/hfa/fore_intr.c8
-rw-r--r--sys/dev/hfa/fore_load.c28
-rw-r--r--sys/dev/hfa/fore_output.c8
-rw-r--r--sys/dev/hfa/fore_receive.c8
-rw-r--r--sys/dev/hfa/fore_stats.c8
-rw-r--r--sys/dev/hfa/fore_timer.c8
-rw-r--r--sys/dev/hfa/fore_transmit.c8
-rw-r--r--sys/dev/hfa/fore_vcm.c8
13 files changed, 64 insertions, 69 deletions
diff --git a/sys/dev/hfa/fore_buffer.c b/sys/dev/hfa/fore_buffer.c
index 6952f01cc23d9..d8bdce48c6d1c 100644
--- a/sys/dev/hfa/fore_buffer.c
+++ b/sys/dev/hfa/fore_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: fore_buffer.c,v 1.1 1998/09/15 08:22:54 phk Exp $
+ * @(#) $Id: fore_buffer.c,v 1.6 1997/05/06 22:09:21 mks Exp $
*
*/
@@ -35,12 +35,12 @@
*
*/
-#include <dev/hfa/fore_include.h>
-
#ifndef lint
-__RCSID("@(#) $Id: fore_buffer.c,v 1.1 1998/09/15 08:22:54 phk Exp $");
+static char *RCSid = "@(#) $Id: fore_buffer.c,v 1.6 1997/05/06 22:09:21 mks Exp $";
#endif
+#include <dev/hfa/fore_include.h>
+
/*
* Local functions
diff --git a/sys/dev/hfa/fore_command.c b/sys/dev/hfa/fore_command.c
index d8e0e9d3cd2e9..980be432deaa8 100644
--- a/sys/dev/hfa/fore_command.c
+++ b/sys/dev/hfa/fore_command.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: fore_command.c,v 1.3 1998/10/31 20:06:52 phk Exp $
+ * @(#) $Id: fore_command.c,v 1.1 1998/09/15 08:22:54 phk Exp $
*
*/
@@ -35,12 +35,12 @@
*
*/
-#include <dev/hfa/fore_include.h>
-
#ifndef lint
-__RCSID("@(#) $Id: fore_command.c,v 1.3 1998/10/31 20:06:52 phk Exp $");
+static char *RCSid = "@(#) $Id: fore_command.c,v 1.1 1998/09/15 08:22:54 phk Exp $";
#endif
+#include <dev/hfa/fore_include.h>
+
/*
* Local variables
*/
@@ -341,8 +341,7 @@ fore_cmd_drain(fup)
sizeof(struct mac_addr));
fup->fu_config.ac_macaddr =
fup->fu_pif.pif_macaddr;
- snprintf(fup->fu_config.ac_hard_vers,
- sizeof(fup->fu_config.ac_hard_vers),
+ sprintf(fup->fu_config.ac_hard_vers,
"%ld.%ld.%ld",
(fp->pr_hwver >> 16) & 0xff,
(fp->pr_hwver >> 8) & 0xff,
diff --git a/sys/dev/hfa/fore_globals.c b/sys/dev/hfa/fore_globals.c
index 5dc803a954172..4abc5fa437c30 100644
--- a/sys/dev/hfa/fore_globals.c
+++ b/sys/dev/hfa/fore_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: fore_globals.c,v 1.1 1998/09/15 08:22:55 phk Exp $
+ * @(#) $Id: fore_globals.c,v 1.6 1997/05/06 22:09:31 mks Exp $
*
*/
@@ -35,12 +35,12 @@
*
*/
-#include <dev/hfa/fore_include.h>
-
#ifndef lint
-__RCSID("@(#) $Id: fore_globals.c,v 1.1 1998/09/15 08:22:55 phk Exp $");
+static char *RCSid = "@(#) $Id: fore_globals.c,v 1.6 1997/05/06 22:09:31 mks Exp $";
#endif
+#include <dev/hfa/fore_include.h>
+
/*
* Supported device models
diff --git a/sys/dev/hfa/fore_if.c b/sys/dev/hfa/fore_if.c
index 479e7e672f816..7d3b3b6dff5f1 100644
--- a/sys/dev/hfa/fore_if.c
+++ b/sys/dev/hfa/fore_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: fore_if.c,v 1.2 1998/10/31 20:06:52 phk Exp $
+ * @(#) $Id: fore_if.c,v 1.6 1998/08/26 23:28:58 mks Exp $
*
*/
@@ -35,12 +35,12 @@
*
*/
-#include <dev/hfa/fore_include.h>
-
#ifndef lint
-__RCSID("@(#) $Id: fore_if.c,v 1.2 1998/10/31 20:06:52 phk Exp $");
+static char *RCSid = "@(#) $Id: fore_if.c,v 1.6 1998/08/26 23:28:58 mks Exp $";
#endif
+#include <dev/hfa/fore_include.h>
+
/*
* Handle netatm core service interface ioctl requests
@@ -85,8 +85,7 @@ fore_atm_ioctl(code, data, arg)
fup = (Fore_unit *)pip;
if ( pip == 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/hfa/fore_init.c b/sys/dev/hfa/fore_init.c
index 7c1ee96dd9055..d82a8f8f7a1d6 100644
--- a/sys/dev/hfa/fore_init.c
+++ b/sys/dev/hfa/fore_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: fore_init.c,v 1.3 1998/10/31 20:06:53 phk Exp $
+ * @(#) $Id: fore_init.c,v 1.1 1998/09/15 08:22:55 phk Exp $
*
*/
@@ -35,12 +35,12 @@
*
*/
-#include <dev/hfa/fore_include.h>
-
#ifndef lint
-__RCSID("@(#) $Id: fore_init.c,v 1.3 1998/10/31 20:06:53 phk Exp $");
+static char *RCSid = "@(#) $Id: fore_init.c,v 1.1 1998/09/15 08:22:55 phk Exp $";
#endif
+#include <dev/hfa/fore_include.h>
+
/*
* Local functions
@@ -122,8 +122,7 @@ fore_initialize(fup)
errmsg = "unsupported microcode version";
goto failed;
}
- snprintf(fup->fu_config.ac_firm_vers,
- sizeof(fup->fu_config.ac_firm_vers), "%ld.%ld.%ld",
+ sprintf(fup->fu_config.ac_firm_vers, "%ld.%ld.%ld",
(vers >> 16) & 0xff, (vers >> 8) & 0xff, vers & 0xff);
#ifdef notdef
diff --git a/sys/dev/hfa/fore_intr.c b/sys/dev/hfa/fore_intr.c
index 6fba5f224a7c3..f295b6267e393 100644
--- a/sys/dev/hfa/fore_intr.c
+++ b/sys/dev/hfa/fore_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: fore_intr.c,v 1.1 1998/09/15 08:22:55 phk Exp $
+ * @(#) $Id: fore_intr.c,v 1.7 1997/05/06 22:09:48 mks Exp $
*
*/
@@ -35,12 +35,12 @@
*
*/
-#include <dev/hfa/fore_include.h>
-
#ifndef lint
-__RCSID("@(#) $Id: fore_intr.c,v 1.1 1998/09/15 08:22:55 phk Exp $");
+static char *RCSid = "@(#) $Id: fore_intr.c,v 1.7 1997/05/06 22:09:48 mks Exp $";
#endif
+#include <dev/hfa/fore_include.h>
+
#if defined(sun)
/*
* Polling interrupt routine
diff --git a/sys/dev/hfa/fore_load.c b/sys/dev/hfa/fore_load.c
index e41370efe5c35..251443d252471 100644
--- a/sys/dev/hfa/fore_load.c
+++ b/sys/dev/hfa/fore_load.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: fore_load.c,v 1.4 1998/12/04 22:54:45 archie Exp $
+ * @(#) $Id: fore_load.c,v 1.1 1998/09/15 08:22:55 phk Exp $
*
*/
@@ -35,26 +35,26 @@
*
*/
-#include <dev/hfa/fore_include.h>
-
#ifndef lint
-__RCSID("@(#) $Id: fore_load.c,v 1.4 1998/12/04 22:54:45 archie Exp $");
+static char *RCSid = "@(#) $Id: fore_load.c,v 1.1 1998/09/15 08:22:55 phk Exp $";
#endif
+#include <dev/hfa/fore_include.h>
+
/*
* Local functions
*/
static int fore_start __P((void));
-#ifdef sun
static int fore_stop __P((void));
static int fore_doload __P((void));
static int fore_dounload __P((void));
+#ifdef sun
static int fore_identify __P((char *));
static int fore_attach __P((struct devinfo *));
#endif
#ifdef __FreeBSD__
-static const char * fore_pci_probe __P((pcici_t, pcidi_t));
+static char * fore_pci_probe __P((pcici_t, pcidi_t));
static void fore_pci_attach __P((pcici_t, int));
#if BSD < 199506
static int fore_pci_shutdown __P((struct kern_devconf *, int));
@@ -156,8 +156,6 @@ fore_start()
}
-#ifdef sun
-
/*
* Halt driver processing
*
@@ -242,6 +240,8 @@ fore_stop()
return (0);
}
+
+#ifdef sun
/*
* Device identify routine
*
@@ -726,12 +726,10 @@ fore_attach(devinfo_p)
val = getprop ( devinfo_p->devi_nodeid, "hw-version", -1 );
}
if (val != -1) {
- snprintf(fcp->ac_hard_vers,
- sizeof(fcp->ac_hard_vers), "%d.%d.%d",
+ sprintf(fcp->ac_hard_vers, "%d.%d.%d",
(val >> 16) & 0xff, (val >> 8) & 0xff, val & 0xff);
} else
- snprintf(fcp->ac_hard_vers,
- sizeof(fcp->ac_hard_vers), "Unknown");
+ sprintf(fcp->ac_hard_vers, "Unknown");
val = getprop ( devinfo_p->devi_nodeid, "serialnumber", -1 );
if ( val != -1 )
@@ -844,7 +842,7 @@ fore_attach(devinfo_p)
* NULL device not claimed by this driver
*
*/
-static const char *
+static char *
fore_pci_probe(config_id, device_id)
pcici_t config_id;
pcidi_t device_id;
@@ -1145,8 +1143,8 @@ fore_unattach(fup)
struct dev_info *devinfo_p = fup->fu_devinfo;
struct dev_reg *dev_reg_p;
struct dev_intr *dev_intr_p;
- int i;
#endif
+ int i;
/*
@@ -1361,7 +1359,6 @@ fore_reset(fup)
*******************************************************************
*/
-#ifdef sun
/*
* Generic module load processing
*
@@ -1421,6 +1418,7 @@ fore_dounload()
}
+#ifdef sun
/*
* Loadable driver description
*/
diff --git a/sys/dev/hfa/fore_output.c b/sys/dev/hfa/fore_output.c
index d92d5a01ca481..59c82c939dc3a 100644
--- a/sys/dev/hfa/fore_output.c
+++ b/sys/dev/hfa/fore_output.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: fore_output.c,v 1.1 1998/09/15 08:22:55 phk Exp $
+ * @(#) $Id: fore_output.c,v 1.7 1998/02/19 20:10:34 mks Exp $
*
*/
@@ -35,12 +35,12 @@
*
*/
-#include <dev/hfa/fore_include.h>
-
#ifndef lint
-__RCSID("@(#) $Id: fore_output.c,v 1.1 1998/09/15 08:22:55 phk Exp $");
+static char *RCSid = "@(#) $Id: fore_output.c,v 1.7 1998/02/19 20:10:34 mks Exp $";
#endif
+#include <dev/hfa/fore_include.h>
+
/*
* Local functions
diff --git a/sys/dev/hfa/fore_receive.c b/sys/dev/hfa/fore_receive.c
index 431a03f17cba8..12dfcec0d69ce 100644
--- a/sys/dev/hfa/fore_receive.c
+++ b/sys/dev/hfa/fore_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: fore_receive.c,v 1.2 1998/09/17 09:34:59 phk Exp $
+ * @(#) $Id: fore_receive.c,v 1.1 1998/09/15 08:22:55 phk Exp $
*
*/
@@ -35,12 +35,12 @@
*
*/
-#include <dev/hfa/fore_include.h>
-
#ifndef lint
-__RCSID("@(#) $Id: fore_receive.c,v 1.2 1998/09/17 09:34:59 phk Exp $");
+static char *RCSid = "@(#) $Id: fore_receive.c,v 1.1 1998/09/15 08:22:55 phk Exp $";
#endif
+#include <dev/hfa/fore_include.h>
+
/*
* Local functions
diff --git a/sys/dev/hfa/fore_stats.c b/sys/dev/hfa/fore_stats.c
index c1a1fab14e817..c70b09879a7a1 100644
--- a/sys/dev/hfa/fore_stats.c
+++ b/sys/dev/hfa/fore_stats.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: fore_stats.c,v 1.2 1998/09/17 09:34:59 phk Exp $
+ * @(#) $Id: fore_stats.c,v 1.1 1998/09/15 08:22:55 phk Exp $
*
*/
@@ -35,12 +35,12 @@
*
*/
-#include <dev/hfa/fore_include.h>
-
#ifndef lint
-__RCSID("@(#) $Id: fore_stats.c,v 1.2 1998/09/17 09:34:59 phk Exp $");
+static char *RCSid = "@(#) $Id: fore_stats.c,v 1.1 1998/09/15 08:22:55 phk Exp $";
#endif
+#include <dev/hfa/fore_include.h>
+
/*
* Get device statistics from CP
diff --git a/sys/dev/hfa/fore_timer.c b/sys/dev/hfa/fore_timer.c
index 15cb02efbe65d..e0d0c0ee0a39a 100644
--- a/sys/dev/hfa/fore_timer.c
+++ b/sys/dev/hfa/fore_timer.c
@@ -23,7 +23,7 @@
* Copies of this Software may be made, however, the above copyright
* notice must be reproduced on all copies.
*
- * @(#) $Id: fore_timer.c,v 1.1 1998/09/15 08:22:56 phk Exp $
+ * @(#) $Id: fore_timer.c,v 1.5 1997/05/06 22:10:24 mks Exp $
*
*/
@@ -35,12 +35,12 @@
*
*/
-#include <dev/hfa/fore_include.h>
-
#ifndef lint
-__RCSID("@(#) $Id: fore_timer.c,v 1.1 1998/09/15 08:22:56 phk Exp $");
+static char *RCSid = "@(#) $Id: fore_timer.c,v 1.5 1997/05/06 22:10:24 mks Exp $";
#endif
+#include <dev/hfa/fore_include.h>
+
/*
* Process a Fore timer tick
diff --git a/sys/dev/hfa/fore_transmit.c b/sys/dev/hfa/fore_transmit.c
index bced06c25e67f..744e7751c7568 100644
--- a/sys/dev/hfa/fore_transmit.c
+++ b/sys/dev/hfa/fore_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: fore_transmit.c,v 1.1 1998/09/15 08:22:56 phk Exp $
+ * @(#) $Id: fore_transmit.c,v 1.8 1998/07/17 20:19:37 root Exp $
*
*/
@@ -35,12 +35,12 @@
*
*/
-#include <dev/hfa/fore_include.h>
-
#ifndef lint
-__RCSID("@(#) $Id: fore_transmit.c,v 1.1 1998/09/15 08:22:56 phk Exp $");
+static char *RCSid = "@(#) $Id: fore_transmit.c,v 1.8 1998/07/17 20:19:37 root Exp $";
#endif
+#include <dev/hfa/fore_include.h>
+
/*
* Allocate Transmit Queue Data Structures
diff --git a/sys/dev/hfa/fore_vcm.c b/sys/dev/hfa/fore_vcm.c
index 325883b31b6eb..2481d17c20bab 100644
--- a/sys/dev/hfa/fore_vcm.c
+++ b/sys/dev/hfa/fore_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: fore_vcm.c,v 1.2 1998/09/17 09:34:59 phk Exp $
+ * @(#) $Id: fore_vcm.c,v 1.1 1998/09/15 08:22:56 phk Exp $
*
*/
@@ -35,12 +35,12 @@
*
*/
-#include <dev/hfa/fore_include.h>
-
#ifndef lint
-__RCSID("@(#) $Id: fore_vcm.c,v 1.2 1998/09/17 09:34:59 phk Exp $");
+static char *RCSid = "@(#) $Id: fore_vcm.c,v 1.1 1998/09/15 08:22:56 phk Exp $";
#endif
+#include <dev/hfa/fore_include.h>
+
/*
* VCC Stack Instantiation