diff options
Diffstat (limited to 'drivers/isdn/mISDN/dsp_core.c')
| -rw-r--r-- | drivers/isdn/mISDN/dsp_core.c | 181 | 
1 files changed, 90 insertions, 91 deletions
diff --git a/drivers/isdn/mISDN/dsp_core.c b/drivers/isdn/mISDN/dsp_core.c index 742f9f49668..2ac2d7a25a9 100644 --- a/drivers/isdn/mISDN/dsp_core.c +++ b/drivers/isdn/mISDN/dsp_core.c @@ -218,20 +218,20 @@ dsp_rx_off_member(struct dsp *dsp)  	if (!dsp->ch.peer) {  		if (dsp_debug & DEBUG_DSP_CORE)  			printk(KERN_DEBUG "%s: no peer, no rx_off\n", -				__func__); +			       __func__);  		return;  	}  	cq.op = MISDN_CTRL_RX_OFF;  	cq.p1 = rx_off;  	if (dsp->ch.peer->ctrl(dsp->ch.peer, CONTROL_CHANNEL, &cq)) {  		printk(KERN_DEBUG "%s: 2nd CONTROL_CHANNEL failed\n", -			__func__); +		       __func__);  		return;  	}  	dsp->rx_is_off = rx_off;  	if (dsp_debug & DEBUG_DSP_CORE)  		printk(KERN_DEBUG "%s: %s set rx_off = %d\n", -			__func__, dsp->name, rx_off); +		       __func__, dsp->name, rx_off);  }  static void  dsp_rx_off(struct dsp *dsp) @@ -263,19 +263,19 @@ dsp_fill_empty(struct dsp *dsp)  	if (!dsp->ch.peer) {  		if (dsp_debug & DEBUG_DSP_CORE)  			printk(KERN_DEBUG "%s: no peer, no fill_empty\n", -				__func__); +			       __func__);  		return;  	}  	cq.op = MISDN_CTRL_FILL_EMPTY;  	cq.p1 = 1;  	if (dsp->ch.peer->ctrl(dsp->ch.peer, CONTROL_CHANNEL, &cq)) {  		printk(KERN_DEBUG "%s: CONTROL_CHANNEL failed\n", -			__func__); +		       __func__);  		return;  	}  	if (dsp_debug & DEBUG_DSP_CORE)  		printk(KERN_DEBUG "%s: %s set fill_empty = 1\n", -			__func__, dsp->name); +		       __func__, dsp->name);  }  static int @@ -304,7 +304,7 @@ dsp_control_req(struct dsp *dsp, struct mISDNhead *hh, struct sk_buff *skb)  		if (len == sizeof(int)) {  			if (dsp_debug & DEBUG_DSP_CORE)  				printk(KERN_NOTICE "changing DTMF Threshold " -					"to %d\n", *((int *)data)); +				       "to %d\n", *((int *)data));  			dsp->dtmf.treshold = (*(int *)data) * 10000;  		}  		dsp->dtmf.enable = 1; @@ -331,19 +331,19 @@ dsp_control_req(struct dsp *dsp, struct mISDNhead *hh, struct sk_buff *skb)  			goto conf_split;  		if (dsp_debug & DEBUG_DSP_CORE)  			printk(KERN_DEBUG "%s: join conference %d\n", -				__func__, *((u32 *)data)); +			       __func__, *((u32 *)data));  		ret = dsp_cmx_conf(dsp, *((u32 *)data)); -			/* dsp_cmx_hardware will also be called here */ +		/* dsp_cmx_hardware will also be called here */  		dsp_rx_off(dsp);  		if (dsp_debug & DEBUG_DSP_CMX)  			dsp_cmx_debug(dsp);  		break;  	case DSP_CONF_SPLIT: /* remove from conference */ -conf_split: +	conf_split:  		if (dsp_debug & DEBUG_DSP_CORE)  			printk(KERN_DEBUG "%s: release conference\n", __func__);  		ret = dsp_cmx_conf(dsp, 0); -			/* dsp_cmx_hardware will also be called here */ +		/* dsp_cmx_hardware will also be called here */  		if (dsp_debug & DEBUG_DSP_CMX)  			dsp_cmx_debug(dsp);  		dsp_rx_off(dsp); @@ -359,7 +359,7 @@ conf_split:  		}  		if (dsp_debug & DEBUG_DSP_CORE)  			printk(KERN_DEBUG "%s: turn tone 0x%x on\n", -				__func__, *((int *)skb->data)); +			       __func__, *((int *)skb->data));  		ret = dsp_tone(dsp, *((int *)data));  		if (!ret) {  			dsp_cmx_hardware(dsp->conf, dsp); @@ -379,7 +379,7 @@ conf_split:  		dsp_cmx_hardware(dsp->conf, dsp);  		dsp_rx_off(dsp);  		/* reset tx buffers (user space data) */ -tone_off: +	tone_off:  		dsp->rx_W = 0;  		dsp->rx_R = 0;  		break; @@ -395,7 +395,7 @@ tone_off:  		dsp->tx_volume = *((int *)data);  		if (dsp_debug & DEBUG_DSP_CORE)  			printk(KERN_DEBUG "%s: change tx vol to %d\n", -				__func__, dsp->tx_volume); +			       __func__, dsp->tx_volume);  		dsp_cmx_hardware(dsp->conf, dsp);  		dsp_dtmf_hardware(dsp);  		dsp_rx_off(dsp); @@ -412,7 +412,7 @@ tone_off:  		dsp->rx_volume = *((int *)data);  		if (dsp_debug & DEBUG_DSP_CORE)  			printk(KERN_DEBUG "%s: change rx vol to %d\n", -				__func__, dsp->tx_volume); +			       __func__, dsp->tx_volume);  		dsp_cmx_hardware(dsp->conf, dsp);  		dsp_dtmf_hardware(dsp);  		dsp_rx_off(dsp); @@ -439,14 +439,14 @@ tone_off:  	case DSP_RECEIVE_ON: /* enable receive to user space */  		if (dsp_debug & DEBUG_DSP_CORE)  			printk(KERN_DEBUG "%s: enable receive to user " -				"space\n", __func__); +			       "space\n", __func__);  		dsp->rx_disabled = 0;  		dsp_rx_off(dsp);  		break;  	case DSP_RECEIVE_OFF: /* disable receive to user space */  		if (dsp_debug & DEBUG_DSP_CORE)  			printk(KERN_DEBUG "%s: disable receive to " -				"user space\n", __func__); +			       "user space\n", __func__);  		dsp->rx_disabled = 1;  		dsp_rx_off(dsp);  		break; @@ -457,7 +457,7 @@ tone_off:  		}  		if (dsp_debug & DEBUG_DSP_CORE)  			printk(KERN_DEBUG "%s: enable mixing of " -				"tx-data with conf mebers\n", __func__); +			       "tx-data with conf mebers\n", __func__);  		dsp->tx_mix = 1;  		dsp_cmx_hardware(dsp->conf, dsp);  		dsp_rx_off(dsp); @@ -471,7 +471,7 @@ tone_off:  		}  		if (dsp_debug & DEBUG_DSP_CORE)  			printk(KERN_DEBUG "%s: disable mixing of " -				"tx-data with conf mebers\n", __func__); +			       "tx-data with conf mebers\n", __func__);  		dsp->tx_mix = 0;  		dsp_cmx_hardware(dsp->conf, dsp);  		dsp_rx_off(dsp); @@ -507,18 +507,18 @@ tone_off:  			break;  		}  		dsp->cmx_delay = (*((int *)data)) << 3; -			/* milliseconds to samples */ -		if (dsp->cmx_delay >= (CMX_BUFF_HALF>>1)) +		/* milliseconds to samples */ +		if (dsp->cmx_delay >= (CMX_BUFF_HALF >> 1))  			/* clip to half of maximum usable buffer -			(half of half buffer) */ -			dsp->cmx_delay = (CMX_BUFF_HALF>>1) - 1; +			   (half of half buffer) */ +			dsp->cmx_delay = (CMX_BUFF_HALF >> 1) - 1;  		if (dsp_debug & DEBUG_DSP_CORE)  			printk(KERN_DEBUG "%s: use delay algorithm to " -				"compensate jitter (%d samples)\n", -				__func__, dsp->cmx_delay); +			       "compensate jitter (%d samples)\n", +			       __func__, dsp->cmx_delay);  		break;  	case DSP_JITTER: /* use dynamic jitter algorithm instead of -		    delay algorithm */ +			    delay algorithm */  		if (dsp->hdlc) {  			ret = -EINVAL;  			break; @@ -526,7 +526,7 @@ tone_off:  		dsp->cmx_delay = 0;  		if (dsp_debug & DEBUG_DSP_CORE)  			printk(KERN_DEBUG "%s: use jitter algorithm to " -				"compensate jitter\n", __func__); +			       "compensate jitter\n", __func__);  		break;  	case DSP_TX_DEJITTER: /* use dynamic jitter algorithm for tx-buffer */  		if (dsp->hdlc) { @@ -536,7 +536,7 @@ tone_off:  		dsp->tx_dejitter = 1;  		if (dsp_debug & DEBUG_DSP_CORE)  			printk(KERN_DEBUG "%s: use dejitter on TX " -				"buffer\n", __func__); +			       "buffer\n", __func__);  		break;  	case DSP_TX_DEJ_OFF: /* use tx-buffer without dejittering*/  		if (dsp->hdlc) { @@ -546,7 +546,7 @@ tone_off:  		dsp->tx_dejitter = 0;  		if (dsp_debug & DEBUG_DSP_CORE)  			printk(KERN_DEBUG "%s: use TX buffer without " -				"dejittering\n", __func__); +			       "dejittering\n", __func__);  		break;  	case DSP_PIPELINE_CFG:  		if (dsp->hdlc) { @@ -555,13 +555,13 @@ tone_off:  		}  		if (len > 0 && ((char *)data)[len - 1]) {  			printk(KERN_DEBUG "%s: pipeline config string " -				"is not NULL terminated!\n", __func__); +			       "is not NULL terminated!\n", __func__);  			ret = -EINVAL;  		} else {  			dsp->pipeline.inuse = 1;  			dsp_cmx_hardware(dsp->conf, dsp);  			ret = dsp_pipeline_build(&dsp->pipeline, -				len > 0 ? data : NULL); +						 len > 0 ? data : NULL);  			dsp_cmx_hardware(dsp->conf, dsp);  			dsp_rx_off(dsp);  		} @@ -577,7 +577,7 @@ tone_off:  		}  		if (dsp_debug & DEBUG_DSP_CORE)  			printk(KERN_DEBUG "%s: turn blowfish on (key " -				"not shown)\n", __func__); +			       "not shown)\n", __func__);  		ret = dsp_bf_init(dsp, (u8 *)data, len);  		/* set new cont */  		if (!ret) @@ -586,7 +586,7 @@ tone_off:  			cont = DSP_BF_REJECT;  		/* send indication if it worked to set it */  		nskb = _alloc_mISDN_skb(PH_CONTROL_IND, MISDN_ID_ANY, -			sizeof(int), &cont, GFP_ATOMIC); +					sizeof(int), &cont, GFP_ATOMIC);  		if (nskb) {  			if (dsp->up) {  				if (dsp->up->send(dsp->up, nskb)) @@ -615,7 +615,7 @@ tone_off:  	default:  		if (dsp_debug & DEBUG_DSP_CORE)  			printk(KERN_DEBUG "%s: ctrl req %x unhandled\n", -				__func__, cont); +			       __func__, cont);  		ret = -EINVAL;  	}  	return ret; @@ -630,14 +630,14 @@ get_features(struct mISDNchannel *ch)  	if (!ch->peer) {  		if (dsp_debug & DEBUG_DSP_CORE)  			printk(KERN_DEBUG "%s: no peer, no features\n", -				__func__); +			       __func__);  		return;  	}  	memset(&cq, 0, sizeof(cq));  	cq.op = MISDN_CTRL_GETOP;  	if (ch->peer->ctrl(ch->peer, CONTROL_CHANNEL, &cq) < 0) {  		printk(KERN_DEBUG "%s: CONTROL_CHANNEL failed\n", -			__func__); +		       __func__);  		return;  	}  	if (cq.op & MISDN_CTRL_RX_OFF) @@ -651,12 +651,12 @@ get_features(struct mISDNchannel *ch)  		*((u_long *)&cq.p1) = (u_long)&dsp->features;  		if (ch->peer->ctrl(ch->peer, CONTROL_CHANNEL, &cq)) {  			printk(KERN_DEBUG "%s: 2nd CONTROL_CHANNEL failed\n", -				__func__); +			       __func__);  		}  	} else  		if (dsp_debug & DEBUG_DSP_CORE)  			printk(KERN_DEBUG "%s: features not supported for %s\n", -				__func__, dsp->name); +			       __func__, dsp->name);  }  static int @@ -670,7 +670,7 @@ dsp_function(struct mISDNchannel *ch,  struct sk_buff *skb)  	hh = mISDN_HEAD_P(skb);  	switch (hh->prim) { -	/* FROM DOWN */ +		/* FROM DOWN */  	case (PH_DATA_CNF):  		dsp->data_pending = 0;  		/* trigger next hdlc frame, if any */ @@ -690,8 +690,8 @@ dsp_function(struct mISDNchannel *ch,  struct sk_buff *skb)  		if (dsp->rx_is_off) {  			if (dsp_debug & DEBUG_DSP_CORE)  				printk(KERN_DEBUG "%s: rx-data during rx_off" -					" for %s\n", -				__func__, dsp->name); +				       " for %s\n", +				       __func__, dsp->name);  		}  		if (dsp->hdlc) {  			/* hdlc */ @@ -716,14 +716,14 @@ dsp_function(struct mISDNchannel *ch,  struct sk_buff *skb)  		/* pipeline */  		if (dsp->pipeline.inuse)  			dsp_pipeline_process_rx(&dsp->pipeline, skb->data, -				skb->len, hh->id); +						skb->len, hh->id);  		/* change volume if requested */  		if (dsp->rx_volume)  			dsp_change_volume(skb, dsp->rx_volume);  		/* check if dtmf soft decoding is turned on */  		if (dsp->dtmf.software) {  			digits = dsp_dtmf_goertzel_decode(dsp, skb->data, -				skb->len, (dsp_options&DSP_OPT_ULAW) ? 1 : 0); +							  skb->len, (dsp_options & DSP_OPT_ULAW) ? 1 : 0);  		}  		/* we need to process receive data if software */  		if (dsp->conf && dsp->conf->software) { @@ -740,16 +740,16 @@ dsp_function(struct mISDNchannel *ch,  struct sk_buff *skb)  				struct sk_buff *nskb;  				if (dsp_debug & DEBUG_DSP_DTMF)  					printk(KERN_DEBUG "%s: digit" -					    "(%c) to layer %s\n", -					    __func__, *digits, dsp->name); +					       "(%c) to layer %s\n", +					       __func__, *digits, dsp->name);  				k = *digits | DTMF_TONE_VAL;  				nskb = _alloc_mISDN_skb(PH_CONTROL_IND, -					MISDN_ID_ANY, sizeof(int), &k, -					GFP_ATOMIC); +							MISDN_ID_ANY, sizeof(int), &k, +							GFP_ATOMIC);  				if (nskb) {  					if (dsp->up) {  						if (dsp->up->send( -						    dsp->up, nskb)) +							    dsp->up, nskb))  							dev_kfree_skb(nskb);  					} else  						dev_kfree_skb(nskb); @@ -768,34 +768,34 @@ dsp_function(struct mISDNchannel *ch,  struct sk_buff *skb)  	case (PH_CONTROL_IND):  		if (dsp_debug & DEBUG_DSP_DTMFCOEFF)  			printk(KERN_DEBUG "%s: PH_CONTROL INDICATION " -				"received: %x (len %d) %s\n", __func__, -				hh->id, skb->len, dsp->name); +			       "received: %x (len %d) %s\n", __func__, +			       hh->id, skb->len, dsp->name);  		switch (hh->id) {  		case (DTMF_HFC_COEF): /* getting coefficients */  			if (!dsp->dtmf.hardware) {  				if (dsp_debug & DEBUG_DSP_DTMFCOEFF)  					printk(KERN_DEBUG "%s: ignoring DTMF " -						"coefficients from HFC\n", -						__func__); +					       "coefficients from HFC\n", +					       __func__);  				break;  			}  			digits = dsp_dtmf_goertzel_decode(dsp, skb->data, -				skb->len, 2); +							  skb->len, 2);  			while (*digits) {  				int k;  				struct sk_buff *nskb;  				if (dsp_debug & DEBUG_DSP_DTMF)  					printk(KERN_DEBUG "%s: digit" -					    "(%c) to layer %s\n", -					    __func__, *digits, dsp->name); +					       "(%c) to layer %s\n", +					       __func__, *digits, dsp->name);  				k = *digits | DTMF_TONE_VAL;  				nskb = _alloc_mISDN_skb(PH_CONTROL_IND, -					MISDN_ID_ANY, sizeof(int), &k, -					GFP_ATOMIC); +							MISDN_ID_ANY, sizeof(int), &k, +							GFP_ATOMIC);  				if (nskb) {  					if (dsp->up) {  						if (dsp->up->send( -						    dsp->up, nskb)) +							    dsp->up, nskb))  							dev_kfree_skb(nskb);  					} else  						dev_kfree_skb(nskb); @@ -812,7 +812,7 @@ dsp_function(struct mISDNchannel *ch,  struct sk_buff *skb)  			dsp->tx_volume = *((int *)skb->data);  			if (dsp_debug & DEBUG_DSP_CORE)  				printk(KERN_DEBUG "%s: change tx volume to " -					"%d\n", __func__, dsp->tx_volume); +				       "%d\n", __func__, dsp->tx_volume);  			dsp_cmx_hardware(dsp->conf, dsp);  			dsp_dtmf_hardware(dsp);  			dsp_rx_off(dsp); @@ -821,7 +821,7 @@ dsp_function(struct mISDNchannel *ch,  struct sk_buff *skb)  		default:  			if (dsp_debug & DEBUG_DSP_CORE)  				printk(KERN_DEBUG "%s: ctrl ind %x unhandled " -					"%s\n", __func__, hh->id, dsp->name); +				       "%s\n", __func__, hh->id, dsp->name);  			ret = -EINVAL;  		}  		break; @@ -829,13 +829,13 @@ dsp_function(struct mISDNchannel *ch,  struct sk_buff *skb)  	case (PH_ACTIVATE_CNF):  		if (dsp_debug & DEBUG_DSP_CORE)  			printk(KERN_DEBUG "%s: b_channel is now active %s\n", -				__func__, dsp->name); +			       __func__, dsp->name);  		/* bchannel now active */  		spin_lock_irqsave(&dsp_lock, flags);  		dsp->b_active = 1;  		dsp->data_pending = 0;  		dsp->rx_init = 1; -			/* rx_W and rx_R will be adjusted on first frame */ +		/* rx_W and rx_R will be adjusted on first frame */  		dsp->rx_W = 0;  		dsp->rx_R = 0;  		memset(dsp->rx_buff, 0, sizeof(dsp->rx_buff)); @@ -845,8 +845,8 @@ dsp_function(struct mISDNchannel *ch,  struct sk_buff *skb)  		spin_unlock_irqrestore(&dsp_lock, flags);  		if (dsp_debug & DEBUG_DSP_CORE)  			printk(KERN_DEBUG "%s: done with activation, sending " -				"confirm to user space. %s\n", __func__, -				dsp->name); +			       "confirm to user space. %s\n", __func__, +			       dsp->name);  		/* send activation to upper layer */  		hh->prim = DL_ESTABLISH_CNF;  		if (dsp->up) @@ -856,7 +856,7 @@ dsp_function(struct mISDNchannel *ch,  struct sk_buff *skb)  	case (PH_DEACTIVATE_CNF):  		if (dsp_debug & DEBUG_DSP_CORE)  			printk(KERN_DEBUG "%s: b_channel is now inactive %s\n", -				__func__, dsp->name); +			       __func__, dsp->name);  		/* bchannel now inactive */  		spin_lock_irqsave(&dsp_lock, flags);  		dsp->b_active = 0; @@ -868,7 +868,7 @@ dsp_function(struct mISDNchannel *ch,  struct sk_buff *skb)  		if (dsp->up)  			return dsp->up->send(dsp->up, skb);  		break; -	/* FROM UP */ +		/* FROM UP */  	case (DL_DATA_REQ):  	case (PH_DATA_REQ):  		if (skb->len < 1) { @@ -904,7 +904,7 @@ dsp_function(struct mISDNchannel *ch,  struct sk_buff *skb)  	case (PH_ACTIVATE_REQ):  		if (dsp_debug & DEBUG_DSP_CORE)  			printk(KERN_DEBUG "%s: activating b_channel %s\n", -				__func__, dsp->name); +			       __func__, dsp->name);  		if (dsp->dtmf.hardware || dsp->dtmf.software)  			dsp_dtmf_goertzel_init(dsp);  		get_features(ch); @@ -920,7 +920,7 @@ dsp_function(struct mISDNchannel *ch,  struct sk_buff *skb)  	case (PH_DEACTIVATE_REQ):  		if (dsp_debug & DEBUG_DSP_CORE)  			printk(KERN_DEBUG "%s: releasing b_channel %s\n", -				__func__, dsp->name); +			       __func__, dsp->name);  		spin_lock_irqsave(&dsp_lock, flags);  		dsp->tone.tone = 0;  		dsp->tone.hardware = 0; @@ -939,7 +939,7 @@ dsp_function(struct mISDNchannel *ch,  struct sk_buff *skb)  	default:  		if (dsp_debug & DEBUG_DSP_CORE)  			printk(KERN_DEBUG "%s: msg %x unhandled %s\n", -				__func__, hh->prim, dsp->name); +			       __func__, hh->prim, dsp->name);  		ret = -EINVAL;  	}  	if (!ret) @@ -978,7 +978,7 @@ dsp_ctrl(struct mISDNchannel *ch, u_int cmd, void *arg)  		skb_queue_purge(&dsp->sendq);  		if (dsp_debug & DEBUG_DSP_CTRL)  			printk(KERN_DEBUG "%s: releasing member %s\n", -				__func__, dsp->name); +			       __func__, dsp->name);  		dsp->b_active = 0;  		dsp_cmx_conf(dsp, 0); /* dsp_cmx_hardware will also be called  					 here */ @@ -986,13 +986,13 @@ dsp_ctrl(struct mISDNchannel *ch, u_int cmd, void *arg)  		if (dsp_debug & DEBUG_DSP_CTRL)  			printk(KERN_DEBUG "%s: remove & destroy object %s\n", -				__func__, dsp->name); +			       __func__, dsp->name);  		list_del(&dsp->list);  		spin_unlock_irqrestore(&dsp_lock, flags);  		if (dsp_debug & DEBUG_DSP_CTRL)  			printk(KERN_DEBUG "%s: dsp instance released\n", -				__func__); +			       __func__);  		vfree(dsp);  		module_put(THIS_MODULE);  		break; @@ -1016,7 +1016,7 @@ dsp_send_bh(struct work_struct *work)  		if (dsp->data_pending) {  			if (dsp_debug & DEBUG_DSP_CORE)  				printk(KERN_DEBUG "%s: fifo full %s, this is " -					"no bug!\n", __func__, dsp->name); +				       "no bug!\n", __func__, dsp->name);  			/* flush transparent data, if not acked */  			dev_kfree_skb(skb);  			continue; @@ -1050,7 +1050,7 @@ dspcreate(struct channel_req *crq)  	u_long		flags;  	if (crq->protocol != ISDN_P_B_L2DSP -	 && crq->protocol != ISDN_P_B_L2DSPHDLC) +	    && crq->protocol != ISDN_P_B_L2DSPHDLC)  		return -EPROTONOSUPPORT;  	ndsp = vzalloc(sizeof(struct dsp));  	if (!ndsp) { @@ -1076,7 +1076,7 @@ dspcreate(struct channel_req *crq)  	}  	if (!try_module_get(THIS_MODULE))  		printk(KERN_WARNING "%s:cannot get module\n", -			__func__); +		       __func__);  	sprintf(ndsp->name, "DSP_C%x(0x%p)",  		ndsp->up->st->dev->id + 1, ndsp); @@ -1095,7 +1095,7 @@ dspcreate(struct channel_req *crq)  	if (dtmfthreshold < 20 || dtmfthreshold > 500)  		dtmfthreshold = 200; -	ndsp->dtmf.treshold = dtmfthreshold*10000; +	ndsp->dtmf.treshold = dtmfthreshold * 10000;  	/* init pipeline append to list */  	spin_lock_irqsave(&dsp_lock, flags); @@ -1109,7 +1109,7 @@ dspcreate(struct channel_req *crq)  static struct Bprotocol DSP = {  	.Bprotocols = (1 << (ISDN_P_B_L2DSP & ISDN_P_B_MASK)) -		| (1 << (ISDN_P_B_L2DSPHDLC & ISDN_P_B_MASK)), +	| (1 << (ISDN_P_B_L2DSPHDLC & ISDN_P_B_MASK)),  	.name = "dsp",  	.create = dspcreate  }; @@ -1129,21 +1129,21 @@ static int __init dsp_init(void)  	if (dsp_poll) {  		if (dsp_poll > MAX_POLL) {  			printk(KERN_ERR "%s: Wrong poll value (%d), use %d " -				"maximum.\n", __func__, poll, MAX_POLL); +			       "maximum.\n", __func__, poll, MAX_POLL);  			err = -EINVAL;  			return err;  		}  		if (dsp_poll < 8) {  			printk(KERN_ERR "%s: Wrong poll value (%d), use 8 " -				"minimum.\n", __func__, dsp_poll); +			       "minimum.\n", __func__, dsp_poll);  			err = -EINVAL;  			return err;  		}  		dsp_tics = poll * HZ / 8000;  		if (dsp_tics * 8000 != poll * HZ) {  			printk(KERN_INFO "mISDN_dsp: Cannot clock every %d " -				"samples (0,125 ms). It is not a multiple of " -				"%d HZ.\n", poll, HZ); +			       "samples (0,125 ms). It is not a multiple of " +			       "%d HZ.\n", poll, HZ);  			err = -EINVAL;  			return err;  		} @@ -1162,14 +1162,14 @@ static int __init dsp_init(void)  	}  	if (dsp_poll == 0) {  		printk(KERN_INFO "mISDN_dsp: There is no multiple of kernel " -			"clock that equals exactly the duration of 8-256 " -			"samples. (Choose kernel clock speed like 100, 250, " -			"300, 1000)\n"); +		       "clock that equals exactly the duration of 8-256 " +		       "samples. (Choose kernel clock speed like 100, 250, " +		       "300, 1000)\n");  		err = -EINVAL;  		return err;  	}  	printk(KERN_INFO "mISDN_dsp: DSP clocks every %d samples. This equals " -		"%d jiffies.\n", dsp_poll, dsp_tics); +	       "%d jiffies.\n", dsp_poll, dsp_tics);  	spin_lock_init(&dsp_lock);  	INIT_LIST_HEAD(&dsp_ilist); @@ -1177,8 +1177,8 @@ static int __init dsp_init(void)  	/* init conversion tables */  	dsp_audio_generate_law_tables(); -	dsp_silence = (dsp_options&DSP_OPT_ULAW) ? 0xff : 0x2a; -	dsp_audio_law_to_s32 = (dsp_options&DSP_OPT_ULAW) ? +	dsp_silence = (dsp_options & DSP_OPT_ULAW) ? 0xff : 0x2a; +	dsp_audio_law_to_s32 = (dsp_options & DSP_OPT_ULAW) ?  		dsp_audio_ulaw_to_s32 : dsp_audio_alaw_to_s32;  	dsp_audio_generate_s2law_table();  	dsp_audio_generate_seven(); @@ -1190,7 +1190,7 @@ static int __init dsp_init(void)  	err = dsp_pipeline_module_init();  	if (err) {  		printk(KERN_ERR "mISDN_dsp: Can't initialize pipeline, " -			"error(%d)\n", err); +		       "error(%d)\n", err);  		return err;  	} @@ -1221,11 +1221,11 @@ static void __exit dsp_cleanup(void)  	if (!list_empty(&dsp_ilist)) {  		printk(KERN_ERR "mISDN_dsp: Audio DSP object inst list not " -			"empty.\n"); +		       "empty.\n");  	}  	if (!list_empty(&conf_ilist)) {  		printk(KERN_ERR "mISDN_dsp: Conference list not empty. Not " -			"all memory freed.\n"); +		       "all memory freed.\n");  	}  	dsp_pipeline_module_exit(); @@ -1233,4 +1233,3 @@ static void __exit dsp_cleanup(void)  module_init(dsp_init);  module_exit(dsp_cleanup); -  |