[dahdi-commits] tzafrir: linux/trunk r4487 - /linux/trunk/drivers/dahdi/xpp/

[SVN commits to the DAHDI project]

Author: tzafrir
Date: Tue Jul  1 06:01:18 2008
New Revision: 4487

URL: http://svn.digium.com/view/dahdi?view=rev&rev=4487
Log:
Make the bri module built.

Modified:
    linux/trunk/drivers/dahdi/xpp/Kbuild
    linux/trunk/drivers/dahdi/xpp/card_bri.c

Modified: linux/trunk/drivers/dahdi/xpp/Kbuild
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/xpp/Kbuild?view=diff&rev=4487&r1=4486&r2=4487
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/Kbuild (original)
+++ linux/trunk/drivers/dahdi/xpp/Kbuild Tue Jul  1 06:01:18 2008
@@ -6,7 +6,7 @@
 			-g
 			#
 
-WITH_BRISTUFF	:= $(shell grep '^[[:space:]]*\#[[:space:]]*define[[:space:]]\+CONFIG_ZAPATA_BRI_DCHANS\>' $(src)/../dahdi_config.h)
+WITH_BRISTUFF	:= $(shell grep '^[[:space:]]*\#[[:space:]]*define[[:space:]]\+CONFIG_DAHDI_BRI_DCHANS\>' $(src)/../dahdi_config.h)
 
 obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_XPP)		+= xpp.o
 obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_XPD_FXS)		+= xpd_fxs.o

Modified: linux/trunk/drivers/dahdi/xpp/card_bri.c
URL: http://svn.digium.com/view/dahdi/linux/trunk/drivers/dahdi/xpp/card_bri.c?view=diff&rev=4487&r1=4486&r2=4487
==============================================================================
--- linux/trunk/drivers/dahdi/xpp/card_bri.c (original)
+++ linux/trunk/drivers/dahdi/xpp/card_bri.c Tue Jul  1 06:01:18 2008
@@ -35,8 +35,8 @@
 
 static const char rcsid[] = "$Id$";
 
-#ifndef CONFIG_ZAPATA_BRI_DCHANS
-#error CONFIG_ZAPATA_BRI_DCHANS is not defined
+#ifndef CONFIG_DAHDI_BRI_DCHANS
+#error CONFIG_DAHDI_BRI_DCHANS is not defined
 #endif
 
 static DEF_PARM(int, debug, 0, 0644, "Print DBG statements");	/* must be before dahdi_debug.h */
@@ -690,8 +690,8 @@
 		cur_chan->pvt = xpd;
 		if(i == 2) {	/* D-CHAN */
 			cur_chan->sigcap = BRI_DCHAN_SIGCAP;
-			cur_chan->flags |= DAHDI_FLAG_BRIDCHAN;
-			cur_chan->flags &= ~DAHDI_FLAG_HDLC;
+			set_bit(DAHDI_FLAGBIT_BRIDCHAN, &cur_chan->flags);
+			clear_bit(DAHDI_FLAGBIT_HDLC, &cur_chan->flags);
 
 			/* Setup big buffers for D-Channel rx/tx */
 			cur_chan->readchunk = priv->dchan_rbuf;
@@ -1039,8 +1039,8 @@
 		 *
 		 * Don't Get Mad, Get Even:  Now we override dahdi :-)
 		 */
-		dchan->flags |= DAHDI_FLAG_BRIDCHAN;
-		dchan->flags &= ~DAHDI_FLAG_HDLC;
+		set_bit(DAHDI_FLAGBIT_BRIDCHAN, &dchan->flags);
+		clear_bit(DAHDI_FLAGBIT_HDLC, &dchan->flags);
 	}
 	return 0;
 }