Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

%x -> 0x%x, fixes for PR#3757

Browse Source
This commit is contained in:
fair 1997-07-29 06:43:51 +00:00
parent bb5815cc39
commit 7a06252f07
7 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/arch/sun3/dev/if_ie.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_ie.c,v 1.20 1997/03/15 18:10:49 is Exp $ */ /* $NetBSD: if_ie.c,v 1.21 1997/07/29 06:43:51 fair Exp $ */
/*- /*-
* Copyright (c) 1993, 1994, 1995 Charles Hannum. * Copyright (c) 1993, 1994, 1995 Charles Hannum.
@ -483,7 +483,7 @@ ie_intr(arg)
if (sc->hard_type == IE_VME) { if (sc->hard_type == IE_VME) {
volatile struct ievme *iev = (volatile struct ievme *)sc->sc_reg; volatile struct ievme *iev = (volatile struct ievme *)sc->sc_reg;
if (iev->status & IEVME_PERR) { if (iev->status & IEVME_PERR) {
printf("%s: parity error (ctrl %x @ %02x%04x)\n", printf("%s: parity error (ctrl 0x%x @ 0x%02x%04x)\n",
sc->sc_dev.dv_xname, iev->pectrl, sc->sc_dev.dv_xname, iev->pectrl,
iev->pectrl & IEVME_HADDR, iev->peaddr); iev->pectrl & IEVME_HADDR, iev->peaddr);
iev->pectrl = iev->pectrl | IEVME_PARACK; iev->pectrl = iev->pectrl | IEVME_PARACK;
@ -1069,7 +1069,8 @@ ie_readframe(sc, num)
#ifdef IEDEBUG #ifdef IEDEBUG
if (sc->sc_debug & IED_READFRAME) if (sc->sc_debug & IED_READFRAME)
printf("%s: frame from ether %s type %x\n", sc->sc_dev.dv_xname, printf("%s: frame from ether %s type 0x%x\n",
sc->sc_dev.dv_xname,
ether_sprintf(eh.ether_shost), (u_int)eh.ether_type); ether_sprintf(eh.ether_shost), (u_int)eh.ether_type);
#endif #endif
@ -1339,7 +1340,7 @@ run_tdr(sc, cmd)
printf("%s: TDR detected a short %d clocks away\n", printf("%s: TDR detected a short %d clocks away\n",
sc->sc_dev.dv_xname, SWAP(result & IE_TDR_TIME)); sc->sc_dev.dv_xname, SWAP(result & IE_TDR_TIME));
} else { } else {
printf("%s: TDR returned unknown status %x\n", printf("%s: TDR returned unknown status 0x%x\n",
sc->sc_dev.dv_xname, result); sc->sc_dev.dv_xname, result);
} }
} }

6
sys/arch/sun3/dev/si_obio.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: si_obio.c,v 1.12 1997/04/28 21:59:23 gwr Exp $ */ /* $NetBSD: si_obio.c,v 1.13 1997/07/29 06:43:53 fair Exp $ */
/*- /*-
* Copyright (c) 1996 The NetBSD Foundation, Inc. * Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -271,13 +271,13 @@ si_obio_dma_setup(ncr_sc)
data_pa = dvma_kvtopa(dh->dh_dvma, sc->sc_adapter_type); data_pa = dvma_kvtopa(dh->dh_dvma, sc->sc_adapter_type);
data_pa += (ncr_sc->sc_dataptr - dh->dh_addr); data_pa += (ncr_sc->sc_dataptr - dh->dh_addr);
if (data_pa & 1) if (data_pa & 1)
panic("si_dma_start: bad pa=0x%x", data_pa); panic("si_dma_start: bad pa=0x%lx", data_pa);
xlen = ncr_sc->sc_datalen; xlen = ncr_sc->sc_datalen;
sc->sc_reqlen = xlen; /* XXX: or less? */ sc->sc_reqlen = xlen; /* XXX: or less? */
#ifdef DEBUG #ifdef DEBUG
if (si_debug & 2) { if (si_debug & 2) {
printf("si_dma_setup: dh=%p, pa=0x%x, xlen=0x%x\n", printf("si_dma_setup: dh=%p, pa=0x%lx, xlen=0x%x\n",
dh, data_pa, xlen); dh, data_pa, xlen);
} }
#endif #endif

