git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
isdn
/
hisax
/
netjet.c
diff --git
a/drivers/isdn/hisax/netjet.c
b/drivers/isdn/hisax/netjet.c
index
fe61d26
..
c8d7571
100644
(file)
--- a/
drivers/isdn/hisax/netjet.c
+++ b/
drivers/isdn/hisax/netjet.c
@@
-701,8
+701,8
@@
static void write_raw(struct BCState *bcs, u_int *buf, int cnt) {
}
bcs->hw.tiger.s_tot += s_cnt;
if (bcs->cs->debug & L1_DEB_HSCX)
}
bcs->hw.tiger.s_tot += s_cnt;
if (bcs->cs->debug & L1_DEB_HSCX)
- debugl1(bcs->cs,"tiger write_raw: c%d %
p-%p
%d/%d %d %x", bcs->channel,
-
buf,
p, s_cnt, cnt,
+ debugl1(bcs->cs,"tiger write_raw: c%d %
x-%x
%d/%d %d %x", bcs->channel,
+
(u_int)buf, (u_int)
p, s_cnt, cnt,
bcs->hw.tiger.sendcnt, bcs->cs->hw.njet.irqstat0);
if (bcs->cs->debug & L1_DEB_HSCX_FIFO)
printframe(bcs->cs, bcs->hw.tiger.sp, s_cnt, "snd");
bcs->hw.tiger.sendcnt, bcs->cs->hw.njet.irqstat0);
if (bcs->cs->debug & L1_DEB_HSCX_FIFO)
printframe(bcs->cs, bcs->hw.tiger.sp, s_cnt, "snd");
@@
-931,8
+931,8
@@
inittiger(struct IsdnCardState *cs)
cs->bcs[1].hw.tiger.s_end = cs->bcs[0].hw.tiger.s_end;
memset(cs->bcs[0].hw.tiger.send, 0xff, NETJET_DMA_TXSIZE * sizeof(unsigned int));
cs->bcs[1].hw.tiger.s_end = cs->bcs[0].hw.tiger.s_end;
memset(cs->bcs[0].hw.tiger.send, 0xff, NETJET_DMA_TXSIZE * sizeof(unsigned int));
- debugl1(cs, "tiger: send buf %
p - %p",
cs->bcs[0].hw.tiger.send,
-
cs->bcs[0].hw.tiger.send + NETJET_DMA_TXSIZE - 1
);
+ debugl1(cs, "tiger: send buf %
x - %x", (u_int)
cs->bcs[0].hw.tiger.send,
+
(u_int)(cs->bcs[0].hw.tiger.send + NETJET_DMA_TXSIZE - 1)
);
outl(virt_to_bus(cs->bcs[0].hw.tiger.send),
cs->hw.njet.base + NETJET_DMA_READ_START);
outl(virt_to_bus(cs->bcs[0].hw.tiger.s_irq),
outl(virt_to_bus(cs->bcs[0].hw.tiger.send),
cs->hw.njet.base + NETJET_DMA_READ_START);
outl(virt_to_bus(cs->bcs[0].hw.tiger.s_irq),
@@
-945,8
+945,8
@@
inittiger(struct IsdnCardState *cs)
"HiSax: No memory for tiger.rec\n");
return;
}
"HiSax: No memory for tiger.rec\n");
return;
}
- debugl1(cs, "tiger: rec buf %
p - %p",
cs->bcs[0].hw.tiger.rec,
-
cs->bcs[0].hw.tiger.rec + NETJET_DMA_RXSIZE - 1
);
+ debugl1(cs, "tiger: rec buf %
x - %x", (u_int)
cs->bcs[0].hw.tiger.rec,
+
(u_int)(cs->bcs[0].hw.tiger.rec + NETJET_DMA_RXSIZE - 1)
);
cs->bcs[1].hw.tiger.rec = cs->bcs[0].hw.tiger.rec;
memset(cs->bcs[0].hw.tiger.rec, 0xff, NETJET_DMA_RXSIZE * sizeof(unsigned int));
outl(virt_to_bus(cs->bcs[0].hw.tiger.rec),
cs->bcs[1].hw.tiger.rec = cs->bcs[0].hw.tiger.rec;
memset(cs->bcs[0].hw.tiger.rec, 0xff, NETJET_DMA_RXSIZE * sizeof(unsigned int));
outl(virt_to_bus(cs->bcs[0].hw.tiger.rec),