Skip to content

L
linux
Commit eac74af9 authored by Karsten Keil's avatar Karsten Keil Committed by David S. Miller
Browse files
Options

mISDN: Cleanup debug messages 

This patch make debug printk's KERN_DEBUG and also fix some
codestyle issues.
Signed-off-by: default avatarKarsten Keil <keil@b1-systems.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7245a2fe
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 148 additions and 139 deletions
drivers/isdn/hardware/mISDN/hfcmulti.c
View file @ eac74af9
This diff is collapsed.
drivers/isdn/hardware/mISDN/hfcpci.c
View file @ eac74af9
...@@ -257,7 +257,7 @@ reset_hfcpci(struct hfc_pci *hc) ...@@ -257,7 +257,7 @@ reset_hfcpci(struct hfc_pci *hc)
Write_hfc(hc, HFCPCI_INT_M1, hc->hw.int_m1); Write_hfc(hc, HFCPCI_INT_M1, hc->hw.int_m1);
/* Clear already pending ints */ /* Clear already pending ints */
if (Read_hfc(hc, HFCPCI_INT_S1)); val = Read_hfc(hc, HFCPCI_INT_S1);
/* set NT/TE mode */ /* set NT/TE mode */
hfcpci_setmode(hc); hfcpci_setmode(hc);
...@@ -499,7 +499,8 @@ receive_dmsg(struct hfc_pci *hc) ...@@ -499,7 +499,8 @@ receive_dmsg(struct hfc_pci *hc)
df->f2 = ((df->f2 + 1) & MAX_D_FRAMES) | df->f2 = ((df->f2 + 1) & MAX_D_FRAMES) |
(MAX_D_FRAMES + 1); /* next buffer */ (MAX_D_FRAMES + 1); /* next buffer */
df->za[df->f2 & D_FREG_MASK].z2 = df->za[df->f2 & D_FREG_MASK].z2 =
cpu_to_le16((le16_to_cpu(zp->z2) + rcnt) & (D_FIFO_SIZE - 1)); cpu_to_le16((le16_to_cpu(zp->z2) + rcnt) &
(D_FIFO_SIZE - 1));
} else { } else {
dch->rx_skb = mI_alloc_skb(rcnt - 3, GFP_ATOMIC); dch->rx_skb = mI_alloc_skb(rcnt - 3, GFP_ATOMIC);
if (!dch->rx_skb) { if (!dch->rx_skb) {
...@@ -966,6 +967,7 @@ static void ...@@ -966,6 +967,7 @@ static void
ph_state_nt(struct dchannel *dch) ph_state_nt(struct dchannel *dch)
{ {
struct hfc_pci *hc = dch->hw; struct hfc_pci *hc = dch->hw;
u_char val;
if (dch->debug) if (dch->debug)
printk(KERN_DEBUG "%s: NT newstate %x\n", printk(KERN_DEBUG "%s: NT newstate %x\n",
...@@ -979,7 +981,7 @@ ph_state_nt(struct dchannel *dch) ...@@ -979,7 +981,7 @@ ph_state_nt(struct dchannel *dch)
hc->hw.int_m1 &= ~HFCPCI_INTS_TIMER; hc->hw.int_m1 &= ~HFCPCI_INTS_TIMER;
Write_hfc(hc, HFCPCI_INT_M1, hc->hw.int_m1); Write_hfc(hc, HFCPCI_INT_M1, hc->hw.int_m1);
/* Clear already pending ints */ /* Clear already pending ints */
if (Read_hfc(hc, HFCPCI_INT_S1)); val = Read_hfc(hc, HFCPCI_INT_S1);
Write_hfc(hc, HFCPCI_STATES, 4 | HFCPCI_LOAD_STATE); Write_hfc(hc, HFCPCI_STATES, 4 | HFCPCI_LOAD_STATE);
udelay(10); udelay(10);
Write_hfc(hc, HFCPCI_STATES, 4); Write_hfc(hc, HFCPCI_STATES, 4);
...@@ -1268,8 +1270,7 @@ mode_hfcpci(struct bchannel *bch, int bc, int protocol) ...@@ -1268,8 +1270,7 @@ mode_hfcpci(struct bchannel *bch, int bc, int protocol)
rx_slot = (bc>>8) & 0xff; rx_slot = (bc>>8) & 0xff;
tx_slot = (bc>>16) & 0xff; tx_slot = (bc>>16) & 0xff;
bc = bc & 0xff; bc = bc & 0xff;
} else if (test_bit(HFC_CFG_PCM, &hc->cfg) && } else if (test_bit(HFC_CFG_PCM, &hc->cfg) && (protocol > ISDN_P_NONE))
(protocol > ISDN_P_NONE))
printk(KERN_WARNING "%s: no pcm channel id but HFC_CFG_PCM\n", printk(KERN_WARNING "%s: no pcm channel id but HFC_CFG_PCM\n",
__func__); __func__);
if (hc->chanlimit > 1) { if (hc->chanlimit > 1) {
...@@ -1327,8 +1328,8 @@ mode_hfcpci(struct bchannel *bch, int bc, int protocol) ...@@ -1327,8 +1328,8 @@ mode_hfcpci(struct bchannel *bch, int bc, int protocol)
case (ISDN_P_B_RAW): case (ISDN_P_B_RAW):
bch->state = protocol; bch->state = protocol;
bch->nr = bc; bch->nr = bc;
hfcpci_clear_fifo_rx(hc, (fifo2 & 2)?1:0); hfcpci_clear_fifo_rx(hc, (fifo2 & 2) ? 1 : 0);
hfcpci_clear_fifo_tx(hc, (fifo2 & 2)?1:0); hfcpci_clear_fifo_tx(hc, (fifo2 & 2) ? 1 : 0);
if (bc & 2) { if (bc & 2) {
hc->hw.sctrl |= SCTRL_B2_ENA; hc->hw.sctrl |= SCTRL_B2_ENA;
hc->hw.sctrl_r |= SCTRL_B2_ENA; hc->hw.sctrl_r |= SCTRL_B2_ENA;
...@@ -1362,8 +1363,8 @@ mode_hfcpci(struct bchannel *bch, int bc, int protocol) ...@@ -1362,8 +1363,8 @@ mode_hfcpci(struct bchannel *bch, int bc, int protocol)
case (ISDN_P_B_HDLC): case (ISDN_P_B_HDLC):
bch->state = protocol; bch->state = protocol;
bch->nr = bc; bch->nr = bc;
hfcpci_clear_fifo_rx(hc, (fifo2 & 2)?1:0); hfcpci_clear_fifo_rx(hc, (fifo2 & 2) ? 1 : 0);
hfcpci_clear_fifo_tx(hc, (fifo2 & 2)?1:0); hfcpci_clear_fifo_tx(hc, (fifo2 & 2) ? 1 : 0);
if (bc & 2) { if (bc & 2) {
hc->hw.sctrl |= SCTRL_B2_ENA; hc->hw.sctrl |= SCTRL_B2_ENA;
hc->hw.sctrl_r |= SCTRL_B2_ENA; hc->hw.sctrl_r |= SCTRL_B2_ENA;
...@@ -1457,7 +1458,7 @@ set_hfcpci_rxtest(struct bchannel *bch, int protocol, int chan) ...@@ -1457,7 +1458,7 @@ set_hfcpci_rxtest(struct bchannel *bch, int protocol, int chan)
switch (protocol) { switch (protocol) {
case (ISDN_P_B_RAW): case (ISDN_P_B_RAW):
bch->state = protocol; bch->state = protocol;
hfcpci_clear_fifo_rx(hc, (chan & 2)?1:0); hfcpci_clear_fifo_rx(hc, (chan & 2) ? 1 : 0);
if (chan & 2) { if (chan & 2) {
hc->hw.sctrl_r |= SCTRL_B2_ENA; hc->hw.sctrl_r |= SCTRL_B2_ENA;
hc->hw.fifo_en |= HFCPCI_FIFOEN_B2RX; hc->hw.fifo_en |= HFCPCI_FIFOEN_B2RX;
...@@ -1482,7 +1483,7 @@ set_hfcpci_rxtest(struct bchannel *bch, int protocol, int chan) ...@@ -1482,7 +1483,7 @@ set_hfcpci_rxtest(struct bchannel *bch, int protocol, int chan)
break; break;
case (ISDN_P_B_HDLC): case (ISDN_P_B_HDLC):
bch->state = protocol; bch->state = protocol;
hfcpci_clear_fifo_rx(hc, (chan & 2)?1:0); hfcpci_clear_fifo_rx(hc, (chan & 2) ? 1 : 0);
if (chan & 2) { if (chan & 2) {
hc->hw.sctrl_r |= SCTRL_B2_ENA; hc->hw.sctrl_r |= SCTRL_B2_ENA;
hc->hw.last_bfifo_cnt[1] = 0; hc->hw.last_bfifo_cnt[1] = 0;
...@@ -2047,7 +2048,8 @@ setup_hw(struct hfc_pci *hc) ...@@ -2047,7 +2048,8 @@ setup_hw(struct hfc_pci *hc)
printk(KERN_WARNING "HFC-PCI: No IRQ for PCI card found\n"); printk(KERN_WARNING "HFC-PCI: No IRQ for PCI card found\n");
return 1; return 1;
} }
hc->hw.pci_io = (char __iomem *)(unsigned long)hc->pdev->resource[1].start; hc->hw.pci_io =
(char __iomem *)(unsigned long)hc->pdev->resource[1].start;
if (!hc->hw.pci_io) { if (!hc->hw.pci_io) {
printk(KERN_WARNING "HFC-PCI: No IO-Mem for PCI card found\n"); printk(KERN_WARNING "HFC-PCI: No IO-Mem for PCI card found\n");
...@@ -2289,7 +2291,7 @@ hfc_remove_pci(struct pci_dev *pdev) ...@@ -2289,7 +2291,7 @@ hfc_remove_pci(struct pci_dev *pdev)
release_card(card); release_card(card);
else else
if (debug) if (debug)
printk(KERN_WARNING "%s: drvdata already removed\n", printk(KERN_DEBUG "%s: drvdata already removed\n",
__func__); __func__);
} }
......
drivers/isdn/mISDN/dsp_audio.c
View file @ eac74af9
...@@ -210,9 +210,8 @@ dsp_audio_generate_seven(void) ...@@ -210,9 +210,8 @@ dsp_audio_generate_seven(void)
j = 0; j = 0;
for (k = 0; k < 256; k++) { for (k = 0; k < 256; k++) {
if (dsp_audio_alaw_to_s32[k] if (dsp_audio_alaw_to_s32[k]
< dsp_audio_alaw_to_s32[i]) { < dsp_audio_alaw_to_s32[i])
j++; j++;
}
} }
sorted_alaw[j] = i; sorted_alaw[j] = i;
} }
......
drivers/isdn/mISDN/dsp_cmx.c
View file @ eac74af9
...@@ -238,7 +238,7 @@ dsp_cmx_add_conf_member(struct dsp *dsp, struct dsp_conf *conf) ...@@ -238,7 +238,7 @@ dsp_cmx_add_conf_member(struct dsp *dsp, struct dsp_conf *conf)
member = kzalloc(sizeof(struct dsp_conf_member), GFP_ATOMIC); member = kzalloc(sizeof(struct dsp_conf_member), GFP_ATOMIC);
if (!member) { if (!member) {
printk(KERN_ERR "kmalloc struct dsp_conf_member failed\n"); printk(KERN_ERR "kzalloc struct dsp_conf_member failed\n");
return -ENOMEM; return -ENOMEM;
} }
member->dsp = dsp; member->dsp = dsp;
...@@ -317,7 +317,7 @@ static struct dsp_conf ...@@ -317,7 +317,7 @@ static struct dsp_conf
conf = kzalloc(sizeof(struct dsp_conf), GFP_ATOMIC); conf = kzalloc(sizeof(struct dsp_conf), GFP_ATOMIC);
if (!conf) { if (!conf) {
printk(KERN_ERR "kmalloc struct dsp_conf failed\n"); printk(KERN_ERR "kzalloc struct dsp_conf failed\n");
return NULL; return NULL;
} }
INIT_LIST_HEAD(&conf->mlist); INIT_LIST_HEAD(&conf->mlist);
...@@ -1389,7 +1389,8 @@ dsp_cmx_send_member(struct dsp *dsp, int len, s32 *c, int members) ...@@ -1389,7 +1389,8 @@ dsp_cmx_send_member(struct dsp *dsp, int len, s32 *c, int members)
while (r != rr && t != tt) { while (r != rr && t != tt) {
#ifdef CMX_TX_DEBUG #ifdef CMX_TX_DEBUG
if (strlen(debugbuf) < 48) if (strlen(debugbuf) < 48)
sprintf(debugbuf+strlen(debugbuf), " %02x", p[t]); sprintf(debugbuf+strlen(debugbuf), " %02x",
p[t]);
#endif #endif
*d++ = p[t]; /* write tx_buff */ *d++ = p[t]; /* write tx_buff */
t = (t+1) & CMX_BUFF_MASK; t = (t+1) & CMX_BUFF_MASK;
......
drivers/isdn/mISDN/dsp_core.c
View file @ eac74af9
...@@ -280,7 +280,7 @@ dsp_fill_empty(struct dsp *dsp) ...@@ -280,7 +280,7 @@ dsp_fill_empty(struct dsp *dsp)
static int static int
dsp_control_req(struct dsp *dsp, struct mISDNhead *hh, struct sk_buff *skb) dsp_control_req(struct dsp *dsp, struct mISDNhead *hh, struct sk_buff *skb)
{ {
struct sk_buff *nskb; struct sk_buff *nskb;
int ret = 0; int ret = 0;
int cont; int cont;
u8 *data; u8 *data;
...@@ -558,7 +558,7 @@ dsp_control_req(struct dsp *dsp, struct mISDNhead *hh, struct sk_buff *skb) ...@@ -558,7 +558,7 @@ dsp_control_req(struct dsp *dsp, struct mISDNhead *hh, struct sk_buff *skb)
dsp->pipeline.inuse = 1; dsp->pipeline.inuse = 1;
dsp_cmx_hardware(dsp->conf, dsp); dsp_cmx_hardware(dsp->conf, dsp);
ret = dsp_pipeline_build(&dsp->pipeline, ret = dsp_pipeline_build(&dsp->pipeline,
len > 0 ? (char *)data : NULL); len > 0 ? data : NULL);
dsp_cmx_hardware(dsp->conf, dsp); dsp_cmx_hardware(dsp->conf, dsp);
dsp_rx_off(dsp); dsp_rx_off(dsp);
} }
...@@ -720,7 +720,7 @@ dsp_function(struct mISDNchannel *ch, struct sk_buff *skb) ...@@ -720,7 +720,7 @@ dsp_function(struct mISDNchannel *ch, struct sk_buff *skb)
/* check if dtmf soft decoding is turned on */ /* check if dtmf soft decoding is turned on */
if (dsp->dtmf.software) { if (dsp->dtmf.software) {
digits = dsp_dtmf_goertzel_decode(dsp, skb->data, 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 */ /* we need to process receive data if software */
if (dsp->conf && dsp->conf->software) { if (dsp->conf && dsp->conf->software) {
...@@ -952,7 +952,7 @@ dsp_ctrl(struct mISDNchannel *ch, u_int cmd, void *arg) ...@@ -952,7 +952,7 @@ dsp_ctrl(struct mISDNchannel *ch, u_int cmd, void *arg)
int err = 0; int err = 0;
if (debug & DEBUG_DSP_CTRL) if (debug & DEBUG_DSP_CTRL)
printk(KERN_DEBUG "%s:(%x)\n", __func__, cmd); printk(KERN_DEBUG "%s:(%x)\n", __func__, cmd);
switch (cmd) { switch (cmd) {
case OPEN_CHANNEL: case OPEN_CHANNEL:
...@@ -1175,9 +1175,9 @@ static int dsp_init(void) ...@@ -1175,9 +1175,9 @@ static int dsp_init(void)
/* init conversion tables */ /* init conversion tables */
dsp_audio_generate_law_tables(); dsp_audio_generate_law_tables();
dsp_silence = (dsp_options&DSP_OPT_ULAW)?0xff:0x2a; 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_law_to_s32 = (dsp_options&DSP_OPT_ULAW) ?
dsp_audio_alaw_to_s32; dsp_audio_ulaw_to_s32 : dsp_audio_alaw_to_s32;
dsp_audio_generate_s2law_table(); dsp_audio_generate_s2law_table();
dsp_audio_generate_seven(); dsp_audio_generate_seven();
dsp_audio_generate_mix_table(); dsp_audio_generate_mix_table();
......
drivers/isdn/mISDN/dsp_ecdis.h
View file @ eac74af9
...@@ -91,7 +91,7 @@ int16_t amp) ...@@ -91,7 +91,7 @@ int16_t amp)
&& det->tone_cycle_duration <= 475*8) { && det->tone_cycle_duration <= 475*8) {
det->good_cycles++; det->good_cycles++;
if (det->good_cycles > 2) if (det->good_cycles > 2)
det->hit = TRUE; det->hit = TRUE;
} }
det->tone_cycle_duration = 0; det->tone_cycle_duration = 0;
} }
......
drivers/isdn/mISDN/dsp_tones.c
View file @ eac74af9
...@@ -253,18 +253,24 @@ static struct pattern { ...@@ -253,18 +253,24 @@ static struct pattern {
{8000, 0, 0, 0, 0, 0, 0, 0, 0, 0} }, {8000, 0, 0, 0, 0, 0, 0, 0, 0, 0} },
{TONE_GERMAN_DIALPBX, {TONE_GERMAN_DIALPBX,
{DATA_GA, DATA_S, DATA_GA, DATA_S, DATA_GA, DATA_S, NULL, NULL, NULL, NULL}, {DATA_GA, DATA_S, DATA_GA, DATA_S, DATA_GA, DATA_S, NULL, NULL, NULL,
{SIZE_GA, SIZE_S, SIZE_GA, SIZE_S, SIZE_GA, SIZE_S, NULL, NULL, NULL, NULL}, NULL},
{SIZE_GA, SIZE_S, SIZE_GA, SIZE_S, SIZE_GA, SIZE_S, NULL, NULL, NULL,
NULL},
{2000, 2000, 2000, 2000, 2000, 12000, 0, 0, 0, 0} }, {2000, 2000, 2000, 2000, 2000, 12000, 0, 0, 0, 0} },
{TONE_GERMAN_OLDDIALPBX, {TONE_GERMAN_OLDDIALPBX,
{DATA_GO, DATA_S, DATA_GO, DATA_S, DATA_GO, DATA_S, NULL, NULL, NULL, NULL}, {DATA_GO, DATA_S, DATA_GO, DATA_S, DATA_GO, DATA_S, NULL, NULL, NULL,
{SIZE_GO, SIZE_S, SIZE_GO, SIZE_S, SIZE_GO, SIZE_S, NULL, NULL, NULL, NULL}, NULL},
{SIZE_GO, SIZE_S, SIZE_GO, SIZE_S, SIZE_GO, SIZE_S, NULL, NULL, NULL,
NULL},
{2000, 2000, 2000, 2000, 2000, 12000, 0, 0, 0, 0} }, {2000, 2000, 2000, 2000, 2000, 12000, 0, 0, 0, 0} },
{TONE_AMERICAN_DIALPBX, {TONE_AMERICAN_DIALPBX,
{DATA_DT, DATA_S, DATA_DT, DATA_S, DATA_DT, DATA_S, NULL, NULL, NULL, NULL}, {DATA_DT, DATA_S, DATA_DT, DATA_S, DATA_DT, DATA_S, NULL, NULL, NULL,
{SIZE_DT, SIZE_S, SIZE_DT, SIZE_S, SIZE_DT, SIZE_S, NULL, NULL, NULL, NULL}, NULL},
{SIZE_DT, SIZE_S, SIZE_DT, SIZE_S, SIZE_DT, SIZE_S, NULL, NULL, NULL,
NULL},
{2000, 2000, 2000, 2000, 2000, 12000, 0, 0, 0, 0} }, {2000, 2000, 2000, 2000, 2000, 12000, 0, 0, 0, 0} },
{TONE_GERMAN_RINGING, {TONE_GERMAN_RINGING,
...@@ -434,7 +440,7 @@ dsp_tone_hw_message(struct dsp *dsp, u8 *sample, int len) ...@@ -434,7 +440,7 @@ dsp_tone_hw_message(struct dsp *dsp, u8 *sample, int len)
/* unlocking is not required, because we don't expect a response */ /* unlocking is not required, because we don't expect a response */
nskb = _alloc_mISDN_skb(PH_CONTROL_REQ, nskb = _alloc_mISDN_skb(PH_CONTROL_REQ,
(len)?HFC_SPL_LOOP_ON:HFC_SPL_LOOP_OFF, len, sample, (len) ? HFC_SPL_LOOP_ON : HFC_SPL_LOOP_OFF, len, sample,
GFP_ATOMIC); GFP_ATOMIC);
if (nskb) { if (nskb) {
if (dsp->ch.peer) { if (dsp->ch.peer) {
...@@ -498,8 +504,7 @@ dsp_tone(struct dsp *dsp, int tone) ...@@ -498,8 +504,7 @@ dsp_tone(struct dsp *dsp, int tone)
/* we turn off the tone */ /* we turn off the tone */
if (!tone) { if (!tone) {
if (dsp->features.hfc_loops) if (dsp->features.hfc_loops && timer_pending(&tonet->tl))
if (timer_pending(&tonet->tl))
del_timer(&tonet->tl); del_timer(&tonet->tl);
if (dsp->features.hfc_loops) if (dsp->features.hfc_loops)
dsp_tone_hw_message(dsp, NULL, 0); dsp_tone_hw_message(dsp, NULL, 0);
......
drivers/isdn/mISDN/l1oip_core.c
View file @ eac74af9
...@@ -308,8 +308,8 @@ l1oip_socket_send(struct l1oip *hc, u8 localcodec, u8 channel, u32 chanmask, ...@@ -308,8 +308,8 @@ l1oip_socket_send(struct l1oip *hc, u8 localcodec, u8 channel, u32 chanmask,
/* assemble frame */ /* assemble frame */
*p++ = (L1OIP_VERSION<<6) /* version and coding */ *p++ = (L1OIP_VERSION<<6) /* version and coding */
| (hc->pri?0x20:0x00) /* type */ | (hc->pri ? 0x20 : 0x00) /* type */
| (hc->id?0x10:0x00) /* id */ | (hc->id ? 0x10 : 0x00) /* id */
| localcodec; | localcodec;
if (hc->id) { if (hc->id) {
*p++ = hc->id>>24; /* id */ *p++ = hc->id>>24; /* id */
...@@ -317,7 +317,7 @@ l1oip_socket_send(struct l1oip *hc, u8 localcodec, u8 channel, u32 chanmask, ...@@ -317,7 +317,7 @@ l1oip_socket_send(struct l1oip *hc, u8 localcodec, u8 channel, u32 chanmask,
*p++ = hc->id>>8; *p++ = hc->id>>8;
*p++ = hc->id; *p++ = hc->id;
} }
*p++ = (multi == 1)?0x80:0x00 + channel; /* m-flag, channel */ *p++ = (multi == 1) ? 0x80 : 0x00 + channel; /* m-flag, channel */
if (multi == 1) if (multi == 1)
*p++ = len; /* length */ *p++ = len; /* length */
*p++ = timebase>>8; /* time base */ *p++ = timebase>>8; /* time base */
...@@ -401,12 +401,12 @@ l1oip_socket_recv(struct l1oip *hc, u8 remotecodec, u8 channel, u16 timebase, ...@@ -401,12 +401,12 @@ l1oip_socket_recv(struct l1oip *hc, u8 remotecodec, u8 channel, u16 timebase,
} }
/* prepare message */ /* prepare message */
nskb = mI_alloc_skb((remotecodec == 3)?(len<<1):len, GFP_ATOMIC); nskb = mI_alloc_skb((remotecodec == 3) ? (len<<1) : len, GFP_ATOMIC);
if (!nskb) { if (!nskb) {
printk(KERN_ERR "%s: No mem for skb.\n", __func__); printk(KERN_ERR "%s: No mem for skb.\n", __func__);
return; return;
} }
p = skb_put(nskb, (remotecodec == 3)?(len<<1):len); p = skb_put(nskb, (remotecodec == 3) ? (len<<1) : len);
if (remotecodec == 1 && ulaw) if (remotecodec == 1 && ulaw)
l1oip_alaw_to_ulaw(buf, len, p); l1oip_alaw_to_ulaw(buf, len, p);
...@@ -458,7 +458,7 @@ l1oip_socket_recv(struct l1oip *hc, u8 remotecodec, u8 channel, u16 timebase, ...@@ -458,7 +458,7 @@ l1oip_socket_recv(struct l1oip *hc, u8 remotecodec, u8 channel, u16 timebase,
hc->chan[channel].disorder_flag ^= 1; hc->chan[channel].disorder_flag ^= 1;
if (nskb) if (nskb)
#endif #endif
queue_ch_frame(&bch->ch, PH_DATA_IND, rx_counter, nskb); queue_ch_frame(&bch->ch, PH_DATA_IND, rx_counter, nskb);
} }
} }
...@@ -749,8 +749,8 @@ l1oip_socket_thread(void *data) ...@@ -749,8 +749,8 @@ l1oip_socket_thread(void *data)
l1oip_socket_parse(hc, &sin_rx, recvbuf, recvlen); l1oip_socket_parse(hc, &sin_rx, recvbuf, recvlen);
} else { } else {
if (debug & DEBUG_L1OIP_SOCKET) if (debug & DEBUG_L1OIP_SOCKET)
printk(KERN_WARNING "%s: broken pipe on socket\n", printk(KERN_WARNING
__func__); "%s: broken pipe on socket\n", __func__);
} }
} }
...@@ -925,7 +925,7 @@ handle_dmsg(struct mISDNchannel *ch, struct sk_buff *skb) ...@@ -925,7 +925,7 @@ handle_dmsg(struct mISDNchannel *ch, struct sk_buff *skb)
p = skb->data; p = skb->data;
l = skb->len; l = skb->len;
while (l) { while (l) {
ll = (l < L1OIP_MAX_PERFRAME)?l:L1OIP_MAX_PERFRAME; ll = (l < L1OIP_MAX_PERFRAME) ? l : L1OIP_MAX_PERFRAME;
l1oip_socket_send(hc, 0, dch->slot, 0, l1oip_socket_send(hc, 0, dch->slot, 0,
hc->chan[dch->slot].tx_counter++, p, ll); hc->chan[dch->slot].tx_counter++, p, ll);
p += ll; p += ll;
...@@ -1173,7 +1173,7 @@ handle_bmsg(struct mISDNchannel *ch, struct sk_buff *skb) ...@@ -1173,7 +1173,7 @@ handle_bmsg(struct mISDNchannel *ch, struct sk_buff *skb)
p = skb->data; p = skb->data;
l = skb->len; l = skb->len;
while (l) { while (l) {
ll = (l < L1OIP_MAX_PERFRAME)?l:L1OIP_MAX_PERFRAME; ll = (l < L1OIP_MAX_PERFRAME) ? l : L1OIP_MAX_PERFRAME;
l1oip_socket_send(hc, hc->codec, bch->slot, 0, l1oip_socket_send(hc, hc->codec, bch->slot, 0,
hc->chan[bch->slot].tx_counter, p, ll); hc->chan[bch->slot].tx_counter, p, ll);
hc->chan[bch->slot].tx_counter += ll; hc->chan[bch->slot].tx_counter += ll;
...@@ -1331,8 +1331,8 @@ init_card(struct l1oip *hc, int pri, int bundle) ...@@ -1331,8 +1331,8 @@ init_card(struct l1oip *hc, int pri, int bundle)
spin_lock_init(&hc->socket_lock); spin_lock_init(&hc->socket_lock);
hc->idx = l1oip_cnt; hc->idx = l1oip_cnt;
hc->pri = pri; hc->pri = pri;
hc->d_idx = pri?16:3; hc->d_idx = pri ? 16 : 3;
hc->b_num = pri?30:2; hc->b_num = pri ? 30 : 2;
hc->bundle = bundle; hc->bundle = bundle;
if (hc->pri) if (hc->pri)
sprintf(hc->name, "l1oip-e1.%d", l1oip_cnt + 1); sprintf(hc->name, "l1oip-e1.%d", l1oip_cnt + 1);
...@@ -1517,9 +1517,9 @@ l1oip_init(void) ...@@ -1517,9 +1517,9 @@ l1oip_init(void)
if (debug & DEBUG_L1OIP_INIT) if (debug & DEBUG_L1OIP_INIT)
printk(KERN_DEBUG "%s: interface %d is %s with %s.\n", printk(KERN_DEBUG "%s: interface %d is %s with %s.\n",
__func__, l1oip_cnt, pri?"PRI":"BRI", __func__, l1oip_cnt, pri ? "PRI" : "BRI",
bundle?"bundled IP packet for all B-channels" bundle ? "bundled IP packet for all B-channels" :
:"seperate IP packets for every B-channel"); "seperate IP packets for every B-channel");
hc = kzalloc(sizeof(struct l1oip), GFP_ATOMIC); hc = kzalloc(sizeof(struct l1oip), GFP_ATOMIC);
if (!hc) { if (!hc) {
......
drivers/isdn/mISDN/socket.c
View file @ eac74af9
...@@ -222,7 +222,7 @@ mISDN_sock_sendmsg(struct kiocb *iocb, struct socket *sock, ...@@ -222,7 +222,7 @@ mISDN_sock_sendmsg(struct kiocb *iocb, struct socket *sock,
} else { /* use default for L2 messages */ } else { /* use default for L2 messages */
if ((sk->sk_protocol == ISDN_P_LAPD_TE) || if ((sk->sk_protocol == ISDN_P_LAPD_TE) ||
(sk->sk_protocol == ISDN_P_LAPD_NT)) (sk->sk_protocol == ISDN_P_LAPD_NT))
mISDN_HEAD_ID(skb) = _pms(sk)->ch.nr; mISDN_HEAD_ID(skb) = _pms(sk)->ch.nr;
} }
if (*debug & DEBUG_SOCKET) if (*debug & DEBUG_SOCKET)
......
drivers/isdn/mISDN/tei.c
View file @ eac74af9
...@@ -872,7 +872,6 @@ ph_data_ind(struct manager *mgr, struct sk_buff *skb) ...@@ -872,7 +872,6 @@ ph_data_ind(struct manager *mgr, struct sk_buff *skb)
__func__, skb->len); __func__, skb->len);
goto done; goto done;
} }
if (*debug & DEBUG_L2_TEI)
if ((skb->data[0] >> 2) != TEI_SAPI) /* not for us */ if ((skb->data[0] >> 2) != TEI_SAPI) /* not for us */
goto done; goto done;
......
drivers/isdn/mISDN/timerdev.c
View file @ eac74af9
...@@ -259,7 +259,7 @@ mISDN_ioctl(struct inode *inode, struct file *filep, unsigned int cmd, ...@@ -259,7 +259,7 @@ mISDN_ioctl(struct inode *inode, struct file *filep, unsigned int cmd,
return ret; return ret;
} }
static struct file_operations mISDN_fops = { static const struct file_operations mISDN_fops = {
.read = mISDN_read, .read = mISDN_read,
.poll = mISDN_poll, .poll = mISDN_poll,
.ioctl = mISDN_ioctl, .ioctl = mISDN_ioctl,
......
include/linux/mISDNif.h
View file @ eac74af9
...@@ -292,19 +292,19 @@ struct mISDN_devrename { ...@@ -292,19 +292,19 @@ struct mISDN_devrename {
/* MPH_INFORMATION_REQ payload */ /* MPH_INFORMATION_REQ payload */
struct ph_info_ch { struct ph_info_ch {
__u32 protocol; __u32 protocol;
__u64 Flags; __u64 Flags;
}; };
struct ph_info_dch { struct ph_info_dch {
struct ph_info_ch ch; struct ph_info_ch ch;
__u16 state; __u16 state;
__u16 num_bch; __u16 num_bch;
}; };
struct ph_info { struct ph_info {
struct ph_info_dch dch; struct ph_info_dch dch;
struct ph_info_ch bch[]; struct ph_info_ch bch[];
}; };
/* timer device ioctl */ /* timer device ioctl */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7