6
sys/arch/sun3/dev/si_vme.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: si_vme.c,v 1.10 1997/02/26 22:26:03 gwr Exp $ */ /* $NetBSD: si_vme.c,v 1.11 1997/07/29 06:43:54 fair Exp $ */
/*- /*-
* Copyright (c) 1996 The NetBSD Foundation, Inc. * Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -305,14 +305,14 @@ si_vme_dma_setup(ncr_sc)
data_pa = dvma_kvtopa(dh->dh_dvma, sc->sc_adapter_type); data_pa = dvma_kvtopa(dh->dh_dvma, sc->sc_adapter_type);
data_pa += (ncr_sc->sc_dataptr - dh->dh_addr); data_pa += (ncr_sc->sc_dataptr - dh->dh_addr);
if (data_pa & 1) if (data_pa & 1)
panic("si_dma_start: bad pa=0x%x", data_pa); panic("si_dma_start: bad pa=0x%lx", data_pa);
xlen = ncr_sc->sc_datalen; xlen = ncr_sc->sc_datalen;
xlen &= ~1; /* XXX: necessary? */ xlen &= ~1; /* XXX: necessary? */
sc->sc_reqlen = xlen; /* XXX: or less? */ sc->sc_reqlen = xlen; /* XXX: or less? */
#ifdef DEBUG #ifdef DEBUG
if (si_debug & 2) { if (si_debug & 2) {
printf("si_dma_setup: dh=%p, pa=0x%x, xlen=0x%x\n", printf("si_dma_setup: dh=%p, pa=0x%lx, xlen=0x%x\n",
dh, data_pa, xlen); dh, data_pa, xlen);
} }
#endif #endif

