diff options
49 files changed, 348 insertions, 343 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index e211f5f..524ca50 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1,5 +1,5 @@ # -# $Id: Makefile.inc1,v 1.14 1998/09/15 11:44:30 phk Exp $ +# $Id: Makefile.inc1,v 1.15 1998/09/17 03:56:23 gibbs Exp $ # # Make command line options: # -DCLOBBER will remove /usr/include @@ -561,6 +561,7 @@ includes: cd ${.CURDIR}/lib/csu/${MACHINE_ARCH}; ${MAKE} beforeinstall .endif cd ${.CURDIR}/lib/libalias; ${MAKE} beforeinstall + cd ${.CURDIR}/lib/libatm; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libdevstat; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libc; ${MAKE} beforeinstall cd ${.CURDIR}/lib/libcalendar; ${MAKE} beforeinstall diff --git a/sbin/atm/atm/Makefile b/sbin/atm/atm/Makefile index 31ff5d2..6d5667b 100644 --- a/sbin/atm/atm/Makefile +++ b/sbin/atm/atm/Makefile @@ -23,7 +23,7 @@ # Copies of this Software may be made, however, the above copyright # notice must be reproduced on all copies. # -# @(#) $Id: Makefile,v 1.1 1998/09/15 08:22:44 phk Exp $ +# @(#) $Id: Makefile,v 1.2 1998/09/15 19:16:25 phk Exp $ # # @@ -34,5 +34,6 @@ MAN8= atm.8 CFLAGS+= -I${.CURDIR}/../../../sys LDADD+= -latm +DPADD+= ${LIBATM} .include <bsd.prog.mk> diff --git a/sbin/atm/fore_dnld/Makefile b/sbin/atm/fore_dnld/Makefile index 0f3d543..fef11f3 100644 --- a/sbin/atm/fore_dnld/Makefile +++ b/sbin/atm/fore_dnld/Makefile @@ -23,7 +23,7 @@ # Copies of this Software may be made, however, the above copyright # notice must be reproduced on all copies. # -# @(#) $Id: Makefile,v 1.1 1998/09/15 08:22:46 phk Exp $ +# @(#) $Id: Makefile,v 1.2 1998/09/15 19:16:32 phk Exp $ # # @@ -32,5 +32,6 @@ MAN8= fore_dnld.8 CFLAGS+= -I${.CURDIR}/../../../sys LDADD+= -latm +DPADD+= ${LIBATM} .include <bsd.prog.mk> diff --git a/sbin/atm/ilmid/Makefile b/sbin/atm/ilmid/Makefile index aa0ede3..6082855 100644 --- a/sbin/atm/ilmid/Makefile +++ b/sbin/atm/ilmid/Makefile @@ -23,7 +23,7 @@ # Copies of this Software may be made, however, the above copyright # notice must be reproduced on all copies. # -# @(#) $Id: Makefile,v 1.1 1998/09/15 08:22:47 phk Exp $ +# @(#) $Id: Makefile,v 1.2 1998/09/15 19:16:32 phk Exp $ # # @@ -32,5 +32,6 @@ MAN8= ilmid.8 CFLAGS+= -I${.CURDIR}/../../../sys LDADD+= -latm +DPADD+= ${LIBATM} .include <bsd.prog.mk> diff --git a/share/mk/bsd.libnames.mk b/share/mk/bsd.libnames.mk index 868f978..37476aa 100644 --- a/share/mk/bsd.libnames.mk +++ b/share/mk/bsd.libnames.mk @@ -1,4 +1,4 @@ -# $Id: bsd.libnames.mk,v 1.16 1998/09/09 17:51:15 markm Exp $ +# $Id: bsd.libnames.mk,v 1.17 1998/09/15 10:27:20 gibbs Exp $ # # The include file <bsd.libnames.mk> define library names. # Other include files (e.g. bsd.prog.mk, bsd.lib.mk) include this @@ -10,6 +10,7 @@ LIBKZHEAD?= ${DESTDIR}${LIBDIR}/kzhead.o LIBKZTAIL?= ${DESTDIR}${LIBDIR}/kztail.o LIBALIAS?= ${DESTDIR}${LIBDIR}/libalias.a +LIBATM?= ${DESTDIR}${LIBDIR}/libatm.a LIBC?= ${DESTDIR}${LIBDIR}/libc.a LIBC_PIC= ${DESTDIR}${LIBDIR}/libc_pic.a LIBCALENDAR?= ${DESTDIR}${LIBDIR}/libcalendar.a diff --git a/sys/dev/hea/eni.c b/sys/dev/hea/eni.c index 088503a..977ed9b 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 e0a5642..44a6790 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 097f297..94ce8c4 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 29b99c6..980be43 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 61f4f01..d82a8f8 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 4250ddc..251443d 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 f9a9d19..12dfcec 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 a8271a2..c70b098 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 3efea6a..2481d17 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); diff --git a/sys/netatm/atm_aal5.c b/sys/netatm/atm_aal5.c index c0e8fe4..4d365dd 100644 --- a/sys/netatm/atm_aal5.c +++ b/sys/netatm/atm_aal5.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: atm_aal5.c,v 1.4 1998/07/30 22:30:46 mks Exp $ + * @(#) $Id: atm_aal5.c,v 1.1 1998/09/15 08:22:57 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: atm_aal5.c,v 1.4 1998/07/30 22:30:46 mks Exp $"; +static char *RCSid = "@(#) $Id: atm_aal5.c,v 1.1 1998/09/15 08:22:57 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -186,7 +186,7 @@ static Atm_attributes atm_aal5_defattr = { #define ATM_INTRO(f) \ int s, err = 0; \ s = splnet(); \ - ATM_DEBUG2("aal5 socket %s (0x%x)\n", f, (int)so); \ + ATM_DEBUG2("aal5 socket %s (%p)\n", f, so); \ /* \ * Stack queue should have been drained \ */ \ diff --git a/sys/netatm/atm_cm.c b/sys/netatm/atm_cm.c index 55612e3..4304b56 100644 --- a/sys/netatm/atm_cm.c +++ b/sys/netatm/atm_cm.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: atm_cm.c,v 1.8 1998/08/06 18:10:42 mks Exp $ + * @(#) $Id: atm_cm.c,v 1.1 1998/09/15 08:22:57 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: atm_cm.c,v 1.8 1998/08/06 18:10:42 mks Exp $"; +static char *RCSid = "@(#) $Id: atm_cm.c,v 1.1 1998/09/15 08:22:57 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -1065,8 +1065,8 @@ atm_cm_abort(cvp, cause) Atm_connvc *cvp; struct t_atm_cause *cause; { - ATM_DEBUG2("atm_cm_abort: cvp=0x%x cause=%d\n", - (int)cvp, cause->cause_value); + ATM_DEBUG2("atm_cm_abort: cvp=%p cause=%d\n", + cvp, cause->cause_value); /* * Note that we're aborting @@ -1106,8 +1106,8 @@ atm_cm_abort(cvp, cause) default: log(LOG_ERR, - "atm_cm_abort: invalid state: cvp=0x%x, state=%d\n", - (int)cvp, cvp->cvc_state); + "atm_cm_abort: invalid state: cvp=%p, state=%d\n", + cvp, cvp->cvc_state); } return (0); } @@ -2630,8 +2630,8 @@ atm_cm_timeout(tip) default: logerr: log(LOG_ERR, - "atm_cm_timeout: invalid state: cvp=0x%x, state=%d\n", - (int)cvp, cvp->cvc_state); + "atm_cm_timeout: invalid state: cvp=%p, state=%d\n", + cvp, cvp->cvc_state); } } diff --git a/sys/netatm/atm_device.c b/sys/netatm/atm_device.c index 7f26695..3a65880 100644 --- a/sys/netatm/atm_device.c +++ b/sys/netatm/atm_device.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: atm_device.c,v 1.7 1998/03/24 20:42:39 mks Exp $ + * @(#) $Id: atm_device.c,v 1.1 1998/09/15 08:22:57 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: atm_device.c,v 1.7 1998/03/24 20:42:39 mks Exp $"; +static char *RCSid = "@(#) $Id: atm_device.c,v 1.1 1998/09/15 08:22:57 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -235,8 +235,8 @@ atm_dev_lower(cmd, tok, arg1, arg2) */ if ( cvp->cv_state != CVS_INST ) { log ( LOG_ERR, - "atm_dev_lower: INIT: tok=0x%x, state=%d\n", - (int)tok, cvp->cv_state ); + "atm_dev_lower: INIT: tok=%p, state=%d\n", + tok, cvp->cv_state ); break; } @@ -251,8 +251,8 @@ atm_dev_lower(cmd, tok, arg1, arg2) vcp->vc_type & (VCC_IN | VCC_OUT)) != cvp){ log ( LOG_ERR, - "atm_dev_lower: dup SVC (%d,%d) tok=0x%x\n", - vcp->vc_vpi, vcp->vc_vci, (int)tok ); + "atm_dev_lower: dup SVC (%d,%d) tok=%p\n", + vcp->vc_vpi, vcp->vc_vci, tok ); atm_cm_abort(cvp->cv_connvc, &atm_dev_cause); break; } @@ -347,8 +347,8 @@ atm_dev_lower(cmd, tok, arg1, arg2) if ((state != CVS_ACTIVE) && (state != CVS_INITED)) { log ( LOG_ERR, - "atm_dev_lower: UNITDATA: tok=0x%x, state=%d\n", - (int)tok, state ); + "atm_dev_lower: UNITDATA: tok=%p, state=%d\n", + tok, state ); KB_FREEALL((KBuffer *)arg1); break; } @@ -362,14 +362,14 @@ atm_dev_lower(cmd, tok, arg1, arg2) case CPCS_UABORT_INV: log ( LOG_ERR, - "atm_dev_lower: unimplemented stack cmd 0x%x, tok=0x%x\n", - cmd, (int)tok ); + "atm_dev_lower: unimplemented stack cmd 0x%x, tok=%p\n", + cmd, tok ); break; default: log ( LOG_ERR, - "atm_dev_lower: unknown stack cmd 0x%x, tok=0x%x\n", - cmd, (int)tok ); + "atm_dev_lower: unknown stack cmd 0x%x, tok=%p\n", + cmd, tok ); } @@ -506,8 +506,8 @@ atm_dev_alloc(size, align, flags) */ KM_ZERO(mep->me_uaddr, size); - ATM_DEBUG4("atm_dev_alloc: size=%d, align=%d, flags=%d, uaddr=0x%x\n", - size, align, flags, (int)mep->me_uaddr); + ATM_DEBUG4("atm_dev_alloc: size=%d, align=%d, flags=%d, uaddr=%p\n", + size, align, flags, mep->me_uaddr); (void) splx(s); @@ -538,7 +538,7 @@ atm_dev_free(uaddr) Mem_ent *mep; int s, i; - ATM_DEBUG1("atm_dev_free: uaddr=0x%x\n", (int)uaddr); + ATM_DEBUG1("atm_dev_free: uaddr=%p\n", uaddr); s = splimp(); diff --git a/sys/netatm/atm_subr.c b/sys/netatm/atm_subr.c index 40fc433..3fcf36e 100644 --- a/sys/netatm/atm_subr.c +++ b/sys/netatm/atm_subr.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: atm_subr.c,v 1.10 1998/05/18 19:06:02 mks Exp $ + * @(#) $Id: atm_subr.c,v 1.1 1998/09/15 08:22:59 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: atm_subr.c,v 1.10 1998/05/18 19:06:02 mks Exp $"; +static char *RCSid = "@(#) $Id: atm_subr.c,v 1.1 1998/09/15 08:22:59 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -953,8 +953,8 @@ atm_pdu_print(m, msg) printf("%s:", msg); while (m) { KB_DATASTART(m, cp, caddr_t); - printf("%cbfr=0x%x data=0x%x len=%d: ", - c, (int)m, (int)cp, KB_LEN(m)); + printf("%cbfr=%p data=%p len=%d: ", + c, m, cp, KB_LEN(m)); c = '\t'; if (atm_print_data) { for (i = 0; i < KB_LEN(m); i++) { diff --git a/sys/netatm/atm_sys.h b/sys/netatm/atm_sys.h index 4cfb031..d6e9745 100644 --- a/sys/netatm/atm_sys.h +++ b/sys/netatm/atm_sys.h @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: atm_sys.h,v 1.12 1998/05/18 19:05:57 mks Exp $ + * @(#) $Id: atm_sys.h,v 1.1 1998/09/15 08:22:59 phk Exp $ * */ @@ -241,7 +241,7 @@ struct sp_link { delta.tv_sec--; \ delta.tv_usec += 1000000; \ } \ - printf("%3d.%6d: ", delta.tv_sec, delta.tv_usec); + printf("%3ld.%6ld: ", delta.tv_sec, delta.tv_usec); #define ATM_DEBUG0(f) if (atm_debug) {ATM_TIME; printf(f);} #define ATM_DEBUGN0(f) if (atm_debug) {printf(f);} diff --git a/sys/netatm/ipatm/ipatm_event.c b/sys/netatm/ipatm/ipatm_event.c index 048edf9..842ee64 100644 --- a/sys/netatm/ipatm/ipatm_event.c +++ b/sys/netatm/ipatm/ipatm_event.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: ipatm_event.c,v 1.8 1998/08/06 18:21:13 mks Exp $ + * @(#) $Id: ipatm_event.c,v 1.1 1998/09/15 08:23:00 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: ipatm_event.c,v 1.8 1998/08/06 18:21:13 mks Exp $"; +static char *RCSid = "@(#) $Id: ipatm_event.c,v 1.1 1998/09/15 08:23:00 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -128,8 +128,8 @@ ipatm_timeout(tip) break; default: - log(LOG_ERR, "ipatm: invalid timer state: ivp=0x%x, state=%d\n", - (int)ivp, ivp->iv_state); + log(LOG_ERR, "ipatm: invalid timer state: ivp=%p, state=%d\n", + ivp, ivp->iv_state); } } @@ -383,8 +383,8 @@ ipatm_arpnotify(ivp, event) break; default: - log(LOG_ERR, "ipatm: unknown arp event %d, ivp=0x%x\n", - event, (int)ivp); + log(LOG_ERR, "ipatm: unknown arp event %d, ivp=%p\n", + event, ivp); } } diff --git a/sys/netatm/ipatm/ipatm_vcm.c b/sys/netatm/ipatm/ipatm_vcm.c index 5d6a7fc..cb8f46b 100644 --- a/sys/netatm/ipatm/ipatm_vcm.c +++ b/sys/netatm/ipatm/ipatm_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: ipatm_vcm.c,v 1.13 1998/08/06 18:21:14 mks Exp $ + * @(#) $Id: ipatm_vcm.c,v 1.1 1998/09/15 08:23:01 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: ipatm_vcm.c,v 1.13 1998/08/06 18:21:14 mks Exp $"; +static char *RCSid = "@(#) $Id: ipatm_vcm.c,v 1.1 1998/09/15 08:23:01 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -1093,8 +1093,8 @@ ipatm_closevc(ivp, code) default: log(LOG_ERR, - "ipatm_closevc: unknown state: ivp=0x%x, state=%d\n", - (int)ivp, ivp->iv_state); + "ipatm_closevc: unknown state: ivp=%p, state=%d\n", + ivp, ivp->iv_state); } /* diff --git a/sys/netatm/spans/spans_if.c b/sys/netatm/spans/spans_if.c index 4facf73..6546ae2 100644 --- a/sys/netatm/spans/spans_if.c +++ b/sys/netatm/spans/spans_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: spans_if.c,v 1.12 1998/08/26 23:29:09 mks Exp $ + * @(#) $Id: spans_if.c,v 1.1 1998/09/15 08:23:03 phk Exp $ * */ @@ -37,7 +37,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: spans_if.c,v 1.12 1998/08/26 23:29:09 mks Exp $"; +static char *RCSid = "@(#) $Id: spans_if.c,v 1.1 1998/09/15 08:23:03 phk Exp $"; #endif #ifndef ATM_SPANS_MODULE @@ -256,7 +256,7 @@ spans_attach(smp, pip) struct spans *spp = NULL; struct atm_nif *np; - ATM_DEBUG2("spans_attach: smp=%x, pip=%x\n", smp, pip); + ATM_DEBUG2("spans_attach: smp=%p, pip=%p\n", smp, pip); /* * Count network interfaces attached to the physical interface. @@ -377,7 +377,7 @@ spans_detach(pip) Atm_connection *cop; int err; - ATM_DEBUG1("spans_detach: pip=0x%x\n", pip); + ATM_DEBUG1("spans_detach: pip=%p\n", pip); /* * Get SPANS protocol instance @@ -420,7 +420,7 @@ spans_detach(pip) */ err = spans_clear_vcc(spp, (struct spans_vccb *)vcp); if (err) { - log(LOG_ERR, "spans: error %d clearing VCCB 0x%x\n", + log(LOG_ERR, "spans: error %d clearing VCCB %p\n", err, vcp); } } @@ -432,7 +432,7 @@ spans_detach(pip) err = atm_cm_release(cop, &spans_cause); if (err) ATM_DEBUG2( - "spans_detach: close failed for SPANS signalling channel; cop=0x%x, err=%d\n", + "spans_detach: close failed for SPANS signalling channel; cop=%p, err=%d\n", cop, err); } @@ -494,7 +494,7 @@ spans_setup(cvp, errp) struct spans *spp = (struct spans *)pip->pif_siginst; int rc = 0; - ATM_DEBUG1("spans_setup: cvp=0x%x\n", cvp); + ATM_DEBUG1("spans_setup: cvp=%p\n", cvp); /* * Intialize the returned error code @@ -560,7 +560,7 @@ spans_release(vcp, errp) struct atm_pif *pip = vcp->vc_pif; struct spans *spp = (struct spans *)pip->pif_siginst; - ATM_DEBUG1("spans_release: vcp=0x%x\n", vcp); + ATM_DEBUG1("spans_release: vcp=%p\n", vcp); /* * Initialize returned error code @@ -632,7 +632,7 @@ spans_accept(vcp, errp) struct spans *spp = (struct spans *)pip->pif_siginst; struct spans_vccb *svp = (struct spans_vccb *)vcp; - ATM_DEBUG1("spans_accept: vcp=0x%x\n", vcp); + ATM_DEBUG1("spans_accept: vcp=%p\n", vcp); /* * Initialize the returned error code @@ -704,7 +704,7 @@ spans_reject(vcp, errp) struct spans *spp = (struct spans *)pip->pif_siginst; struct spans_vccb *svp = (struct spans_vccb *)vcp; - ATM_DEBUG1("spans_reject: vcp=0x%x\n", vcp); + ATM_DEBUG1("spans_reject: vcp=%p\n", vcp); /* * Initialize the returned error code @@ -818,7 +818,7 @@ spans_free(vcp) struct atm_pif *pip = vcp->vc_pif; struct spans *spp = (struct spans *)pip->pif_siginst; - ATM_DEBUG1("spans_free: vcp = 0x%x\n", vcp); + ATM_DEBUG1("spans_free: vcp = %p\n", vcp); /* * Make sure VCC has been closed diff --git a/sys/netatm/spans/spans_msg.c b/sys/netatm/spans/spans_msg.c index 0dc5df9..1ce9a50 100644 --- a/sys/netatm/spans/spans_msg.c +++ b/sys/netatm/spans/spans_msg.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: spans_msg.c,v 1.8 1998/08/26 23:29:09 mks Exp $ + * @(#) $Id: spans_msg.c,v 1.1 1998/09/15 08:23:03 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: spans_msg.c,v 1.8 1998/08/26 23:29:09 mks Exp $"; +static char *RCSid = "@(#) $Id: spans_msg.c,v 1.1 1998/09/15 08:23:03 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -136,7 +136,7 @@ spans_send_msg(spp, msg) XDR xdrs; #ifdef NOTDEF - ATM_DEBUG2("spans_send_msg: msg=0x%x, type=%d\n", msg, + ATM_DEBUG2("spans_send_msg: msg=%p, type=%d\n", msg, msg->sm_type); if (msg->sm_type != SPANS_STAT_REQ && msg->sm_type != SPANS_STAT_IND && @@ -207,7 +207,7 @@ spans_send_open_req(spp, svp) spans_msg *req; int err = 0; - ATM_DEBUG1("spans_send_open_req: svp=0x%x\n", svp); + ATM_DEBUG1("spans_send_open_req: svp=%p\n", svp); /* * Get memory for a request message @@ -265,7 +265,7 @@ spans_send_open_rsp(spp, svp, result) spans_msg *rsp; int rc; - ATM_DEBUG2("spans_send_open_rsp: svp=0x%x, result=%d\n", svp, + ATM_DEBUG2("spans_send_open_rsp: svp=%p, result=%d\n", svp, result); /* @@ -317,7 +317,7 @@ spans_send_close_req(spp, svp) spans_msg *req; int err = 0; - ATM_DEBUG1("spans_send_close_req: svp=0x%x\n", svp); + ATM_DEBUG1("spans_send_close_req: svp=%p\n", svp); /* * Get memory for a close request @@ -540,7 +540,7 @@ spans_open_req(spp, msg) Aal_t aal; Atm_attributes call_attrs; - ATM_DEBUG2("spans_open_req: spp=0x%x, msg=0x%x\n", spp, msg); + ATM_DEBUG2("spans_open_req: spp=%p, msg=%p\n", spp, msg); /* * See if the connection is new @@ -833,7 +833,7 @@ spans_open_rsp(spp, msg) { struct spans_vccb *svp; - ATM_DEBUG2("spans_open_rsp: spp=0x%x, msg=0x%x\n", spp, msg); + ATM_DEBUG2("spans_open_rsp: spp=%p, msg=%p\n", spp, msg); /* * Locate the VCCB for the connection @@ -935,7 +935,7 @@ spans_close_req(spp, msg) u_char outstate; Atm_connvc *cvp; - ATM_DEBUG2("spans_close_req: spp=0x%x, msg=0x%x\n", spp, msg); + ATM_DEBUG2("spans_close_req: spp=%p, msg=%p\n", spp, msg); /* * Locate the VCCB for the connection @@ -1055,7 +1055,7 @@ spans_close_rsp(spp, msg) { struct spans_vccb *svp; - ATM_DEBUG2("spans_close_rsp: spp=0x%x, msg=0x%x\n", spp, msg); + ATM_DEBUG2("spans_close_rsp: spp=%p, msg=%p\n", spp, msg); /* * Locate the VCCB for the connection @@ -1371,7 +1371,7 @@ spans_query_req(spp, msg) struct spans_vccb *svp = NULL; spans_msg *rsp_msg; - ATM_DEBUG1("spans_query_req: msg=0x%x\n", msg); + ATM_DEBUG1("spans_query_req: msg=%p\n", msg); /* * Ignore an end-to-end query diff --git a/sys/netatm/spans/spans_print.c b/sys/netatm/spans/spans_print.c index 60dc670..117324c 100644 --- a/sys/netatm/spans/spans_print.c +++ b/sys/netatm/spans/spans_print.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: spans_print.c,v 1.4 1997/05/06 22:17:11 mks Exp $ + * @(#) $Id: spans_print.c,v 1.1 1998/09/15 08:23:03 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: spans_print.c,v 1.4 1997/05/06 22:17:11 mks Exp $"; +static char *RCSid = "@(#) $Id: spans_print.c,v 1.1 1998/09/15 08:23:03 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -876,7 +876,7 @@ spans_print_msgbody(objp) switch (objp->mb_type) { case SPANS_STAT_REQ: streq_p = &objp->spans_msgbody_u.mb_stat_req; - printf("es_epoch=0x%x", streq_p->streq_es_epoch); + printf("es_epoch=0x%lx", streq_p->streq_es_epoch); break; case SPANS_STAT_IND: stind_p = &objp->spans_msgbody_u.mb_stat_ind; @@ -884,7 +884,7 @@ spans_print_msgbody(objp) sizeof(daddr)); strncpy(saddr, spans_addr_print(&stind_p->stind_sw_addr), sizeof(daddr)); - printf("sw_epoch=0x%x, es_addr=%s, sw_addr=0x%s", + printf("sw_epoch=0x%lx, es_addr=%s, sw_addr=0x%s", stind_p->stind_sw_epoch, daddr, saddr); break; @@ -892,7 +892,7 @@ spans_print_msgbody(objp) strsp_p = &objp->spans_msgbody_u.mb_stat_rsp; strncpy(daddr, spans_addr_print(&strsp_p->strsp_es_addr), sizeof(daddr)); - printf("es_epoch=0x%x, es_addr=%s", + printf("es_epoch=0x%lx, es_addr=%s", strsp_p->strsp_es_epoch, daddr); break; case SPANS_OPEN_REQ: diff --git a/sys/netatm/spans/spans_proto.c b/sys/netatm/spans/spans_proto.c index e298ed8..b0e0f1e 100644 --- a/sys/netatm/spans/spans_proto.c +++ b/sys/netatm/spans/spans_proto.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: spans_proto.c,v 1.7 1998/08/26 23:29:10 mks Exp $ + * @(#) $Id: spans_proto.c,v 1.1 1998/09/15 08:23:03 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: spans_proto.c,v 1.7 1998/08/26 23:29:10 mks Exp $"; +static char *RCSid = "@(#) $Id: spans_proto.c,v 1.1 1998/09/15 08:23:03 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -200,8 +200,8 @@ spans_timer(tip) spp = (struct spans *) ((caddr_t)tip - (int)(&((struct spans *)0)->sp_time)); - ATM_DEBUG2("spans_timer: spp=0x%x,state=%d\n", - (int)spp, spp->sp_state); + ATM_DEBUG2("spans_timer: spp=%p,state=%d\n", + spp, spp->sp_state); /* * Process timeout based on protocol state @@ -314,8 +314,8 @@ spans_timer(tip) break; default: - log(LOG_ERR, "spans: timer state: spp=0x%x, state=%d\n", - (int)spp, spp->sp_state); + log(LOG_ERR, "spans: timer state: spp=%p, state=%d\n", + spp, spp->sp_state); } } @@ -350,8 +350,8 @@ spans_vctimer(tip) (int)(&((struct vccb *)0)->vc_time)); spp = (struct spans *)svp->sv_pif->pif_siginst; - ATM_DEBUG3("spans_vctimer: svp=0x%x, sstate=%d, ustate=%d\n", - (int)svp, svp->sv_sstate, svp->sv_ustate); + ATM_DEBUG3("spans_vctimer: svp=%p, sstate=%d, ustate=%d\n", + svp, svp->sv_sstate, svp->sv_ustate); /* * Process timeout based on protocol state @@ -444,8 +444,8 @@ spans_vctimer(tip) break; default: - log(LOG_ERR, "spans: vctimer state: svp=0x%x, sstate=%d\n", - (int)svp, svp->sv_sstate); + log(LOG_ERR, "spans: vctimer state: svp=%p, sstate=%d\n", + svp, svp->sv_sstate); } } @@ -486,14 +486,13 @@ spans_connected(tok) { struct spans *spp = (struct spans *)tok; - ATM_DEBUG2("spans_connected: spp=0x%x,state=%d\n", - (int)spp, spp->sp_state); + ATM_DEBUG2("spans_connected: spp=%p,state=%d\n", + spp, spp->sp_state); /* * Connected routine shouldn't ever get called for a PVC */ - log(LOG_ERR, "spans: connected function called, tok=0x%x\n", - (int)spp); + log(LOG_ERR, "spans: connected function called, tok=%p\n", spp); } @@ -548,8 +547,8 @@ spans_cpcs_data(tok, m) { struct spans *spp = tok; - ATM_DEBUG3("spans_cpcs_data: spp=0x%x,state=%d,m=0x%x,\n", - (int)spp, spp->sp_state, m); + ATM_DEBUG3("spans_cpcs_data: spp=%p,state=%d,m=%p,\n", + spp, spp->sp_state, m); /* * Process data diff --git a/sys/netatm/spans/spans_subr.c b/sys/netatm/spans/spans_subr.c index 48b9705..a6e720f 100644 --- a/sys/netatm/spans/spans_subr.c +++ b/sys/netatm/spans/spans_subr.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: spans_subr.c,v 1.9 1998/08/26 23:29:10 mks Exp $ + * @(#) $Id: spans_subr.c,v 1.1 1998/09/15 08:23:04 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: spans_subr.c,v 1.9 1998/08/26 23:29:10 mks Exp $"; +static char *RCSid = "@(#) $Id: spans_subr.c,v 1.1 1998/09/15 08:23:04 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -77,7 +77,7 @@ spans_open_vcc(spp, cvp) spans_aal aal; int err, pvc, vpi, vci; - ATM_DEBUG2("spans_open_vcc: spp=0x%x, cvp=0x%x\n", spp, cvp); + ATM_DEBUG2("spans_open_vcc: spp=%p, cvp=%p\n", spp, cvp); /* * Validate user parameters. AAL and encapsulation are @@ -269,7 +269,7 @@ spans_close_vcc(spp, svp, force) { int err = 0; - ATM_DEBUG2("spans_close_vcc: svp=0x%x, state=%d\n", svp, + ATM_DEBUG2("spans_close_vcc: svp=%p, state=%d\n", svp, svp->sv_sstate); /* @@ -361,7 +361,7 @@ spans_clear_vcc(spp, svp) { u_char outstate; - ATM_DEBUG2("spans_clear_vcc: svp=0x%x, state=%d\n", svp, + ATM_DEBUG2("spans_clear_vcc: svp=%p, state=%d\n", svp, svp->sv_sstate); /* @@ -438,7 +438,7 @@ spans_switch_reset(spp, cause) int s; struct vccb *vcp, *vnext; - ATM_DEBUG2("spans_switch_reset: spp=0x%x, cause=%d\n", + ATM_DEBUG2("spans_switch_reset: spp=%p, cause=%d\n", spp, cause); /* @@ -486,7 +486,7 @@ spans_switch_reset(spp, cause) break; } } else { - log(LOG_ERR, "spans: invalid VCC type: vccb=0x%x, type=%d\n", + log(LOG_ERR, "spans: invalid VCC type: vccb=%p, type=%d\n", vcp, vcp->vc_type); } } diff --git a/sys/netatm/spans/spans_util.c b/sys/netatm/spans/spans_util.c index 6d470e1..f3f0235 100644 --- a/sys/netatm/spans/spans_util.c +++ b/sys/netatm/spans/spans_util.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: spans_util.c,v 1.6 1998/08/26 23:29:10 mks Exp $ + * @(#) $Id: spans_util.c,v 1.1 1998/09/15 08:23:04 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: spans_util.c,v 1.6 1998/08/26 23:29:10 mks Exp $"; +static char *RCSid = "@(#) $Id: spans_util.c,v 1.1 1998/09/15 08:23:04 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -441,7 +441,7 @@ spans_addr_print(p) /* * Print and return the string */ - sprintf(strbuff, "%x.%x", ntohl(u1.w), ntohl(u2.w)); + sprintf(strbuff, "%lx.%lx", ntohl(u1.w), ntohl(u2.w)); return(strbuff); } @@ -468,7 +468,7 @@ spans_dump_buffer(m) KB_DATASTART(m, cp, caddr_t); for (i = 0; i < KB_LEN(m); i++) { if (i == 0) - printf(" bfr=0x%x: ", (int)m); + printf(" bfr=%p: ", m); printf("%x ", (u_char)*cp++); } printf("<end_bfr>\n"); diff --git a/sys/netatm/uni/sscf_uni.c b/sys/netatm/uni/sscf_uni.c index b5fd7fb..0582580 100644 --- a/sys/netatm/uni/sscf_uni.c +++ b/sys/netatm/uni/sscf_uni.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: sscf_uni.c,v 1.6 1998/03/24 21:10:38 mks Exp $ + * @(#) $Id: sscf_uni.c,v 1.1 1998/09/15 08:23:06 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: sscf_uni.c,v 1.6 1998/03/24 21:10:38 mks Exp $"; +static char *RCSid = "@(#) $Id: sscf_uni.c,v 1.1 1998/09/15 08:23:06 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -188,7 +188,7 @@ sscf_uni_inst(ssp, cvp) struct univcc *uvp; int err; - ATM_DEBUG2("sscf_uni_inst: ssp=0x%x, cvp=0x%x\n", ssp, cvp); + ATM_DEBUG2("sscf_uni_inst: ssp=%p, cvp=%p\n", ssp, cvp); /* * Validate lower SAP diff --git a/sys/netatm/uni/sscf_uni_lower.c b/sys/netatm/uni/sscf_uni_lower.c index fe2d839..9639d96 100644 --- a/sys/netatm/uni/sscf_uni_lower.c +++ b/sys/netatm/uni/sscf_uni_lower.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: sscf_uni_lower.c,v 1.6 1998/04/07 23:23:26 mks Exp $ + * @(#) $Id: sscf_uni_lower.c,v 1.1 1998/09/15 08:23:06 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: sscf_uni_lower.c,v 1.6 1998/04/07 23:23:26 mks Exp $"; +static char *RCSid = "@(#) $Id: sscf_uni_lower.c,v 1.1 1998/09/15 08:23:06 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -92,8 +92,8 @@ sscf_uni_lower(cmd, tok, arg1, arg2) enum sscop_vers vers; int err; - ATM_DEBUG5("sscf_uni_lower: cmd=0x%x, uvp=0x%x, ustate=%d, arg1=0x%x, arg2=0x%x\n", - cmd, (int)uvp, uvp->uv_ustate, arg1, arg2); + ATM_DEBUG5("sscf_uni_lower: cmd=0x%x, uvp=%p, ustate=%d, arg1=0x%x, arg2=0x%x\n", + cmd, uvp, uvp->uv_ustate, arg1, arg2); switch (cmd) { @@ -370,8 +370,8 @@ sscf_uni_lower(cmd, tok, arg1, arg2) break; default: - log(LOG_ERR, "sscf_uni_lower: unknown cmd 0x%x, uvp=0x%x\n", - cmd, (int)uvp); + log(LOG_ERR, "sscf_uni_lower: unknown cmd 0x%x, uvp=%p\n", + cmd, uvp); } return; diff --git a/sys/netatm/uni/sscf_uni_upper.c b/sys/netatm/uni/sscf_uni_upper.c index 2febb5c..a979260 100644 --- a/sys/netatm/uni/sscf_uni_upper.c +++ b/sys/netatm/uni/sscf_uni_upper.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: sscf_uni_upper.c,v 1.7 1998/06/29 22:15:31 mks Exp $ + * @(#) $Id: sscf_uni_upper.c,v 1.1 1998/09/15 08:23:06 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: sscf_uni_upper.c,v 1.7 1998/06/29 22:15:31 mks Exp $"; +static char *RCSid = "@(#) $Id: sscf_uni_upper.c,v 1.1 1998/09/15 08:23:06 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -74,8 +74,8 @@ sscf_uni_upper(cmd, tok, arg1, arg2) Atm_connvc *cvp = uvp->uv_connvc; int err; - ATM_DEBUG5("sscf_uni_upper: cmd=0x%x, uvp=0x%x, lstate=%d, arg1=0x%x, arg2=0x%x\n", - cmd, (int)uvp, uvp->uv_lstate, arg1, arg2); + ATM_DEBUG5("sscf_uni_upper: cmd=0x%x, uvp=%p, lstate=%d, arg1=0x%x, arg2=0x%x\n", + cmd, uvp, uvp->uv_lstate, arg1, arg2); switch (cmd) { @@ -616,8 +616,8 @@ seqerr: * Not supported */ default: - log(LOG_ERR, "sscf_uni_upper: unknown cmd 0x%x, uvp=0x%x\n", - cmd, (int)uvp); + log(LOG_ERR, "sscf_uni_upper: unknown cmd 0x%x, uvp=%p\n", + cmd, uvp); } return; diff --git a/sys/netatm/uni/sscop.c b/sys/netatm/uni/sscop.c index d65118b..d4a2dfb 100644 --- a/sys/netatm/uni/sscop.c +++ b/sys/netatm/uni/sscop.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: sscop.c,v 1.6 1998/03/24 21:10:43 mks Exp $ + * @(#) $Id: sscop.c,v 1.1 1998/09/15 08:23:06 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: sscop.c,v 1.6 1998/03/24 21:10:43 mks Exp $"; +static char *RCSid = "@(#) $Id: sscop.c,v 1.1 1998/09/15 08:23:06 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -238,7 +238,7 @@ sscop_inst(ssp, cvp) struct sscop *sop; int err; - ATM_DEBUG2("sscop_inst: ssp=0x%x, cvp=0x%x\n", ssp, cvp); + ATM_DEBUG2("sscop_inst: ssp=%p, cvp=%p\n", ssp, cvp); /* * Validate lower SAP diff --git a/sys/netatm/uni/sscop_lower.c b/sys/netatm/uni/sscop_lower.c index f76f702..536ed03 100644 --- a/sys/netatm/uni/sscop_lower.c +++ b/sys/netatm/uni/sscop_lower.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: sscop_lower.c,v 1.6 1998/04/07 23:21:28 mks Exp $ + * @(#) $Id: sscop_lower.c,v 1.1 1998/09/15 08:23:07 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: sscop_lower.c,v 1.6 1998/04/07 23:21:28 mks Exp $"; +static char *RCSid = "@(#) $Id: sscop_lower.c,v 1.1 1998/09/15 08:23:07 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -124,8 +124,8 @@ sscop_lower(cmd, tok, arg1, arg2) void (*func) __P((struct sscop *, int, int)); int val; - ATM_DEBUG5("sscop_lower: cmd=0x%x, sop=0x%x, state=%d, arg1=0x%x, arg2=0x%x\n", - cmd, (int)sop, sop->so_state, arg1, arg2); + ATM_DEBUG5("sscop_lower: cmd=0x%x, sop=%p, state=%d, arg1=0x%x, arg2=0x%x\n", + cmd, sop, sop->so_state, arg1, arg2); /* * Validate stack command @@ -136,8 +136,8 @@ sscop_lower(cmd, tok, arg1, arg2) ((stab = (sop->so_vers == SSCOP_VERS_QSAAL ? sscop_qsaal_aatab[val] : sscop_q2110_aatab[val])) == NULL)) { - log(LOG_ERR, "sscop_lower: unknown cmd 0x%x, sop=0x%x\n", - cmd, (int)sop); + log(LOG_ERR, "sscop_lower: unknown cmd 0x%x, sop=%p\n", + cmd, sop); return; } @@ -145,8 +145,8 @@ sscop_lower(cmd, tok, arg1, arg2) * Validate sscop state */ if (sop->so_state > SOS_MAXSTATE) { - log(LOG_ERR, "sscop_lower: invalid state sop=0x%x, state=%d\n", - (int)sop, sop->so_state); + log(LOG_ERR, "sscop_lower: invalid state sop=%p, state=%d\n", + sop, sop->so_state); /* * Release possible buffer */ @@ -163,8 +163,8 @@ sscop_lower(cmd, tok, arg1, arg2) func = stab[sop->so_state]; if (func == NULL) { log(LOG_ERR, - "sscop_lower: invalid cmd/state: sop=0x%x, cmd=0x%x, state=%d\n", - (int)sop, cmd, sop->so_state); + "sscop_lower: invalid cmd/state: sop=%p, cmd=0x%x, state=%d\n", + sop, cmd, sop->so_state); /* * Release possible buffer */ diff --git a/sys/netatm/uni/sscop_subr.c b/sys/netatm/uni/sscop_subr.c index 2d01229..88656ad 100644 --- a/sys/netatm/uni/sscop_subr.c +++ b/sys/netatm/uni/sscop_subr.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: sscop_subr.c,v 1.7 1998/08/26 23:29:19 mks Exp $ + * @(#) $Id: sscop_subr.c,v 1.1 1998/09/15 08:23:08 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: sscop_subr.c,v 1.7 1998/08/26 23:29:19 mks Exp $"; +static char *RCSid = "@(#) $Id: sscop_subr.c,v 1.1 1998/09/15 08:23:08 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -364,8 +364,8 @@ sscop_rexmit_unlink(sop, php) sop->so_rexmit_tl = curr; } else { log(LOG_ERR, - "sscop_rexmit_unlink: Not found - sop=0x%x, php=0x%x\n", - (int)sop, (int)php); + "sscop_rexmit_unlink: Not found - sop=%p, php=%p\n", + sop, php); #ifdef DIAGNOSTIC panic("sscop_rexmit_unlink: Not found"); #endif diff --git a/sys/netatm/uni/sscop_timer.c b/sys/netatm/uni/sscop_timer.c index 8c23344b..c66525b 100644 --- a/sys/netatm/uni/sscop_timer.c +++ b/sys/netatm/uni/sscop_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: sscop_timer.c,v 1.6 1998/04/07 23:21:48 mks Exp $ + * @(#) $Id: sscop_timer.c,v 1.1 1998/09/15 08:23:08 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: sscop_timer.c,v 1.6 1998/04/07 23:21:48 mks Exp $"; +static char *RCSid = "@(#) $Id: sscop_timer.c,v 1.1 1998/09/15 08:23:08 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -121,8 +121,8 @@ sscop_timeout(tip) "CC", "IDLE" }; - ATM_DEBUG3("sscop_timer: %s expired, sop=0x%x, state=%d\n", - tn[i], (int)sop, sop->so_state); + ATM_DEBUG3("sscop_timer: %s expired, sop=%p, state=%d\n", + tn[i], sop, sop->so_state); } #endif @@ -170,8 +170,8 @@ sscop_poll_expire(sop) if ((sop->so_state != SOS_READY) && ((sop->so_state != SOS_INRESYN) || (sop->so_vers != SSCOP_VERS_QSAAL))) { - log(LOG_ERR, "sscop: invalid %s state: sop=0x%x, state=%d\n", - "Timer_POLL", (int)sop, sop->so_state); + log(LOG_ERR, "sscop: invalid %s state: sop=%p, state=%d\n", + "Timer_POLL", sop, sop->so_state); return; } @@ -214,8 +214,8 @@ sscop_idle_expire(sop) * Timer_IDLE only valid in READY state */ if (sop->so_state != SOS_READY) { - log(LOG_ERR, "sscop: invalid %s state: sop=0x%x, state=%d\n", - "Timer_IDLE", (int)sop, sop->so_state); + log(LOG_ERR, "sscop: invalid %s state: sop=%p, state=%d\n", + "Timer_IDLE", sop, sop->so_state); return; } @@ -266,8 +266,8 @@ sscop_noresponse_expire(sop) if ((sop->so_state != SOS_READY) && ((sop->so_state != SOS_INRESYN) || (sop->so_vers != SSCOP_VERS_QSAAL))) { - log(LOG_ERR, "sscop: invalid %s state: sop=0x%x, state=%d\n", - "Timer_NORESPONSE", (int)sop, sop->so_state); + log(LOG_ERR, "sscop: invalid %s state: sop=%p, state=%d\n", + "Timer_NORESPONSE", sop, sop->so_state); return; } @@ -569,8 +569,8 @@ rexmitrs: break; default: - log(LOG_ERR, "sscop: invalid %s state: sop=0x%x, state=%d\n", - "Timer_CC", (int)sop, sop->so_state); + log(LOG_ERR, "sscop: invalid %s state: sop=%p, state=%d\n", + "Timer_CC", sop, sop->so_state); } } diff --git a/sys/netatm/uni/sscop_upper.c b/sys/netatm/uni/sscop_upper.c index be9556d..162b48c 100644 --- a/sys/netatm/uni/sscop_upper.c +++ b/sys/netatm/uni/sscop_upper.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: sscop_upper.c,v 1.6 1998/08/26 23:29:20 mks Exp $ + * @(#) $Id: sscop_upper.c,v 1.1 1998/09/15 08:23:08 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: sscop_upper.c,v 1.6 1998/08/26 23:29:20 mks Exp $"; +static char *RCSid = "@(#) $Id: sscop_upper.c,v 1.1 1998/09/15 08:23:08 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -199,8 +199,8 @@ sscop_upper(cmd, tok, arg1, arg2) caddr_t trlr; int type; - ATM_DEBUG5("sscop_upper: cmd=0x%x, sop=0x%x, state=%d, arg1=0x%x, arg2=0x%x\n", - cmd, (int)sop, sop->so_state, arg1, arg2); + ATM_DEBUG5("sscop_upper: cmd=0x%x, sop=%p, state=%d, arg1=0x%x, arg2=0x%x\n", + cmd, sop, sop->so_state, arg1, arg2); switch (cmd) { @@ -218,8 +218,8 @@ sscop_upper(cmd, tok, arg1, arg2) */ if (sop->so_state > SOS_MAXSTATE) { log(LOG_ERR, - "sscop_upper: invalid state sop=0x%x, state=%d\n", - (int)sop, sop->so_state); + "sscop_upper: invalid state sop=%p, state=%d\n", + sop, sop->so_state); KB_FREEALL((KBuffer *)arg1); return; } @@ -241,8 +241,8 @@ sscop_upper(cmd, tok, arg1, arg2) break; default: - log(LOG_ERR, "sscop_upper: unknown cmd 0x%x, sop=0x%x\n", - cmd, (int)sop); + log(LOG_ERR, "sscop_upper: unknown cmd 0x%x, sop=%p\n", + cmd, sop); } return; diff --git a/sys/netatm/uni/uniarp.c b/sys/netatm/uni/uniarp.c index f316a73..e0448a8 100644 --- a/sys/netatm/uni/uniarp.c +++ b/sys/netatm/uni/uniarp.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: uniarp.c,v 1.10 1998/07/20 18:58:45 mks Exp $ + * @(#) $Id: uniarp.c,v 1.1 1998/09/15 08:23:09 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: uniarp.c,v 1.10 1998/07/20 18:58:45 mks Exp $"; +static char *RCSid = "@(#) $Id: uniarp.c,v 1.1 1998/09/15 08:23:09 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -181,7 +181,7 @@ uniarp_ipact(uip) { struct unisig *usp; - ATM_DEBUG1("uniarp_ipact: uip=0x%x\n", (int)uip); + ATM_DEBUG1("uniarp_ipact: uip=%p\n", uip); /* * Set initial state @@ -229,7 +229,7 @@ uniarp_ipdact(uip) struct uniarp *uap, *unext; int i; - ATM_DEBUG1("uniarp_ipdact: uip=0x%x\n", (int)uip); + ATM_DEBUG1("uniarp_ipdact: uip=%p\n", uip); /* * Delete all interface entries @@ -337,7 +337,7 @@ uniarp_ifaddr(sip) struct atm_nif *nip; struct uniip *uip; - ATM_DEBUG1("uniarp_ifaddr: sip=0x%x\n", (int)sip); + ATM_DEBUG1("uniarp_ifaddr: sip=%p\n", sip); /* * We've got to handle this for every network interface @@ -406,7 +406,7 @@ uniarp_server_mode(uip) struct uniarp *uap, *unext; int i; - ATM_DEBUG1("uniarp_server_mode: uip=0x%x\n", (int)uip); + ATM_DEBUG1("uniarp_server_mode: uip=%p\n", uip); /* * Handle client/server mode changes first @@ -525,8 +525,8 @@ uniarp_client_mode(uip, aap) struct ipvcc *ivp, *inext; int i; - ATM_DEBUG2("uniarp_client_mode: uip=0x%x, atm=(%s,-)\n", - (int)uip, aap ? unisig_addr_print(aap): "-"); + ATM_DEBUG2("uniarp_client_mode: uip=%p, atm=(%s,-)\n", + uip, aap ? unisig_addr_print(aap): "-"); /* * Handle client/server mode changes first @@ -747,7 +747,7 @@ uniarp_iftimeout(tip) uip = (struct uniip *) ((caddr_t)tip - (int)(&((struct uniip *)0)->uip_arptime)); - ATM_DEBUG2("uniarp_iftimeout: uip=0x%x, state=%d\n", (int)uip, + ATM_DEBUG2("uniarp_iftimeout: uip=%p, state=%d\n", uip, uip->uip_arpstate); /* diff --git a/sys/netatm/uni/uniarp_vcm.c b/sys/netatm/uni/uniarp_vcm.c index 9b1f211..338d2b5 100644 --- a/sys/netatm/uni/uniarp_vcm.c +++ b/sys/netatm/uni/uniarp_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: uniarp_vcm.c,v 1.10 1998/06/29 22:15:46 mks Exp $ + * @(#) $Id: uniarp_vcm.c,v 1.1 1998/09/15 08:23:10 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: uniarp_vcm.c,v 1.10 1998/06/29 22:15:46 mks Exp $"; +static char *RCSid = "@(#) $Id: uniarp_vcm.c,v 1.1 1998/09/15 08:23:10 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -92,7 +92,7 @@ uniarp_pvcopen(ivp) struct uniarp *uap; int s, err; - ATM_DEBUG1("uniarp_pvcopen: ivp=0x%x\n", (int)ivp); + ATM_DEBUG1("uniarp_pvcopen: ivp=%p\n", ivp); ivp->iv_arpent = NULL; @@ -195,7 +195,7 @@ uniarp_svcout(ivp, dst) struct uniarp *uap; int s = splnet(); - ATM_DEBUG2("uniarp_svcout: ivp=0x%x,dst=0x%x\n", (int)ivp, dst->s_addr); + ATM_DEBUG2("uniarp_svcout: ivp=%p,dst=0x%x\n", ivp, dst->s_addr); ivp->iv_arpent = NULL; @@ -332,7 +332,7 @@ uniarp_svcin(ivp, dst, dstsub) struct uniarp *uap; int found = 0, i, s = splnet(); - ATM_DEBUG1("uniarp_svcin: ivp=0x%x\n", (int)ivp); + ATM_DEBUG1("uniarp_svcin: ivp=%p\n", ivp); /* * Clear ARP entry field @@ -476,7 +476,7 @@ uniarp_svcactive(ivp) struct uniarp *uap; int err, s = splnet(); - ATM_DEBUG1("uniarp_svcactive: ivp=0x%x\n", (int)ivp); + ATM_DEBUG1("uniarp_svcactive: ivp=%p\n", ivp); inp = ivp->iv_ipnif; uip = (struct uniip *)inp->inf_isintf; @@ -571,7 +571,7 @@ uniarp_vcclose(ivp) struct uniarp *uap; int s; - ATM_DEBUG1("uniarp_vcclose: ivp=0x%x\n", (int)ivp); + ATM_DEBUG1("uniarp_vcclose: ivp=%p\n", ivp); /* * Close our CM connection diff --git a/sys/netatm/uni/unisig_decode.c b/sys/netatm/uni/unisig_decode.c index 98f5dfd..d7d3cd4 100644 --- a/sys/netatm/uni/unisig_decode.c +++ b/sys/netatm/uni/unisig_decode.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: unisig_decode.c,v 1.13 1998/08/26 23:29:20 mks Exp $ + * @(#) $Id: unisig_decode.c,v 1.1 1998/09/15 08:23:10 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: unisig_decode.c,v 1.13 1998/08/26 23:29:20 mks Exp $"; +static char *RCSid = "@(#) $Id: unisig_decode.c,v 1.1 1998/09/15 08:23:10 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -755,8 +755,7 @@ usf_dec_msg(usf, msg) u_char c, *ie_tbl; struct ie_generic *ie; - ATM_DEBUG2("usf_dec_msg: usf=0x%x, msg=0x%x\n", (int) usf, - (int) msg); + ATM_DEBUG2("usf_dec_msg: usf=%p, msg=%p\n", usf, msg); /* * Check the total message length diff --git a/sys/netatm/uni/unisig_encode.c b/sys/netatm/uni/unisig_encode.c index 0920acc..a142a33 100644 --- a/sys/netatm/uni/unisig_encode.c +++ b/sys/netatm/uni/unisig_encode.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: unisig_encode.c,v 1.11 1998/08/26 23:29:21 mks Exp $ + * @(#) $Id: unisig_encode.c,v 1.1 1998/09/15 08:23:11 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: unisig_encode.c,v 1.11 1998/08/26 23:29:21 mks Exp $"; +static char *RCSid = "@(#) $Id: unisig_encode.c,v 1.1 1998/09/15 08:23:11 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -142,8 +142,8 @@ usf_enc_msg(usf, msg) u_char sb[sizeof(short)]; } su; - ATM_DEBUG2("usf_enc_msg: usf=0x%x, msg=0x%x\n", - (int)usf, (int)msg); + ATM_DEBUG2("usf_enc_msg: usf=%p, msg=%p\n", + usf, msg); /* * Encode the protocol discriminator @@ -251,8 +251,8 @@ usf_enc_ie(usf, ie) u_char sb[sizeof(short)]; } su; - ATM_DEBUG2("usf_enc_ie: usf=0x%x, ie=0x%x\n", - (int)usf, (int)ie); + ATM_DEBUG2("usf_enc_ie: usf=%p, ie=%p\n", + usf, ie); /* * Encode the IE identifier @@ -337,8 +337,8 @@ usf_enc_ie_aalp(usf, ie) { int i, rc = 0; - ATM_DEBUG2("usf_enc_ie_aalp: usf=0x%x, ie=0x%x\n", - (int)usf, (int)ie); + ATM_DEBUG2("usf_enc_ie_aalp: usf=%p, ie=%p\n", + usf, ie); ie->ie_length = 0; @@ -414,8 +414,8 @@ usf_enc_ie_clrt(usf, ie) { int rc; - ATM_DEBUG2("usf_enc_ie_clrt: usf=0x%x, ie=0x%x\n", - (int)usf, (int)ie); + ATM_DEBUG2("usf_enc_ie_clrt: usf=%p, ie=%p\n", + usf, ie); #ifdef NOTDEF /* @@ -484,8 +484,8 @@ usf_enc_ie_bbcp(usf, ie) int rc; u_char c; - ATM_DEBUG2("usf_enc_ie_bbcp: usf=0x%x, ie=0x%x\n", - (int)usf, (int)ie); + ATM_DEBUG2("usf_enc_ie_bbcp: usf=%p, ie=%p\n", + usf, ie); ie->ie_length = 0; @@ -555,8 +555,8 @@ usf_enc_ie_bhli(usf, ie) int i, rc; u_int type; - ATM_DEBUG2("usf_enc_ie_bhli: usf=0x%x, ie=0x%x\n", - (int)usf, (int)ie); + ATM_DEBUG2("usf_enc_ie_bhli: usf=%p, ie=%p\n", + usf, ie); ie->ie_length = 0; @@ -643,8 +643,8 @@ usf_enc_ie_blli(usf, ie) int rc; u_int ipi; - ATM_DEBUG2("usf_enc_ie_blli: usf=0x%x, ie=0x%x\n", - (int)usf, (int)ie); + ATM_DEBUG2("usf_enc_ie_blli: usf=%p, ie=%p\n", + usf, ie); ie->ie_length = 0; @@ -932,8 +932,8 @@ usf_enc_ie_clst(usf, ie) int rc; u_char c; - ATM_DEBUG2("usf_enc_ie_clst: usf=0x%x, ie=0x%x\n", - (int)usf, (int)ie); + ATM_DEBUG2("usf_enc_ie_clst: usf=%p, ie=%p\n", + usf, ie); c = ie->ie_clst_state & UNI_IE_CLST_STATE_MASK; rc = usf_byte(usf, &c); @@ -965,8 +965,8 @@ usf_enc_ie_cdad(usf, ie) u_char c; int rc; - ATM_DEBUG2("usf_enc_ie_cdad: usf=0x%x, ie=0x%x\n", - (int)usf, (int)ie); + ATM_DEBUG2("usf_enc_ie_cdad: usf=%p, ie=%p\n", + usf, ie); /* * Encode the numbering plan @@ -1066,8 +1066,8 @@ usf_enc_ie_cgad(usf, ie) u_char c; int rc; - ATM_DEBUG2("usf_enc_ie_cgad: usf=0x%x, ie=0x%x\n", - (int)usf, (int)ie); + ATM_DEBUG2("usf_enc_ie_cgad: usf=%p, ie=%p\n", + usf, ie); /* * Encode the numbering plan @@ -1183,8 +1183,8 @@ usf_enc_ie_caus(usf, ie) int i, rc; u_char c; - ATM_DEBUG2("usf_enc_ie_caus: usf=0x%x, ie=0x%x\n", - (int)usf, (int)ie); + ATM_DEBUG2("usf_enc_ie_caus: usf=%p, ie=%p\n", + usf, ie); ie->ie_length = 0; @@ -1242,8 +1242,8 @@ usf_enc_ie_cnid(usf, ie) int rc; u_char c; - ATM_DEBUG2("usf_enc_ie_cnid: usf=0x%x, ie=0x%x\n", - (int)usf, (int)ie); + ATM_DEBUG2("usf_enc_ie_cnid: usf=%p, ie=%p\n", + usf, ie); c = ((ie->ie_cnid_vp_sig & UNI_IE_CNID_VPSIG_MASK) << UNI_IE_CNID_VPSIG_SHIFT) + @@ -1284,8 +1284,8 @@ usf_enc_ie_qosp(usf, ie) { int rc; - ATM_DEBUG2("usf_enc_ie_qosp: usf=0x%x, ie=0x%x\n", - (int)usf, (int)ie); + ATM_DEBUG2("usf_enc_ie_qosp: usf=%p, ie=%p\n", + usf, ie); /* * Encode forward QoS class @@ -1327,8 +1327,8 @@ usf_enc_ie_brpi(usf, ie) int rc; u_char c; - ATM_DEBUG2("usf_enc_ie_brpi: usf=0x%x, ie=0x%x\n", - (int)usf, (int)ie); + ATM_DEBUG2("usf_enc_ie_brpi: usf=%p, ie=%p\n", + usf, ie); /* * Encode the repeat indicator @@ -1360,8 +1360,8 @@ usf_enc_ie_rsti(usf, ie) int rc; u_char c; - ATM_DEBUG2("usf_enc_ie_rsti: usf=0x%x, ie=0x%x\n", - (int)usf, (int)ie); + ATM_DEBUG2("usf_enc_ie_rsti: usf=%p, ie=%p\n", + usf, ie); /* * Encode the restart class @@ -1395,8 +1395,8 @@ usf_enc_ie_bsdc(usf, ie) int rc; u_char c; - ATM_DEBUG2("usf_enc_ie_bsdc: usf=0x%x, ie=0x%x\n", - (int)usf, (int)ie); + ATM_DEBUG2("usf_enc_ie_bsdc: usf=%p, ie=%p\n", + usf, ie); /* * Encode the sending complete indicator @@ -1429,8 +1429,8 @@ usf_enc_ie_trnt(usf, ie) int i, rc; u_char c; - ATM_DEBUG2("usf_enc_ie_trnt: usf=0x%x, ie=0x%x\n", - (int)usf, (int)ie); + ATM_DEBUG2("usf_enc_ie_trnt: usf=%p, ie=%p\n", + usf, ie); /* * Encode the sending complete indicator @@ -1508,8 +1508,8 @@ usf_enc_ie_ident(usf, ie, tbl) u_int16_t sv; u_int32_t iv; - ATM_DEBUG3("usf_enc_ie_ident: usf=0x%x, ie=0x%x, tbl=0x%x\n", - (int)usf, (int)ie, (int)tbl); + ATM_DEBUG3("usf_enc_ie_ident: usf=%p, ie=%p, tbl=%p\n", + usf, ie, tbl); /* * Scan through the IE table diff --git a/sys/netatm/uni/unisig_if.c b/sys/netatm/uni/unisig_if.c index 784b6c5..e52f650 100644 --- a/sys/netatm/uni/unisig_if.c +++ b/sys/netatm/uni/unisig_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: unisig_if.c,v 1.12 1998/07/30 22:36:57 mks Exp $ + * @(#) $Id: unisig_if.c,v 1.1 1998/09/15 08:23:11 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: unisig_if.c,v 1.12 1998/07/30 22:36:57 mks Exp $"; +static char *RCSid = "@(#) $Id: unisig_if.c,v 1.1 1998/09/15 08:23:11 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -248,7 +248,7 @@ unisig_attach(smp, pip) int err = 0, s; struct unisig *usp = NULL; - ATM_DEBUG2("unisig_attach: smp=%x, pip=%x\n", smp, pip); + ATM_DEBUG2("unisig_attach: smp=%p, pip=%p\n", smp, pip); /* * Allocate UNISIG protocol instance control block @@ -358,7 +358,7 @@ unisig_detach(pip) struct unisig *usp; int err; - ATM_DEBUG1("unisig_detach: pip=0x%x\n", pip); + ATM_DEBUG1("unisig_detach: pip=%p\n", pip); /* * Get UNISIG protocol instance @@ -418,7 +418,7 @@ unisig_setup(cvp, errp) struct unisig *usp = (struct unisig *)pip->pif_siginst; int rc = 0; - ATM_DEBUG1("unisig_setup: cvp=0x%x\n", cvp); + ATM_DEBUG1("unisig_setup: cvp=%p\n", cvp); /* * Intialize the returned error code @@ -485,7 +485,7 @@ unisig_release(vcp, errp) struct atm_pif *pip = vcp->vc_pif; struct unisig *usp = (struct unisig *)pip->pif_siginst; - ATM_DEBUG1("unisig_release: vcp=0x%x\n", vcp); + ATM_DEBUG1("unisig_release: vcp=%p\n", vcp); /* * Initialize returned error code @@ -548,7 +548,7 @@ unisig_accept(vcp, errp) struct atm_pif *pip = uvp->uv_pif; struct unisig *usp = (struct unisig *)pip->pif_siginst; - ATM_DEBUG1("unisig_accept: vcp=0x%x\n", vcp); + ATM_DEBUG1("unisig_accept: vcp=%p\n", vcp); /* * Initialize the returned error code @@ -622,7 +622,7 @@ unisig_reject(vcp, errp) struct atm_pif *pip = uvp->uv_pif; struct unisig *usp = (struct unisig *)pip->pif_siginst; - ATM_DEBUG1("unisig_reject: uvp=0x%x\n", uvp); + ATM_DEBUG1("unisig_reject: uvp=%p\n", uvp); /* * Initialize the returned error code @@ -684,7 +684,7 @@ unisig_abort(vcp) struct vccb *vcp; { - ATM_DEBUG1("unisig_abort: vcp=0x%x\n", (int)vcp); + ATM_DEBUG1("unisig_abort: vcp=%p\n", vcp); /* * Only abort once @@ -733,7 +733,7 @@ unisig_free(vcp) struct atm_pif *pip = vcp->vc_pif; struct unisig *usp = (struct unisig *)pip->pif_siginst; - ATM_DEBUG1("unisig_free: vcp = 0x%x\n", vcp); + ATM_DEBUG1("unisig_free: vcp = %p\n", vcp); /* * Make sure VCC has been closed diff --git a/sys/netatm/uni/unisig_mbuf.c b/sys/netatm/uni/unisig_mbuf.c index 84c78fe..c64ee9a 100644 --- a/sys/netatm/uni/unisig_mbuf.c +++ b/sys/netatm/uni/unisig_mbuf.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: unisig_mbuf.c,v 1.6 1998/08/26 23:29:22 mks Exp $ + * @(#) $Id: unisig_mbuf.c,v 1.1 1998/09/15 08:23:11 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: unisig_mbuf.c,v 1.6 1998/08/26 23:29:22 mks Exp $"; +static char *RCSid = "@(#) $Id: unisig_mbuf.c,v 1.1 1998/09/15 08:23:11 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -71,8 +71,8 @@ usf_init(usf, usp, buf, op, headroom) { KBuffer *m; - ATM_DEBUG3("usf_init: usf=0x%x, buf=0x%x, op=%d\n", - (int) usf, (int) buf, op); + ATM_DEBUG3("usf_init: usf=%p, buf=%p, op=%d\n", + usf, buf, op); /* * Check parameters diff --git a/sys/netatm/uni/unisig_msg.c b/sys/netatm/uni/unisig_msg.c index 22bf469..4e61cf4 100644 --- a/sys/netatm/uni/unisig_msg.c +++ b/sys/netatm/uni/unisig_msg.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: unisig_msg.c,v 1.10 1998/08/26 23:29:22 mks Exp $ + * @(#) $Id: unisig_msg.c,v 1.1 1998/09/15 08:23:11 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: unisig_msg.c,v 1.10 1998/08/26 23:29:22 mks Exp $"; +static char *RCSid = "@(#) $Id: unisig_msg.c,v 1.1 1998/09/15 08:23:11 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -183,7 +183,7 @@ unisig_send_msg(usp, msg) int err = 0; struct usfmt usf; - ATM_DEBUG2("unisig_send_msg: msg=0x%x, type=%d\n", msg, + ATM_DEBUG2("unisig_send_msg: msg=%p, type=%d\n", msg, msg->msg_type); /* @@ -257,7 +257,7 @@ unisig_send_setup(usp, uvp) struct unisig_msg *setup; Atm_attributes *ap = &uvp->uv_connvc->cvc_attr; - ATM_DEBUG1("unisig_send_setup: uvp=0x%x\n", (int) uvp); + ATM_DEBUG1("unisig_send_setup: uvp=%p\n", uvp); /* * Make sure required connection attriutes are set @@ -355,8 +355,8 @@ unisig_send_release(usp, uvp, msg, cause) struct unisig_msg *rls_msg; struct ie_generic *cause_ie; - ATM_DEBUG2("unisig_send_release: usp=0x%x, uvp=0x%x\n", - (int) usp, (int) uvp); + ATM_DEBUG2("unisig_send_release: usp=%p, uvp=%p\n", + usp, uvp); /* * Get memory for a RELEASE message @@ -431,8 +431,8 @@ unisig_send_release_complete(usp, uvp, msg, cause) struct unisig_msg *rls_cmp; struct ie_generic *cause_ie; - ATM_DEBUG4("unisig_send_release_complete usp=0x%x, uvp=0x%x, msg=0x%x, cause=%d\n", - (int) usp, (int) uvp, (int) msg, cause); + ATM_DEBUG4("unisig_send_release_complete usp=%p, uvp=%p, msg=%p, cause=%d\n", + usp, uvp, msg, cause); /* * Get memory for a RELEASE COMPLETE message @@ -510,8 +510,8 @@ unisig_send_status(usp, uvp, msg, cause) struct unisig_msg *stat_msg; struct ie_generic *cause_ie, *clst_ie, *iep; - ATM_DEBUG4("unisig_send_status: usp=0x%x, uvp=0x%x, msg=0x%x, cause=%d\n", - (int) usp, (int) uvp, (int) msg, cause); + ATM_DEBUG4("unisig_send_status: usp=%p, uvp=%p, msg=%p, cause=%d\n", + usp, uvp, msg, cause); /* * Get memory for a STATUS message @@ -621,7 +621,7 @@ unisig_rcv_restart(usp, msg) struct unisig_msg *rsta_msg; int s; - ATM_DEBUG2("unisig_rcv_restart: usp=0x%x, msg=0x%x\n", + ATM_DEBUG2("unisig_rcv_restart: usp=%p, msg=%p\n", usp, msg); /* @@ -709,7 +709,7 @@ unisig_rcv_setup(usp, msg) struct unisig_vccb *uvp = NULL; struct ie_generic *iep; - ATM_DEBUG2("unisig_rcv_setup: usp=0x%x, msg=0x%x\n", usp, msg); + ATM_DEBUG2("unisig_rcv_setup: usp=%p, msg=%p\n", usp, msg); /* * If we already have a VCC with the call reference, @@ -816,7 +816,7 @@ unisig_rcv_msg(usp, m) struct unisig_vccb *uvp = 0; struct ie_generic *iep; - ATM_DEBUG2("unisig_rcv_msg: bfr=0x%x, len=%d\n", (int)m, KB_LEN(m)); + ATM_DEBUG2("unisig_rcv_msg: bfr=%p, len=%d\n", m, KB_LEN(m)); #ifdef NOTDEF unisig_print_mbuf(m); diff --git a/sys/netatm/uni/unisig_proto.c b/sys/netatm/uni/unisig_proto.c index 914e76d..bbad9e6 100644 --- a/sys/netatm/uni/unisig_proto.c +++ b/sys/netatm/uni/unisig_proto.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: unisig_proto.c,v 1.9 1998/08/26 23:29:23 mks Exp $ + * @(#) $Id: unisig_proto.c,v 1.1 1998/09/15 08:23:12 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: unisig_proto.c,v 1.9 1998/08/26 23:29:23 mks Exp $"; +static char *RCSid = "@(#) $Id: unisig_proto.c,v 1.1 1998/09/15 08:23:12 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -75,8 +75,8 @@ unisig_timer(tip) usp = (struct unisig *) ((caddr_t)tip - (int)(&((struct unisig *)0)->us_time)); - ATM_DEBUG2("unisig_timer: usp=0x%x,state=%d\n", - (int)usp, usp->us_state); + ATM_DEBUG2("unisig_timer: usp=%p,state=%d\n", + usp, usp->us_state); /* * Pass the timeout to the signalling manager state machine @@ -116,8 +116,8 @@ unisig_vctimer(tip) (int)(&((struct vccb *)0)->vc_time)); usp = (struct unisig *)uvp->uv_pif->pif_siginst; - ATM_DEBUG3("unisig_vctimer: uvp=0x%x, sstate=%d, ustate=%d\n", - (int)uvp, uvp->uv_sstate, uvp->uv_ustate); + ATM_DEBUG3("unisig_vctimer: uvp=%p, sstate=%d, ustate=%d\n", + uvp, uvp->uv_sstate, uvp->uv_ustate); /* * Hand the timeout to the VC finite state machine @@ -162,8 +162,8 @@ unisig_saal_ctl(cmd, tok, a1) { struct unisig *usp = tok; - ATM_DEBUG4("unisig_upper: usp=0x%x,state=%d,cmd=%d,a1=0x%x,\n", - (u_long)usp, usp->us_state, cmd, (u_long)a1); + ATM_DEBUG4("unisig_upper: usp=%p,state=%d,cmd=%d,a1=0x%lx,\n", + usp, usp->us_state, cmd, (u_long)a1); /* * Process command @@ -196,8 +196,8 @@ unisig_saal_ctl(cmd, tok, a1) default: log(LOG_ERR, - "unisig: unknown SAAL cmd: usp=0x%x, state=%d, cmd=%d\n", - (int)usp, usp->us_state, cmd); + "unisig: unknown SAAL cmd: usp=%p, state=%d, cmd=%d\n", + usp, usp->us_state, cmd); } } @@ -223,8 +223,8 @@ unisig_saal_data(tok, m) { struct unisig *usp = tok; - ATM_DEBUG3("unisig_saal_data: usp=0x%x,state=%d,m=0x%x,\n", - (int)usp, usp->us_state, m); + ATM_DEBUG3("unisig_saal_data: usp=%p,state=%d,m=%p,\n", + usp, usp->us_state, m); /* * Pass data to signalling manager state machine @@ -280,14 +280,14 @@ unisig_connected(tok) { struct unisig *usp = tok; - ATM_DEBUG2("unisig_connected: usp=0x%x,state=%d\n", - (u_long)usp, usp->us_state); + ATM_DEBUG2("unisig_connected: usp=%p,state=%d\n", + usp, usp->us_state); /* * Connected routine shouldn't ever get called for a PVC */ - log(LOG_ERR, "unisig: connected notification, usp=0x%x\n", - (u_long)usp); + log(LOG_ERR, "unisig: connected notification, usp=%p\n", + usp); } @@ -311,8 +311,8 @@ unisig_cleared(tok, cp) { struct unisig *usp = tok; - ATM_DEBUG3("unisig_cleared: usp=0x%x, state=%d, cause=%d\n", - (u_long)usp, usp->us_state, cp->cause_value); + ATM_DEBUG3("unisig_cleared: usp=%p, state=%d, cause=%d\n", + usp, usp->us_state, cp->cause_value); /* * VCC has been closed. Notify the signalling diff --git a/sys/netatm/uni/unisig_sigmgr_state.c b/sys/netatm/uni/unisig_sigmgr_state.c index 2fbbfca..0439d1c 100644 --- a/sys/netatm/uni/unisig_sigmgr_state.c +++ b/sys/netatm/uni/unisig_sigmgr_state.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: unisig_sigmgr_state.c,v 1.10 1998/08/26 23:29:24 mks Exp $ + * @(#) $Id: unisig_sigmgr_state.c,v 1.1 1998/09/15 08:23:12 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: unisig_sigmgr_state.c,v 1.10 1998/08/26 23:29:24 mks Exp $"; +static char *RCSid = "@(#) $Id: unisig_sigmgr_state.c,v 1.1 1998/09/15 08:23:12 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -249,8 +249,8 @@ unisig_sigmgr_state(usp, event, m) * the signalling manager's state */ action = sigmgr_state_table[event][usp->us_state]; - ATM_DEBUG4("unisig_sigmgr_state: usp=0x%x, state=%d, event=%d, action=%d\n", - (u_int) usp, usp->us_state, event, action); + ATM_DEBUG4("unisig_sigmgr_state: usp=%p, state=%d, event=%d, action=%d\n", + usp, usp->us_state, event, action); if (action >= MAX_ACTION || action < 0) { panic("unisig_sigmgr_state: invalid action\n"); } diff --git a/sys/netatm/uni/unisig_subr.c b/sys/netatm/uni/unisig_subr.c index f8dc067..52326bc 100644 --- a/sys/netatm/uni/unisig_subr.c +++ b/sys/netatm/uni/unisig_subr.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: unisig_subr.c,v 1.12 1998/08/26 23:29:24 mks Exp $ + * @(#) $Id: unisig_subr.c,v 1.1 1998/09/15 08:23:12 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: unisig_subr.c,v 1.12 1998/08/26 23:29:24 mks Exp $"; +static char *RCSid = "@(#) $Id: unisig_subr.c,v 1.1 1998/09/15 08:23:12 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -129,7 +129,7 @@ unisig_open_vcc(usp, cvp) Atm_addr_pvc *pvp; int err, pvc; - ATM_DEBUG2("unisig_open_vcc: usp=0x%x, cvp=0x%x\n", usp, cvp); + ATM_DEBUG2("unisig_open_vcc: usp=%p, cvp=%p\n", usp, cvp); /* * Validate user parameters. AAL and encapsulation are @@ -305,7 +305,7 @@ unisig_close_vcc(usp, uvp) { int err = 0; - ATM_DEBUG2("unisig_close_vcc: uvp=0x%x, state=%d\n", uvp, + ATM_DEBUG2("unisig_close_vcc: uvp=%p, state=%d\n", uvp, uvp->uv_sstate); /* @@ -367,8 +367,8 @@ unisig_clear_vcc(usp, uvp, cause) { u_char outstate; - ATM_DEBUG3("unisig_clear_vcc: uvp=0x%x, state=%d, cause=%d\n", - (int)uvp, uvp->uv_sstate, cause); + ATM_DEBUG3("unisig_clear_vcc: uvp=%p, state=%d, cause=%d\n", + uvp, uvp->uv_sstate, cause); /* * Check that this is for the same interface UNISIG uses @@ -432,7 +432,7 @@ unisig_switch_reset(usp, cause) int s; struct unisig_vccb *uvp, *vnext; - ATM_DEBUG2("unisig_switch_reset: usp=0x%x, cause=%d\n", + ATM_DEBUG2("unisig_switch_reset: usp=%p, cause=%d\n", usp, cause); /* @@ -463,7 +463,7 @@ unisig_switch_reset(usp, cause) } atm_cm_cleared(uvp->uv_connvc, cause); } else { - log(LOG_ERR, "unisig: invalid VCC type: vccb=0x%x, type=%d\n", + log(LOG_ERR, "unisig: invalid VCC type: vccb=%p, type=%d\n", uvp, uvp->uv_type); } } diff --git a/sys/netatm/uni/unisig_util.c b/sys/netatm/uni/unisig_util.c index ec4fbd0..d7a64f6 100644 --- a/sys/netatm/uni/unisig_util.c +++ b/sys/netatm/uni/unisig_util.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: unisig_util.c,v 1.9 1998/08/26 23:29:24 mks Exp $ + * @(#) $Id: unisig_util.c,v 1.1 1998/09/15 08:23:13 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: unisig_util.c,v 1.9 1998/08/26 23:29:24 mks Exp $"; +static char *RCSid = "@(#) $Id: unisig_util.c,v 1.1 1998/09/15 08:23:13 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -65,7 +65,7 @@ unisig_free_msg(msg) int i; struct ie_generic *ie, *ienxt; - ATM_DEBUG1("unisig_free_msg: msg=0x%x\n", msg); + ATM_DEBUG1("unisig_free_msg: msg=%p\n", msg); /* * First free all the IEs @@ -325,7 +325,7 @@ unisig_addr_print(p) * Print the IA5 characters of the E.164 address */ for(i=0; i<p->address_length; i++) { - sprintf(&strbuff[strlen(strbuff)], "%c\0", + sprintf(&strbuff[strlen(strbuff)], "%c", ((Atm_addr_e164 *)p->address)->aae_addr[i]); } break; @@ -380,7 +380,7 @@ unisig_print_mbuf(m) KB_DATASTART(m, cp, caddr_t); for (i = 0; i < KB_LEN(m); i++) { if (i == 0) - printf(" bfr=0x%x: ", (int)m); + printf(" bfr=%p: ", m); printf("%x ", (u_char)*cp++); } printf("<end_bfr>\n"); diff --git a/sys/netatm/uni/unisig_vc_state.c b/sys/netatm/uni/unisig_vc_state.c index cfd7635..e52515d 100644 --- a/sys/netatm/uni/unisig_vc_state.c +++ b/sys/netatm/uni/unisig_vc_state.c @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $Id: unisig_vc_state.c,v 1.11 1998/08/06 18:16:29 mks Exp $ + * @(#) $Id: unisig_vc_state.c,v 1.1 1998/09/15 08:23:13 phk Exp $ * */ @@ -36,7 +36,7 @@ */ #ifndef lint -static char *RCSid = "@(#) $Id: unisig_vc_state.c,v 1.11 1998/08/06 18:16:29 mks Exp $"; +static char *RCSid = "@(#) $Id: unisig_vc_state.c,v 1.1 1998/09/15 08:23:13 phk Exp $"; #endif #include <netatm/kern_include.h> @@ -233,8 +233,8 @@ unisig_vc_state(usp, uvp, event, msg) /* * Perform the requested action */ - ATM_DEBUG4("unisig_vc_state: uvp=0x%x, state=%d, event=%d, action=%d\n", - (int) uvp, state, event, action); + ATM_DEBUG4("unisig_vc_state: uvp=%p, state=%d, event=%d, action=%d\n", + uvp, state, event, action); rc = unisig_vc_act_vec[action](usp, uvp, msg); return(rc); @@ -850,8 +850,8 @@ unisig_vc_act08(usp, uvp, msg) Atm_addr_nsap *nap; Atm_attributes attr; - ATM_DEBUG3("unisig_vc_act08: usp=0x%x, uvp=0x%x, msg=0x%x\n", - (int) usp, (int) uvp, (int) msg); + ATM_DEBUG3("unisig_vc_act08: usp=%p, uvp=%p, msg=%p\n", + usp, uvp, msg); /* * Make sure that the called address is the right format @@ -1467,8 +1467,8 @@ unisig_vc_act17(usp, uvp, msg) { int rc; - ATM_DEBUG3("unisig_vc_perror: usp=0x%x, uvp=0x%x, msg=0x%x\n", - (int) usp, (int) uvp, (int) msg); + ATM_DEBUG3("unisig_vc_perror: usp=%p, uvp=%p, msg=%p\n", + usp, uvp, msg); /* * Clear any running timer @@ -1725,8 +1725,8 @@ unisig_vc_act22(usp, uvp, msg) struct unisig_msg *status; struct ie_generic *callst_ie, *cause_ie; - ATM_DEBUG3("unisig_vc_perror: usp=0x%x, uvp=0x%x, msg=0x%x\n", - (int) usp, (int) uvp, (int) msg); + ATM_DEBUG3("unisig_vc_perror: usp=%p, uvp=%p, msg=%p\n", + usp, uvp, msg); /* * Get memory for a STATUS message diff --git a/usr.sbin/atm/atmarpd/Makefile b/usr.sbin/atm/atmarpd/Makefile index d484632..013e119 100644 --- a/usr.sbin/atm/atmarpd/Makefile +++ b/usr.sbin/atm/atmarpd/Makefile @@ -23,7 +23,7 @@ # Copies of this Software may be made, however, the above copyright # notice must be reproduced on all copies. # -# @(#) $Id: Makefile,v 1.1 1998/09/15 08:23:14 phk Exp $ +# @(#) $Id: Makefile,v 1.2 1998/09/15 19:16:33 phk Exp $ # # @@ -34,5 +34,6 @@ MAN8= atmarpd.8 CFLAGS+= -I${.CURDIR}/../../../sys LDADD+= -latm -lmd +DPADD+= ${LIBATM} ${LIBMD} .include <bsd.prog.mk> diff --git a/usr.sbin/atm/scspd/Makefile b/usr.sbin/atm/scspd/Makefile index a913a1f..ce36b5a 100644 --- a/usr.sbin/atm/scspd/Makefile +++ b/usr.sbin/atm/scspd/Makefile @@ -23,7 +23,7 @@ # Copies of this Software may be made, however, the above copyright # notice must be reproduced on all copies. # -# @(#) $Id: Makefile,v 1.3 1998/09/15 18:57:43 jkh Exp $ +# @(#) $Id: Makefile,v 1.4 1998/09/15 19:01:46 jkh Exp $ # # @@ -37,7 +37,7 @@ MAN8= scspd.8 CFLAGS+= -I${.CURDIR}/../../../sys -I${.OBJDIR} LDADD+= -latm -lmd -DPADD+= ${LIBMD} +DPADD+= ${LIBATM} ${LIBMD} YFLAGS= -d |
