diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/dahdi/dahdi-base.c | 35 | ||||
-rw-r--r-- | drivers/dahdi/voicebus.c | 5 | ||||
-rw-r--r-- | drivers/dahdi/xpp/card_fxs.c | 4 | ||||
-rw-r--r-- | drivers/dahdi/xpp/xpp_dahdi.c | 12 | ||||
-rw-r--r-- | drivers/dahdi/xpp/xproto.c | 6 |
5 files changed, 35 insertions, 27 deletions
diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index 1a2966b..0db218d 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -1614,6 +1614,20 @@ static struct dahdi_hdlc *dahdi_hdlc_alloc(void) return kzalloc(sizeof(struct dahdi_hdlc), GFP_KERNEL); } +static inline print_debug_writebuf(struct dahdi_chan* ss, struct sk_buff *skb, + int oldbuf) +{ +#ifdef CONFIG_DAHDI_DEBUG + int x; + + module_printk(KERN_NOTICE, "Buffered %d bytes to go out in buffer %d\n", ss->writen[oldbuf], oldbuf); + module_printk(KERN_DEBUG ""); + for (x=0;x<ss->writen[oldbuf];x++) + printk("%02x ", ss->writebuf[oldbuf][x]); + printk("\n"); +#endif +} + #ifdef NEW_HDLC_INTERFACE static int dahdi_xmit(struct sk_buff *skb, struct net_device *dev) { @@ -1674,12 +1688,7 @@ static int dahdi_xmit(hdlc_device *hdlc, struct sk_buff *skb) dev->trans_start = jiffies; stats->tx_packets++; stats->tx_bytes += ss->writen[oldbuf]; -#ifdef CONFIG_DAHDI_DEBUG - module_printk(KERN_NOTICE, "Buffered %d bytes to go out in buffer %d\n", ss->writen[oldbuf], oldbuf); - for (x=0;x<ss->writen[oldbuf];x++) - module_printk(KERN_DEBUG,"%02x ", ss->writebuf[oldbuf][x]); - module_printk(KERN_DEBUG "\n"); -#endif + print_debug_writebuf(ss, skb, outbug); retval = 0; /* Free the SKB */ dev_kfree_skb_any(skb); @@ -1775,12 +1784,7 @@ static int dahdi_ppp_xmit(struct ppp_channel *ppp, struct sk_buff *skb) some space for us */ ss->outwritebuf = oldbuf; } -#ifdef CONFIG_DAHDI_DEBUG - module_printk(KERN_NOTICE, "Buffered %d bytes (skblen = %d) to go out in buffer %d\n", ss->writen[oldbuf], skb->len, oldbuf); - for (x=0;x<ss->writen[oldbuf];x++) - module_printk(KERN_DEBUG, "%02x ", ss->writebuf[oldbuf][x]); - module_printk(KERN_DEBUG, "\n"); -#endif + print_debug_writebuf(ss, skb, outbug); retval = 1; } spin_unlock_irqrestore(&ss->lock, flags); @@ -1906,8 +1910,11 @@ static ssize_t dahdi_chan_read(struct file *file, char *usrbuf, size_t count, in myamnt = chan->readn[res]; module_printk(KERN_NOTICE, "dahdi_chan_read(unit: %d, inwritebuf: %d, outwritebuf: %d amnt: %d\n", unit, chan->inwritebuf, chan->outwritebuf, myamnt); - module_printk(KERN_DEBUG, "\t("); for (x = 0; x < myamnt; x++) module_printk((KERN_DEBUG, x ? " %02x" : "%02x"), (unsigned char)usrbuf[x]); - module_printk(KERN_DEBUG, ")\n"); + + module_printk(KERN_DEBUG, "\t("); + for (x = 0; x < myamnt; x++) + printk((x ? " %02x" : "%02x"), (unsigned char)usrbuf[x]); + printk(")\n"); } #endif /* end addition */ diff --git a/drivers/dahdi/voicebus.c b/drivers/dahdi/voicebus.c index ee6f057..e3afa49 100644 --- a/drivers/dahdi/voicebus.c +++ b/drivers/dahdi/voicebus.c @@ -682,10 +682,11 @@ show_buffer(struct voicebus *vb, void *vbb) unsigned char *c; c = vbb; printk(KERN_DEBUG "Packet %d\n", count); + printk(KERN_DEBUG ""); for (x = 1; x <= vb->framesize; ++x) { - printk(KERN_DEBUG "%02x ", c[x]); + printk("%02x ", c[x]); if (x % 16 == 0) { - printk(KERN_DEBUG "\n"); + printk("\n"); } } printk(KERN_DEBUG "\n\n"); diff --git a/drivers/dahdi/xpp/card_fxs.c b/drivers/dahdi/xpp/card_fxs.c index e6d4f99..be83a18 100644 --- a/drivers/dahdi/xpp/card_fxs.c +++ b/drivers/dahdi/xpp/card_fxs.c @@ -1010,10 +1010,10 @@ static void detect_vmwi(xpd_t *xpd) LINE_DBG(GENERAL, xpd, pos, "MSG:"); for(j = 0; j < DAHDI_CHUNKSIZE; j++) { if(debug) - printk(KERN_DEBUG " %02X", writechunk[j]); + printk(" %02X", writechunk[j]); } if(debug) - printk(KERN_DEBUG "\n"); + printk("\n"); } #endif if(unlikely(mem_equal(writechunk, FSK_COMMON_PATTERN, DAHDI_CHUNKSIZE))) diff --git a/drivers/dahdi/xpp/xpp_dahdi.c b/drivers/dahdi/xpp/xpp_dahdi.c index a20fd8a..a5879eb 100644 --- a/drivers/dahdi/xpp/xpp_dahdi.c +++ b/drivers/dahdi/xpp/xpp_dahdi.c @@ -803,23 +803,23 @@ int xpp_maint(struct dahdi_span *span, int cmd) DBG(GENERAL, "span->mainttimer=%d\n", span->mainttimer); switch(cmd) { case DAHDI_MAINT_NONE: - printk(KERN_INFO "XXX Turn off local and remote loops XXX\n"); + INFO("XXX Turn off local and remote loops XXX\n"); break; case DAHDI_MAINT_LOCALLOOP: - printk(KERN_INFO "XXX Turn on local loopback XXX\n"); + INFO("XXX Turn on local loopback XXX\n"); break; case DAHDI_MAINT_REMOTELOOP: - printk(KERN_INFO "XXX Turn on remote loopback XXX\n"); + INFO("XXX Turn on remote loopback XXX\n"); break; case DAHDI_MAINT_LOOPUP: - printk(KERN_INFO "XXX Send loopup code XXX\n"); + INFO("XXX Send loopup code XXX\n"); // CALL_XMETHOD(LOOPBACK_AX, xpd->xbus, xpd, loopback_data, ARRAY_SIZE(loopback_data)); break; case DAHDI_MAINT_LOOPDOWN: - printk(KERN_INFO "XXX Send loopdown code XXX\n"); + INFO("XXX Send loopdown code XXX\n"); break; case DAHDI_MAINT_LOOPSTOP: - printk(KERN_INFO "XXX Stop sending loop codes XXX\n"); + INFO("XXX Stop sending loop codes XXX\n"); break; default: ERR("XPP: Unknown maint command: %d\n", cmd); diff --git a/drivers/dahdi/xpp/xproto.c b/drivers/dahdi/xpp/xproto.c index b0d5768..72686e3 100644 --- a/drivers/dahdi/xpp/xproto.c +++ b/drivers/dahdi/xpp/xproto.c @@ -309,7 +309,7 @@ void dump_packet(const char *msg, const xpacket_t *packet, bool debug) int i; byte *p = (byte *)packet; - printk(KERN_DEBUG " BYTES: "); + printk(" BYTES: "); for(i = 0; i < XPACKET_LEN(packet); i++) { static int limiter = 0; @@ -325,11 +325,11 @@ void dump_packet(const char *msg, const xpacket_t *packet, bool debug) break; } if (debug) - printk(KERN_DEBUG "%02X ", p[i]); + printk("%02X ", p[i]); } } #endif - printk(KERN_DEBUG "\n"); + printk("\n"); } void dump_reg_cmd(const char msg[], bool writing, xbus_t *xbus, |