aboutsummaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/hea/eni.c8
-rw-r--r--sys/dev/hea/eni_intr.c6
-rw-r--r--sys/dev/hea/eni_receive.c6
-rw-r--r--sys/dev/hfa/fore_command.c9
-rw-r--r--sys/dev/hfa/fore_init.c26
-rw-r--r--sys/dev/hfa/fore_load.c32
-rw-r--r--sys/dev/hfa/fore_receive.c10
-rw-r--r--sys/dev/hfa/fore_stats.c6
-rw-r--r--sys/dev/hfa/fore_vcm.c12
9 files changed, 58 insertions, 57 deletions
diff --git a/sys/dev/hea/eni.c b/sys/dev/hea/eni.c
index 088503aa1993..977ed9bf2060 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/06/29 19:39:10 jpt Exp $
+ * @(#) $Id: eni.c,v 1.1 1998/09/15 08:22:52 phk Exp $
*
*/
@@ -36,7 +36,7 @@
*/
#ifndef lint
-static char *RCSid = "@(#) $Id: eni.c,v 1.4 1998/06/29 19:39:10 jpt Exp $";
+static char *RCSid = "@(#) $Id: eni.c,v 1.1 1998/09/15 08:22:52 phk Exp $";
#endif
#include <netatm/kern_include.h>
@@ -496,7 +496,7 @@ 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}
*/
- sprintf ( eup->eu_config.ac_hard_vers, "%d/%d/%d",
+ 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 );
@@ -504,7 +504,7 @@ eni_pci_attach ( pcici_t config_id, int unit )
/*
* There is no software version number
*/
- sprintf ( eup->eu_config.ac_firm_vers, "\0" );
+ eup->eu_config.ac_firm_vers[0] = '\0';
/*
* Save device ram info for user-level programs
diff --git a/sys/dev/hea/eni_intr.c b/sys/dev/hea/eni_intr.c
index e0a5642a229a..44a6790eb88d 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.4 1998/08/26 23:28:54 mks Exp $
+ * @(#) $Id: eni_intr.c,v 1.1 1998/09/15 08:22:53 phk Exp $
*
*/
@@ -36,7 +36,7 @@
*/
#ifndef lint
-static char *RCSid = "@(#) $Id: eni_intr.c,v 1.4 1998/08/26 23:28:54 mks Exp $";
+static char *RCSid = "@(#) $Id: eni_intr.c,v 1.1 1998/09/15 08:22:53 phk Exp $";
#endif
#include <netatm/kern_include.h>
@@ -174,7 +174,7 @@ eni_intr ( arg )
* Handle miscelaneous interrupts
*/
if ( mask & ENI_INT_STAT ) { /* STAT_OVFL */
- log ( LOG_INFO, "eni_intr: stat_ovfl: 0x%x\n", sval );
+ log ( LOG_INFO, "eni_intr: stat_ovfl: 0x%lx\n", sval );
}
if ( mask & ENI_INT_SUNI ) { /* SUNI_INTR */
eni_suni_intr ( eup );
diff --git a/sys/dev/hea/eni_receive.c b/sys/dev/hea/eni_receive.c
index 097f29741d03..94ce8c48a221 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.13 1998/08/07 22:14:13 mks Exp $
+ * @(#) $Id: eni_receive.c,v 1.1 1998/09/15 08:22:53 phk Exp $
*
*/
@@ -36,7 +36,7 @@
*/
#ifndef lint
-static char *RCSid = "@(#) $Id: eni_receive.c,v 1.13 1998/08/07 22:14:13 mks Exp $";
+static char *RCSid = "@(#) $Id: eni_receive.c,v 1.1 1998/09/15 08:22:53 phk Exp $";
#endif
#include <netatm/kern_include.h>
@@ -852,7 +852,7 @@ eni_recv_stack ( tok, m )
if ( !m ) {
#ifdef DO_LOG
log ( LOG_ERR,
- "eni_recv_stack: NULL buffer, tok = 0x%x\n", tok );
+ "eni_recv_stack: NULL buffer, tok = %p\n", tok );
#endif
return;
}
diff --git a/sys/dev/hfa/fore_command.c b/sys/dev/hfa/fore_command.c
index 29b99c6b84e9..980be432deaa 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.10 1998/06/29 21:42:09 mks Exp $
+ * @(#) $Id: fore_command.c,v 1.1 1998/09/15 08:22:54 phk Exp $
*
*/
@@ -36,7 +36,7 @@
*/
#ifndef lint
-static char *RCSid = "@(#) $Id: fore_command.c,v 1.10 1998/06/29 21:42:09 mks 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>
@@ -341,7 +341,8 @@ fore_cmd_drain(fup)
sizeof(struct mac_addr));
fup->fu_config.ac_macaddr =
fup->fu_pif.pif_macaddr;
- sprintf(fup->fu_config.ac_hard_vers, "%d.%d.%d",
+ sprintf(fup->fu_config.ac_hard_vers,
+ "%ld.%ld.%ld",
(fp->pr_hwver >> 16) & 0xff,
(fp->pr_hwver >> 8) & 0xff,
fp->pr_hwver & 0xff);
@@ -354,7 +355,7 @@ fore_cmd_drain(fup)
#endif /* FORE_PCI */
default:
- log(LOG_ERR, "fore_cmd_drain: unknown command %d\n",
+ log(LOG_ERR, "fore_cmd_drain: unknown command %ld\n",
hcp->hcq_code);
}
diff --git a/sys/dev/hfa/fore_init.c b/sys/dev/hfa/fore_init.c
index 61f4f0132e37..d82a8f8f7a1d 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.7 1997/05/06 22:09:43 mks Exp $
+ * @(#) $Id: fore_init.c,v 1.1 1998/09/15 08:22:55 phk Exp $
*
*/
@@ -36,7 +36,7 @@
*/
#ifndef lint
-static char *RCSid = "@(#) $Id: fore_init.c,v 1.7 1997/05/06 22:09:43 mks 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>
@@ -122,7 +122,7 @@ fore_initialize(fup)
errmsg = "unsupported microcode version";
goto failed;
}
- sprintf(fup->fu_config.ac_firm_vers, "%d.%d.%d",
+ sprintf(fup->fu_config.ac_firm_vers, "%ld.%ld.%ld",
(vers >> 16) & 0xff, (vers >> 8) & 0xff, vers & 0xff);
#ifdef notdef
@@ -211,21 +211,21 @@ fore_initialize_complete(fup)
if (CP_READ(aap->aali_init.init_status) & QSTAT_ERROR) {
log(LOG_ERR,
- "fore initialization failed: intf=%s%d, hbeat=0x%x\n",
+ "fore initialization failed: intf=%s%d, hbeat=0x%lx\n",
fup->fu_pif.pif_name, fup->fu_pif.pif_unit,
CP_READ(aap->aali_heartbeat));
return;
}
- ATM_DEBUG1("heap=0x%x\n", aap->aali_heap);
- ATM_DEBUG1("heaplen=0x%x\n", aap->aali_heaplen);
- ATM_DEBUG1("cmd_q=0x%x\n", aap->aali_cmd_q);
- ATM_DEBUG1("xmit_q=0x%x\n", aap->aali_xmit_q);
- ATM_DEBUG1("recv_q=0x%x\n", aap->aali_recv_q);
- ATM_DEBUG1("buf1s_q=0x%x\n", aap->aali_buf1s_q);
- ATM_DEBUG1("buf1l_q=0x%x\n", aap->aali_buf1l_q);
- ATM_DEBUG1("buf2s_q=0x%x\n", aap->aali_buf2s_q);
- ATM_DEBUG1("buf2l_q=0x%x\n", aap->aali_buf2l_q);
+ ATM_DEBUG1("heap=0x%lx\n", aap->aali_heap);
+ ATM_DEBUG1("heaplen=0x%lx\n", aap->aali_heaplen);
+ ATM_DEBUG1("cmd_q=0x%lx\n", aap->aali_cmd_q);
+ ATM_DEBUG1("xmit_q=0x%lx\n", aap->aali_xmit_q);
+ ATM_DEBUG1("recv_q=0x%lx\n", aap->aali_recv_q);
+ ATM_DEBUG1("buf1s_q=0x%lx\n", aap->aali_buf1s_q);
+ ATM_DEBUG1("buf1l_q=0x%lx\n", aap->aali_buf1l_q);
+ ATM_DEBUG1("buf2s_q=0x%lx\n", aap->aali_buf2s_q);
+ ATM_DEBUG1("buf2l_q=0x%lx\n", aap->aali_buf2l_q);
/*
* Initialize all of our queues
diff --git a/sys/dev/hfa/fore_load.c b/sys/dev/hfa/fore_load.c
index 4250ddcbe79c..251443d25247 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.12 1998/06/29 21:42:14 mks Exp $
+ * @(#) $Id: fore_load.c,v 1.1 1998/09/15 08:22:55 phk Exp $
*
*/
@@ -36,7 +36,7 @@
*/
#ifndef lint
-static char *RCSid = "@(#) $Id: fore_load.c,v 1.12 1998/06/29 21:42:14 mks 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>
@@ -363,19 +363,19 @@ fore_attach(devinfo_p)
fore_units[unit] = fup;
unit++;
- ATM_DEBUG1("fore_attach: fup=0x%x\n", (int)fup);
- ATM_DEBUG2("\tfu_xmit_q=0x%x fu_xmit_head=0x%x\n",
- (int)fup->fu_xmit_q, (int)&fup->fu_xmit_head);
- ATM_DEBUG2("\tfu_recv_q=0x%x fu_recv_head=0x%x\n",
- (int)fup->fu_recv_q, (int)&fup->fu_recv_head);
- ATM_DEBUG2("\tfu_buf1s_q=0x%x fu_buf1s_head=0x%x\n",
- (int)fup->fu_buf1s_q, (int)&fup->fu_buf1s_head);
- ATM_DEBUG2("\tfu_buf1l_q=0x%x fu_buf1l_head=0x%x\n",
- (int)fup->fu_buf1l_q, (int)&fup->fu_buf1l_head);
- ATM_DEBUG2("\tfu_cmd_q=0x%x fu_cmd_head=0x%x\n",
- (int)fup->fu_cmd_q, (int)&fup->fu_cmd_head);
- ATM_DEBUG1("\tfu_stats=0x%x\n",
- (int)&fup->fu_stats);
+ ATM_DEBUG1("fore_attach: fup=%p\n", fup);
+ ATM_DEBUG2("\tfu_xmit_q=%p fu_xmit_head=%p\n",
+ fup->fu_xmit_q, &fup->fu_xmit_head);
+ ATM_DEBUG2("\tfu_recv_q=%p fu_recv_head=%p\n",
+ fup->fu_recv_q, &fup->fu_recv_head);
+ ATM_DEBUG2("\tfu_buf1s_q=%p fu_buf1s_head=%p\n",
+ fup->fu_buf1s_q, &fup->fu_buf1s_head);
+ ATM_DEBUG2("\tfu_buf1l_q=%p fu_buf1l_head=%p\n",
+ fup->fu_buf1l_q, &fup->fu_buf1l_head);
+ ATM_DEBUG2("\tfu_cmd_q=%p fu_cmd_head=%p\n",
+ fup->fu_cmd_q, &fup->fu_cmd_head);
+ ATM_DEBUG1("\tfu_stats=%p\n",
+ &fup->fu_stats);
/*
* Tell kernel our unit number
@@ -991,7 +991,7 @@ fore_pci_attach(config_id, unit)
FORE_DEV_NAME, unit);
goto failed;
} else if ( --err_count == 0 ) {
- log(LOG_ERR, "%s%d: unable to boot - status=0x%x\n",
+ log(LOG_ERR, "%s%d: unable to boot - status=0x%lx\n",
FORE_DEV_NAME, unit,
CP_READ(fup->fu_mon->mon_bstat));
goto failed;
diff --git a/sys/dev/hfa/fore_receive.c b/sys/dev/hfa/fore_receive.c
index f9a9d1961ed2..12dfcec0d69c 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.10 1998/07/17 20:19:35 root Exp $
+ * @(#) $Id: fore_receive.c,v 1.1 1998/09/15 08:22:55 phk Exp $
*
*/
@@ -36,7 +36,7 @@
*/
#ifndef lint
-static char *RCSid = "@(#) $Id: fore_receive.c,v 1.10 1998/07/17 20:19:35 root 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>
@@ -278,7 +278,7 @@ retry:
if (vcp->vc_nif)
vcp->vc_nif->nif_if.if_ierrors++;
}
- ATM_DEBUG1("fore receive error: hdr=0x%x\n", hdr);
+ ATM_DEBUG1("fore receive error: hdr=0x%lx\n", hdr);
error = 1;
}
@@ -316,8 +316,8 @@ retry:
default:
log(LOG_ERR,
- "fore_recv_drain: bhp=0x%x type=0x%x\n",
- (int)bhp, bhp->bh_type);
+ "fore_recv_drain: bhp=%p type=0x%x\n",
+ bhp, bhp->bh_type);
panic("fore_recv_drain: bad buffer type");
}
diff --git a/sys/dev/hfa/fore_stats.c b/sys/dev/hfa/fore_stats.c
index a8271a20e26b..c70b09879a7a 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.5 1997/08/22 18:41:21 mks Exp $
+ * @(#) $Id: fore_stats.c,v 1.1 1998/09/15 08:22:55 phk Exp $
*
*/
@@ -36,7 +36,7 @@
*/
#ifndef lint
-static char *RCSid = "@(#) $Id: fore_stats.c,v 1.5 1997/08/22 18:41:21 mks 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>
@@ -68,7 +68,7 @@ fore_get_stats(fup)
Cmd_queue *cqp;
int s, sst;
- ATM_DEBUG1("fore_get_stats: fup=0x%x\n", (int)fup);
+ ATM_DEBUG1("fore_get_stats: fup=%p\n", fup);
/*
* Make sure device has been initialized
diff --git a/sys/dev/hfa/fore_vcm.c b/sys/dev/hfa/fore_vcm.c
index 3efea6a46deb..2481d17c20ba 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.7 1998/06/29 21:42:20 mks Exp $
+ * @(#) $Id: fore_vcm.c,v 1.1 1998/09/15 08:22:56 phk Exp $
*
*/
@@ -36,7 +36,7 @@
*/
#ifndef lint
-static char *RCSid = "@(#) $Id: fore_vcm.c,v 1.7 1998/06/29 21:42:20 mks 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>
@@ -133,8 +133,8 @@ fore_openvcc(cup, cvp)
vcp = fvp->fv_connvc->cvc_vcc;
- ATM_DEBUG4("fore_openvcc: fup=0x%x, fvp=0x%x, vcc=(%d,%d)\n",
- (int)fup, (int)fvp, vcp->vc_vpi, vcp->vc_vci);
+ ATM_DEBUG4("fore_openvcc: fup=%p, fvp=%p, vcc=(%d,%d)\n",
+ fup, fvp, vcp->vc_vpi, vcp->vc_vci);
/*
* Validate the VPI and VCI values
@@ -229,8 +229,8 @@ fore_closevcc(cup, cvp)
vcp = fvp->fv_connvc->cvc_vcc;
- ATM_DEBUG4("fore_closevcc: fup=0x%x, fvp=0x%x, vcc=(%d,%d)\n",
- (int)fup, (int)fvp, vcp->vc_vpi, vcp->vc_vci);
+ ATM_DEBUG4("fore_closevcc: fup=%p, fvp=%p, vcc=(%d,%d)\n",
+ fup, fvp, vcp->vc_vpi, vcp->vc_vci);
DEVICE_LOCK((Cmn_unit *)fup);
generated by cgit v1.3 (git 2.53.0) at 2026-07-27 13:35:31 +0000