[svn-commits] seanbright: linux/trunk r5045 - /linux/trunk/drivers/dahdi/

[SVN commits to the Digium repositories]

Author: seanbright
Date: Fri Oct  3 15:09:40 2008
New Revision: 5045

URL: http://svn.digium.com/view/dahdi?view=rev&rev=5045
Log:
Fix some compilation problems that show up when CONFIG_DAHDI_DEBUG is defined.

Modified:
    linux/trunk/drivers/dahdi/dahdi-base.c
    linux/trunk/drivers/dahdi/dahdi_config.h

Modified: linux/trunk/drivers/dahdi/dahdi-base.c
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/dahdi-base.c?view=diff&rev=5045&r1=5044&r2=5045
==============================================================================
--- linux/trunk/drivers/dahdi/dahdi-base.c (original)
+++ linux/trunk/drivers/dahdi/dahdi-base.c Fri Oct  3 15:09:40 2008
@@ -2042,7 +2042,7 @@
 
 #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 @@
 		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 @@
 			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);
 

Modified: linux/trunk/drivers/dahdi/dahdi_config.h
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/dahdi_config.h?view=diff&rev=5045&r1=5044&r2=5045
==============================================================================
--- linux/trunk/drivers/dahdi/dahdi_config.h (original)
+++ linux/trunk/drivers/dahdi/dahdi_config.h Fri Oct  3 15:09:40 2008
@@ -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.
  */