summaryrefslogtreecommitdiff
path: root/sys/arch/mvme68k/dev/cl.c
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2003-12-20 00:34:33 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2003-12-20 00:34:33 +0000
commit7e45482dd1e79a08bc2e66e4619a4ade6c158207 (patch)
treed7a453b68a67035c8c55bb918ba95ab09b06f861 /sys/arch/mvme68k/dev/cl.c
parenta06160fcc491c92193f68f0a9859d611a7996aa1 (diff)
Passl -Wformat. Fix some blatant -Wuninitialized errors as well.
Diffstat (limited to 'sys/arch/mvme68k/dev/cl.c')
-rw-r--r--sys/arch/mvme68k/dev/cl.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/arch/mvme68k/dev/cl.c b/sys/arch/mvme68k/dev/cl.c
index 85e710f2af1..059168a6876 100644
--- a/sys/arch/mvme68k/dev/cl.c
+++ b/sys/arch/mvme68k/dev/cl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cl.c,v 1.32 2003/10/03 16:44:50 miod Exp $ */
+/* $OpenBSD: cl.c,v 1.33 2003/12/20 00:34:28 miod Exp $ */
/*
* Copyright (c) 1995 Dale Rahn. All rights reserved.
@@ -1018,6 +1018,7 @@ clcngetc(dev)
u_char ier_old = 0xff;
struct clreg *cl_reg = cl_cons.cl_vaddr;
volatile struct pcctworeg *pcc2_base = cl_cons.pcctwoaddr;
+
cl_reg->cl_car = 0;
if (!(cl_reg->cl_ier & 0x08)) {
ier_old = cl_reg->cl_ier;
@@ -1571,7 +1572,7 @@ cl_txintr(arg)
pbuffer = sc->sc_cl[channel].tx[nbuf];
resid = tp->t_outq.c_cc;
cnt = min (CL_BUFSIZE,resid);
- log(LOG_WARNING, "cl_txintr: resid %x cnt %x pbuf %x\n",
+ log(LOG_WARNING, "cl_txintr: resid %x cnt %x pbuf %p\n",
resid, cnt, pbuffer);
if (cnt != 0) {
cnt = q_to_b(&tp->t_outq, pbuffer, cnt);
@@ -1919,6 +1920,7 @@ cl_dumpport(channel)
rcor = cl_reg->cl_rcor;
tbpr = cl_reg->cl_tbpr;
rpilr = cl_reg->cl_rpilr;
+ rir = cl_reg->cl_rir;
ier = cl_reg->cl_ier;
ccr = cl_reg->cl_ccr;
tcor = cl_reg->cl_tcor;
@@ -1977,11 +1979,11 @@ cl_dumpport(channel)
tpr, csr, rts, dtr);
printf("rtprl %x rtprh %x\n",
rtprl, rtprh);
- printf("rxcnt %x txcnt %x\n",
+ printf("rxcnt %lx txcnt %lx\n",
sc->sc_cl[channel].rxcnt, sc->sc_cl[channel].txcnt);
printf("dmabsts %x, tcbadru %x, tcbadrl %x, rcbadru %x, rcbadrl %x,\n",
dmabsts, tcbadru, tcbadrl, rcbadru, rcbadrl );
- printf("parbadru %x, parbadrl %x, parbcnt %x, parbsts %x\n",
+ printf("parbadru %p, parbadrl %p, parbcnt %p, parbsts %p\n",
parbadru, parbadrl, parbcnt, parbsts);
printf("arbadru %x, arbadrl %x, arbcnt %x, arbsts %x\n",
arbadru, arbadrl, arbcnt, arbsts);