8
sys/arch/sun3/dev/xd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: xd.c,v 1.15 1997/07/17 02:12:50 jtk Exp $ */ /* $NetBSD: xd.c,v 1.16 1997/07/29 06:43:55 fair Exp $ */
/* /*
* *
@ -36,7 +36,7 @@
* x d . c x y l o g i c s 7 5 3 / 7 0 5 3 v m e / s m d d r i v e r * x d . c x y l o g i c s 7 5 3 / 7 0 5 3 v m e / s m d d r i v e r
* *
* author: Chuck Cranor <chuck@ccrc.wustl.edu> * author: Chuck Cranor <chuck@ccrc.wustl.edu>
* id: $NetBSD: xd.c,v 1.15 1997/07/17 02:12:50 jtk Exp $ * id: $NetBSD: xd.c,v 1.16 1997/07/29 06:43:55 fair Exp $
* started: 27-Feb-95 * started: 27-Feb-95
* references: [1] Xylogics Model 753 User's Manual * references: [1] Xylogics Model 753 User's Manual
* part number: 166-753-001, Revision B, May 21, 1988. * part number: 166-753-001, Revision B, May 21, 1988.
@ -453,7 +453,7 @@ xdcattach(parent, self, aux)
XDC_DONE(xdc, rqno, err); XDC_DONE(xdc, rqno, err);
return; return;
} }
printf(": Xylogics 753/7053, PROM=%x.%02x.%02x\n", printf(": Xylogics 753/7053, PROM=0x%x.%02x.%02x\n",
ctl->eprom_partno, ctl->eprom_lvl, ctl->eprom_rev); ctl->eprom_partno, ctl->eprom_lvl, ctl->eprom_rev);
XDC_DONE(xdc, rqno, err); XDC_DONE(xdc, rqno, err);
@ -2110,7 +2110,7 @@ xdc_tick(arg)
printf("\n"); printf("\n");
for (lcv = 0; lcv < XDC_MAXIOPB; lcv++) { for (lcv = 0; lcv < XDC_MAXIOPB; lcv++) {
if (mark[lcv] == 0) if (mark[lcv] == 0)
printf("MARK: running %d: mode %d done %d errs %d errno 0x%x ttl %d buf %x\n", printf("MARK: running %d: mode %d done %d errs %d errno 0x%x ttl %d buf 0x%x\n",
lcv, xdcsc->reqs[lcv].mode, lcv, xdcsc->reqs[lcv].mode,
xdcsc->iopbase[lcv].done, xdcsc->iopbase[lcv].done,
xdcsc->iopbase[lcv].errs, xdcsc->iopbase[lcv].errs,

6
sys/arch/sun3/sun3/machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: machdep.c,v 1.94 1997/06/12 15:46:48 mrg Exp $ */ /* $NetBSD: machdep.c,v 1.95 1997/07/29 06:43:56 fair Exp $ */
/* /*
* Copyright (c) 1994, 1995 Gordon W. Ross * Copyright (c) 1994, 1995 Gordon W. Ross
@ -425,7 +425,7 @@ identifycpu()
/* Other stuff? (VAC, mc6888x version, etc.) */ /* Other stuff? (VAC, mc6888x version, etc.) */
sprintf(cpu_model, "Sun 3/%s", cpu_string); sprintf(cpu_model, "Sun 3/%s", cpu_string);
printf("Model: %s (hostid %x)\n", cpu_model, (int) hostid); printf("Model: %s (hostid 0x%x)\n", cpu_model, (int) hostid);
} }
/* /*
@ -671,7 +671,7 @@ dumpsys()
return; return;
} }
printf("\ndumping to dev %x, offset %d\n", printf("\ndumping to dev 0x%x, offset %d\n",
(int) dumpdev, (int) dumplo); (int) dumpdev, (int) dumplo);
/* /*

8
sys/arch/sun3/sun3/sunmon.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sunmon.c,v 1.6 1997/04/25 22:26:14 gwr Exp $ */ /* $NetBSD: sunmon.c,v 1.7 1997/07/29 06:43:58 fair Exp $ */
/*- /*-
* Copyright (c) 1996 The NetBSD Foundation, Inc. * Copyright (c) 1996 The NetBSD Foundation, Inc.
@ -163,13 +163,13 @@ tracedump(x1)
struct funcall_frame *fp = (struct funcall_frame *)(&x1 - 2); struct funcall_frame *fp = (struct funcall_frame *)(&x1 - 2);
u_int stackpage = ((u_int)fp) & ~PGOFSET; u_int stackpage = ((u_int)fp) & ~PGOFSET;
mon_printf("Begin traceback...fp = %x\n", fp); mon_printf("Begin traceback...fp = 0x%x\n", fp);
do { do {
if (fp == fp->fr_savfp) { if (fp == fp->fr_savfp) {
mon_printf("FP loop at %x", fp); mon_printf("FP loop at 0x%x", fp);
break; break;
} }
mon_printf("Called from %x, fp=%x, args=%x %x %x %x\n", mon_printf("Called from 0x%x, fp=0x%x, args=0x%x 0x%x 0x%x 0x%x\n",
fp->fr_savpc, fp->fr_savfp, fp->fr_savpc, fp->fr_savfp,
fp->fr_arg[0], fp->fr_arg[1], fp->fr_arg[2], fp->fr_arg[3]); fp->fr_arg[0], fp->fr_arg[1], fp->fr_arg[2], fp->fr_arg[3]);
fp = fp->fr_savfp; fp = fp->fr_savfp;

8
sys/arch/sun3/sun3/trap.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: trap.c,v 1.70 1997/04/09 20:50:03 thorpej Exp $ */ /* $NetBSD: trap.c,v 1.71 1997/07/29 06:43:59 fair Exp $ */
/* /*
* Copyright (c) 1994 Gordon W. Ross * Copyright (c) 1994 Gordon W. Ross
@ -462,7 +462,7 @@ trap(type, code, v, tf)
#ifdef DEBUG #ifdef DEBUG
if ((mmudebug & MDB_WBFOLLOW) || MDB_ISPID(p->p_pid)) if ((mmudebug & MDB_WBFOLLOW) || MDB_ISPID(p->p_pid))
printf("trap: T_MMUFLT pid=%d, code=%x, v=%x, pc=%x, sr=%x\n", printf("trap: T_MMUFLT pid=%d, code=0x%x, v=0x%x, pc=0x%x, sr=0x%x\n",
p->p_pid, code, v, tf.tf_pc, tf.tf_sr); p->p_pid, code, v, tf.tf_pc, tf.tf_sr);
#endif #endif
@ -501,7 +501,7 @@ trap(type, code, v, tf)
#ifdef DEBUG #ifdef DEBUG
if (rv && MDB_ISPID(p->p_pid)) { if (rv && MDB_ISPID(p->p_pid)) {
printf("vm_fault(%p, %x, %x, 0) -> %x\n", printf("vm_fault(%p, 0x%lx, 0x%x, 0) -> 0x%x\n",
map, va, ftype, rv); map, va, ftype, rv);
if (mmudebug & MDB_WBFAILED) if (mmudebug & MDB_WBFAILED)
Debugger(); Debugger();
@ -539,7 +539,7 @@ trap(type, code, v, tf)
#endif #endif
goto copyfault; goto copyfault;
} }
printf("vm_fault(%p, %x, %x, 0) -> %x\n", printf("vm_fault(%p, 0x%lx, 0x%x, 0) -> 0x%x\n",
map, va, ftype, rv); map, va, ftype, rv);
goto dopanic; goto dopanic;
} }