diff options
| author | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2008-07-01 11:01:18 +0000 |
|---|---|---|
| committer | Tzafrir Cohen <tzafrir.cohen@xorcom.com> | 2008-07-01 11:01:18 +0000 |
| commit | 3f85873318cde9423df84580a3378d6df6e94107 (patch) | |
| tree | 3db3cec0cc85a5ecbfa3eebebd8d836e8b19921a | |
| parent | d9e8eab9a3869d54c2ae26c2d7a757762b0e68f7 (diff) | |
Make the bri module built.
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@4487 a0bf4364-ded3-4de4-8d8a-66a801d63aff
| -rw-r--r-- | drivers/dahdi/xpp/Kbuild | 2 | ||||
| -rw-r--r-- | drivers/dahdi/xpp/card_bri.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/dahdi/xpp/Kbuild b/drivers/dahdi/xpp/Kbuild index 8eff5a2..e6e68ca 100644 --- a/drivers/dahdi/xpp/Kbuild +++ b/drivers/dahdi/xpp/Kbuild @@ -6,7 +6,7 @@ EXTRA_CFLAGS = $(XPP_LOCAL_CFLAGS) \ -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 diff --git a/drivers/dahdi/xpp/card_bri.c b/drivers/dahdi/xpp/card_bri.c index a00d0a7..66ce51e 100644 --- a/drivers/dahdi/xpp/card_bri.c +++ b/drivers/dahdi/xpp/card_bri.c @@ -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 @@ static int BRI_card_dahdi_preregistration(xpd_t *xpd, bool on) 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 @@ static int bri_startup(struct dahdi_span *span) * * 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; } |