From 8db0cfc59baa85c2b08e34857b5b1642c2e96142 Mon Sep 17 00:00:00 2001 From: kpfleming Date: Wed, 23 Nov 2005 17:33:44 +0000 Subject: eliminate preprocessor warnings git-svn-id: http://svn.digium.com/svn/zaptel/branches/v1-2@824 5390a7c7-147a-4af0-8ec9-7488f05a26cb --- zaptel.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/zaptel.c b/zaptel.c index 5369faa..bbcd735 100755 --- a/zaptel.c +++ b/zaptel.c @@ -1260,7 +1260,7 @@ static int zt_net_open(hdlc_device *hdlc) #ifndef LINUX26 MOD_INC_USE_COUNT; #endif -#if CONFIG_ZAPATA_DEBUG +#ifdef CONFIG_ZAPATA_DEBUG printk("ZAPNET: Opened channel %d name %s\n", ms->channo, ms->name); #endif return 0; @@ -1421,7 +1421,7 @@ static int zt_xmit(hdlc_device *hdlc, struct sk_buff *skb) dev->trans_start = jiffies; stats->tx_packets++; stats->tx_bytes += ss->writen[oldbuf]; -#if CONFIG_ZAPATA_DEBUG +#ifdef CONFIG_ZAPATA_DEBUG printk("Buffered %d bytes to go out in buffer %d\n", ss->writen[oldbuf], oldbuf); for (x=0;xwriten[oldbuf];x++) printk("%02x ", ss->writebuf[oldbuf][x]); @@ -1522,7 +1522,7 @@ static int zt_ppp_xmit(struct ppp_channel *ppp, struct sk_buff *skb) some space for us */ ss->outwritebuf = oldbuf; } -#if CONFIG_ZAPATA_DEBUG +#ifdef CONFIG_ZAPATA_DEBUG printk("Buffered %d bytes (skblen = %d) to go out in buffer %d\n", ss->writen[oldbuf], skb->len, oldbuf); for (x=0;xwriten[oldbuf];x++) printk("%02x ", ss->writebuf[oldbuf][x]); @@ -1733,7 +1733,7 @@ static ssize_t zt_chan_write(struct file *file, const char *usrbuf, size_t count amnt = chan->blocksize; } -#if CONFIG_ZAPATA_DEBUG +#ifdef CONFIG_ZAPATA_DEBUG printk("zt_chan_write(unit: %d, inwritebuf: %d, outwritebuf: %d amnt: %d\n", unit, chan->inwritebuf, chan->outwritebuf, amnt); #endif @@ -1920,7 +1920,7 @@ who cares what the sig bits are as long as they are stable */ } else { for (x=0;xsig) { -#if CONFIG_ZAPATA_DEBUG +#ifdef CONFIG_ZAPATA_DEBUG printk("Setting bits to %d for channel %s state %d in %d signalling\n", outs[x][txsig + 1], chan->name, txsig, chan->sig); #endif chan->txhooksig = txsig; @@ -3029,14 +3029,14 @@ static void recalc_slaves(struct zt_chan *chan) if (!chan->span) return; -#if CONFIG_ZAPATA_DEBUG +#ifdef CONFIG_ZAPATA_DEBUG printk("Recalculating slaves on %s\n", chan->name); #endif /* Link all slaves appropriately */ for (x=chan->chanpos;xspan->channels;x++) if (chan->span->chans[x].master == chan) { -#if CONFIG_ZAPATA_DEBUG +#ifdef CONFIG_ZAPATA_DEBUG printk("Channel %s, slave to %s, last is %s, its next will be %d\n", chan->span->chans[x].name, chan->name, last->name, x); #endif @@ -3045,7 +3045,7 @@ static void recalc_slaves(struct zt_chan *chan) } /* Terminate list */ last->nextslave = 0; -#if CONFIG_ZAPATA_DEBUG +#ifdef CONFIG_ZAPATA_DEBUG printk("Done Recalculating slaves on %s (last is %s)\n", chan->name, last->name); #endif } @@ -3292,7 +3292,7 @@ static int zt_ctl_ioctl(struct inode *inode, struct file *file, unsigned int cmd if (y >= 0) chans[ch.chan]->rxsig = (unsigned char)y; chans[ch.chan]->rxhooksig = ZT_RXSIG_INITIAL; } -#if CONFIG_ZAPATA_DEBUG +#ifdef CONFIG_ZAPATA_DEBUG printk("Configured channel %s, flags %04x, sig %04x\n", chans[ch.chan]->name, chans[ch.chan]->flags, chans[ch.chan]->sig); #endif spin_unlock_irqrestore(&chans[ch.chan]->lock, flags); @@ -5284,7 +5284,7 @@ static void __zt_hooksig_pvt(struct zt_chan *chan, zt_rxsig_t rxsig) zt_rbs_sethook(chan,ZT_TXSIG_OFFHOOK, ZT_TXSTATE_AFTERSTART, ZT_AFTERSTART_TIME); } chan->kewlonhook = 0; -#if CONFIG_ZAPATA_DEBUG +#ifdef CONFIG_ZAPATA_DEBUG printk("Off hook on channel %d, itimer = %d, gotgs = %d\n", chan->channo, chan->itimer, chan->gotgs); #endif if (chan->itimer) /* if timer still running */ @@ -5803,7 +5803,7 @@ static inline void __zt_putbuf_chunk(struct zt_chan *ss, unsigned char *rxb) oldbuf = ms->inreadbuf; ms->infcs = PPP_INITFCS; ms->readn[ms->inreadbuf] = ms->readidx[ms->inreadbuf]; -#if CONFIG_ZAPATA_DEBUG +#ifdef CONFIG_ZAPATA_DEBUG printk("EOF, len is %d\n", ms->readn[ms->inreadbuf]); #endif #if defined(CONFIG_ZAPATA_NET) || defined(CONFIG_ZAPATA_PPP) @@ -5873,7 +5873,7 @@ static inline void __zt_putbuf_chunk(struct zt_chan *ss, unsigned char *rxb) /* Whoops, we're full, and have no where else to store into at the moment. We'll drop it until there's a buffer available */ -#if CONFIG_ZAPATA_DEBUG +#ifdef CONFIG_ZAPATA_DEBUG printk("Out of storage space\n"); #endif ms->inreadbuf = -1; @@ -5896,7 +5896,7 @@ out in the later versions, and is put back now. */ if (!ms->rxdisable) { /* if receiver enabled */ /* Notify a blocked reader that there is data available to be read, unless we're waiting for it to be full */ -#if CONFIG_ZAPATA_DEBUG +#ifdef CONFIG_ZAPATA_DEBUG printk("Notifying reader data in block %d\n", oldbuf); #endif wake_up_interruptible(&ms->readbufq); -- cgit v1.2.3