diff options
| author | Sean Bright <sean@malleable.com> | 2008-10-03 20:09:40 +0000 |
|---|---|---|
| committer | Sean Bright <sean@malleable.com> | 2008-10-03 20:09:40 +0000 |
| commit | f4b3ccbbb4babe4c36fbf617ea834395898673e1 (patch) | |
| tree | 7df90d80ff5fdf0113ac898af864a0c213f0697d /drivers | |
| parent | 61136b0f97129d5734ebd049beff1ecd01adb199 (diff) | |
Fix some compilation problems that show up when CONFIG_DAHDI_DEBUG is defined.
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@5045 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/dahdi/dahdi-base.c | 6 | ||||
| -rw-r--r-- | drivers/dahdi/dahdi_config.h | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/drivers/dahdi/dahdi-base.c b/drivers/dahdi/dahdi-base.c index c5dab1c..5593adf 100644 --- a/drivers/dahdi/dahdi-base.c +++ b/drivers/dahdi/dahdi-base.c @@ -2042,7 +2042,7 @@ static ssize_t dahdi_chan_write(struct file *file, const char *usrbuf, size_t co #ifdef CONFIG_DAHDI_DEBUG module_printk(KERN_NOTICE, "dahdi_chan_write(unit: %d, res: %d, outwritebuf: %d amnt: %d\n", - unit, chan->res, chan->outwritebuf, amnt); + unit, res, chan->outwritebuf, amnt); #endif #if 0 if ((unit == 24) || (unit == 48) || (unit == 16) || (unit == 47)) { @@ -3675,7 +3675,7 @@ static void recalc_slaves(struct dahdi_chan *chan) if (chan->span->chans[x]->master == chan) { #ifdef CONFIG_DAHDI_DEBUG module_printk(KERN_NOTICE, "Channel %s, slave to %s, last is %s, its next will be %d\n", - chan->span->chans[x].name, chan->name, last->name, x); + chan->span->chans[x]->name, chan->name, last->name, x); #endif last->nextslave = x; last = chan->span->chans[x]; @@ -3966,7 +3966,7 @@ static int dahdi_ctl_ioctl(struct inode *inode, struct file *file, unsigned int chans[ch.chan]->rxhooksig = DAHDI_RXSIG_INITIAL; } #ifdef CONFIG_DAHDI_DEBUG - module_printk(KERN_NOTICE, "Configured channel %s, flags %04x, sig %04x\n", chans[ch.chan]->name, chans[ch.chan]->flags, chans[ch.chan]->sig); + module_printk(KERN_NOTICE, "Configured channel %s, flags %04lx, sig %04x\n", chans[ch.chan]->name, chans[ch.chan]->flags, chans[ch.chan]->sig); #endif spin_unlock_irqrestore(&chans[ch.chan]->lock, flags); diff --git a/drivers/dahdi/dahdi_config.h b/drivers/dahdi/dahdi_config.h index 271f106..68a4517 100644 --- a/drivers/dahdi/dahdi_config.h +++ b/drivers/dahdi/dahdi_config.h @@ -112,6 +112,11 @@ /* #define CONFIG_DAHDI_WATCHDOG */ /* + * Uncomment the following to include extra debugging output. + */ +/* #define CONFIG_DAHDI_DEBUG */ + +/* * Uncomment for Non-standard FXS groundstart start state (A=Low, B=Low) * particularly for CAC channel bank groundstart FXO ports. */ |