Merge branch 'for_2.6.29' of git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6
* 'for_2.6.29' of git://git.kernel.org/pub/scm/linux/kernel/git/kkeil/ISDN-2.6: (28 commits) mISDN: Add HFC USB driver mISDN: Add layer1 prim MPH_INFORMATION_REQ mISDN: Fix kernel crash when doing hardware conference with more than two members mISDN: Added missing create_l1() call mISDN: Add MODULE_DEVICE_TABLE() to hfcpci mISDN: Minor cleanups mISDN: Create /sys/class/mISDN mISDN: Add missing release functions mISDN: Add different different timer settings for hfc-pci mISDN: Minor fixes mISDN: Correct busy device detection mISDN: Fix deactivation, if peer IP is removed from l1oip instance. mISDN: Add ISDN_P_TE_UP0 / ISDN_P_NT_UP0 mISDN: Fix irq detection mISDN: Add ISDN sample clock API to mISDN core mISDN: Return error on E-channel access mISDN: Add E-Channel logging features mISDN: Use protocol to detect D-channel mISDN: Fixed more indexing bugs mISDN: Make debug output a little bit more verbose ...
This commit is contained in:
commit
2fb585a10e
|
@ -23,3 +23,10 @@ config MISDN_HFCMULTI
|
|||
* HFC-8S (8 S/T interfaces on one chip)
|
||||
* HFC-E1 (E1 interface for 2Mbit ISDN)
|
||||
|
||||
config MISDN_HFCUSB
|
||||
tristate "Support for HFC-S USB based TAs"
|
||||
depends on USB
|
||||
help
|
||||
Enable support for USB ISDN TAs with Cologne Chip AG's
|
||||
HFC-S USB ISDN Controller
|
||||
|
||||
|
|
|
@ -5,3 +5,4 @@
|
|||
|
||||
obj-$(CONFIG_MISDN_HFCPCI) += hfcpci.o
|
||||
obj-$(CONFIG_MISDN_HFCMULTI) += hfcmulti.o
|
||||
obj-$(CONFIG_MISDN_HFCUSB) += hfcsusb.o
|
||||
|
|
|
@ -2,10 +2,6 @@
|
|||
* see notice in hfc_multi.c
|
||||
*/
|
||||
|
||||
extern void ztdummy_extern_interrupt(void);
|
||||
extern void ztdummy_register_interrupt(void);
|
||||
extern int ztdummy_unregister_interrupt(void);
|
||||
|
||||
#define DEBUG_HFCMULTI_FIFO 0x00010000
|
||||
#define DEBUG_HFCMULTI_CRC 0x00020000
|
||||
#define DEBUG_HFCMULTI_INIT 0x00040000
|
||||
|
@ -13,6 +9,7 @@ extern int ztdummy_unregister_interrupt(void);
|
|||
#define DEBUG_HFCMULTI_MODE 0x00100000
|
||||
#define DEBUG_HFCMULTI_MSG 0x00200000
|
||||
#define DEBUG_HFCMULTI_STATE 0x00400000
|
||||
#define DEBUG_HFCMULTI_FILL 0x00800000
|
||||
#define DEBUG_HFCMULTI_SYNC 0x01000000
|
||||
#define DEBUG_HFCMULTI_DTMF 0x02000000
|
||||
#define DEBUG_HFCMULTI_LOCK 0x80000000
|
||||
|
@ -170,6 +167,8 @@ struct hfc_multi {
|
|||
|
||||
u_long chip; /* chip configuration */
|
||||
int masterclk; /* port that provides master clock -1=off */
|
||||
unsigned char silence;/* silence byte */
|
||||
unsigned char silence_data[128];/* silence block */
|
||||
int dtmf; /* flag that dtmf is currently in process */
|
||||
int Flen; /* F-buffer size */
|
||||
int Zlen; /* Z-buffer size (must be int for calculation)*/
|
||||
|
@ -198,6 +197,9 @@ struct hfc_multi {
|
|||
|
||||
spinlock_t lock; /* the lock */
|
||||
|
||||
struct mISDNclock *iclock; /* isdn clock support */
|
||||
int iclock_on;
|
||||
|
||||
/*
|
||||
* the channel index is counted from 0, regardless where the channel
|
||||
* is located on the hfc-channel.
|
||||
|
|
|
@ -26,7 +26,7 @@
|
|||
* change mask and threshold simultaneously
|
||||
*/
|
||||
#define HFCPCI_BTRANS_THRESHOLD 128
|
||||
#define HFCPCI_BTRANS_MAX 256
|
||||
#define HFCPCI_FILLEMPTY 64
|
||||
#define HFCPCI_BTRANS_THRESMASK 0x00
|
||||
|
||||
/* defines for PCI config */
|
||||
|
|
|
@ -133,6 +133,12 @@
|
|||
* Give the value of the clock control register (A_ST_CLK_DLY)
|
||||
* of the S/T interfaces in TE mode.
|
||||
* This register is needed for the TBR3 certification, so don't change it.
|
||||
*
|
||||
* clock:
|
||||
* NOTE: only one clock value must be given once
|
||||
* Selects interface with clock source for mISDN and applications.
|
||||
* Set to card number starting with 1. Set to -1 to disable.
|
||||
* By default, the first card is used as clock source.
|
||||
*/
|
||||
|
||||
/*
|
||||
|
@ -140,7 +146,7 @@
|
|||
* #define HFC_REGISTER_DEBUG
|
||||
*/
|
||||
|
||||
static const char *hfcmulti_revision = "2.02";
|
||||
#define HFC_MULTI_VERSION "2.03"
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/pci.h>
|
||||
|
@ -165,10 +171,6 @@ static LIST_HEAD(HFClist);
|
|||
static spinlock_t HFClock; /* global hfc list lock */
|
||||
|
||||
static void ph_state_change(struct dchannel *);
|
||||
static void (*hfc_interrupt)(void);
|
||||
static void (*register_interrupt)(void);
|
||||
static int (*unregister_interrupt)(void);
|
||||
static int interrupt_registered;
|
||||
|
||||
static struct hfc_multi *syncmaster;
|
||||
static int plxsd_master; /* if we have a master card (yet) */
|
||||
|
@ -184,7 +186,6 @@ static int nt_t1_count[] = { 3840, 1920, 960, 480, 240, 120, 60, 30 };
|
|||
#define CLKDEL_TE 0x0f /* CLKDEL in TE mode */
|
||||
#define CLKDEL_NT 0x6c /* CLKDEL in NT mode
|
||||
(0x60 MUST be included!) */
|
||||
static u_char silence = 0xff; /* silence by LAW */
|
||||
|
||||
#define DIP_4S 0x1 /* DIP Switches for Beronet 1S/2S/4S cards */
|
||||
#define DIP_8S 0x2 /* DIP Switches for Beronet 8S+ cards */
|
||||
|
@ -195,12 +196,13 @@ static u_char silence = 0xff; /* silence by LAW */
|
|||
*/
|
||||
|
||||
static uint type[MAX_CARDS];
|
||||
static uint pcm[MAX_CARDS];
|
||||
static uint dslot[MAX_CARDS];
|
||||
static int pcm[MAX_CARDS];
|
||||
static int dslot[MAX_CARDS];
|
||||
static uint iomode[MAX_CARDS];
|
||||
static uint port[MAX_PORTS];
|
||||
static uint debug;
|
||||
static uint poll;
|
||||
static int clock;
|
||||
static uint timer;
|
||||
static uint clockdelay_te = CLKDEL_TE;
|
||||
static uint clockdelay_nt = CLKDEL_NT;
|
||||
|
@ -209,14 +211,16 @@ static int HFC_cnt, Port_cnt, PCM_cnt = 99;
|
|||
|
||||
MODULE_AUTHOR("Andreas Eversberg");
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_VERSION(HFC_MULTI_VERSION);
|
||||
module_param(debug, uint, S_IRUGO | S_IWUSR);
|
||||
module_param(poll, uint, S_IRUGO | S_IWUSR);
|
||||
module_param(clock, int, S_IRUGO | S_IWUSR);
|
||||
module_param(timer, uint, S_IRUGO | S_IWUSR);
|
||||
module_param(clockdelay_te, uint, S_IRUGO | S_IWUSR);
|
||||
module_param(clockdelay_nt, uint, S_IRUGO | S_IWUSR);
|
||||
module_param_array(type, uint, NULL, S_IRUGO | S_IWUSR);
|
||||
module_param_array(pcm, uint, NULL, S_IRUGO | S_IWUSR);
|
||||
module_param_array(dslot, uint, NULL, S_IRUGO | S_IWUSR);
|
||||
module_param_array(pcm, int, NULL, S_IRUGO | S_IWUSR);
|
||||
module_param_array(dslot, int, NULL, S_IRUGO | S_IWUSR);
|
||||
module_param_array(iomode, uint, NULL, S_IRUGO | S_IWUSR);
|
||||
module_param_array(port, uint, NULL, S_IRUGO | S_IWUSR);
|
||||
|
||||
|
@ -1419,19 +1423,6 @@ controller_fail:
|
|||
HFC_outb(hc, R_TI_WD, poll_timer);
|
||||
hc->hw.r_irqmsk_misc |= V_TI_IRQMSK;
|
||||
|
||||
/*
|
||||
* set up 125us interrupt, only if function pointer is available
|
||||
* and module parameter timer is set
|
||||
*/
|
||||
if (timer && hfc_interrupt && register_interrupt) {
|
||||
/* only one chip should use this interrupt */
|
||||
timer = 0;
|
||||
interrupt_registered = 1;
|
||||
hc->hw.r_irqmsk_misc |= V_PROC_IRQMSK;
|
||||
/* deactivate other interrupts in ztdummy */
|
||||
register_interrupt();
|
||||
}
|
||||
|
||||
/* set E1 state machine IRQ */
|
||||
if (hc->type == 1)
|
||||
hc->hw.r_irqmsk_misc |= V_STA_IRQMSK;
|
||||
|
@ -1991,6 +1982,17 @@ next_frame:
|
|||
return; /* no data */
|
||||
}
|
||||
|
||||
/* "fill fifo if empty" feature */
|
||||
if (bch && test_bit(FLG_FILLEMPTY, &bch->Flags)
|
||||
&& !test_bit(FLG_HDLC, &bch->Flags) && z2 == z1) {
|
||||
if (debug & DEBUG_HFCMULTI_FILL)
|
||||
printk(KERN_DEBUG "%s: buffer empty, so we have "
|
||||
"underrun\n", __func__);
|
||||
/* fill buffer, to prevent future underrun */
|
||||
hc->write_fifo(hc, hc->silence_data, poll >> 1);
|
||||
Zspace -= (poll >> 1);
|
||||
}
|
||||
|
||||
/* if audio data and connected slot */
|
||||
if (bch && (!test_bit(FLG_HDLC, &bch->Flags)) && (!*txpending)
|
||||
&& slot_tx >= 0) {
|
||||
|
@ -2027,7 +2029,6 @@ next_frame:
|
|||
__func__, hc->id + 1, ch, Zspace, z1, z2, ii-i, len-i,
|
||||
temp ? "HDLC":"TRANS");
|
||||
|
||||
|
||||
/* Have to prep the audio data */
|
||||
hc->write_fifo(hc, d, ii - i);
|
||||
*idxp = ii;
|
||||
|
@ -2066,7 +2067,7 @@ next_frame:
|
|||
* no more data at all. this prevents sending an undefined value.
|
||||
*/
|
||||
if (bch && test_bit(FLG_TRANSPARENT, &bch->Flags))
|
||||
HFC_outb_nodebug(hc, A_FIFO_DATA0_NOINC, silence);
|
||||
HFC_outb_nodebug(hc, A_FIFO_DATA0_NOINC, hc->silence);
|
||||
}
|
||||
|
||||
|
||||
|
@ -2583,7 +2584,6 @@ hfcmulti_interrupt(int intno, void *dev_id)
|
|||
static int iq1 = 0, iq2 = 0, iq3 = 0, iq4 = 0,
|
||||
iq5 = 0, iq6 = 0, iqcnt = 0;
|
||||
#endif
|
||||
static int count;
|
||||
struct hfc_multi *hc = dev_id;
|
||||
struct dchannel *dch;
|
||||
u_char r_irq_statech, status, r_irq_misc, r_irq_oview;
|
||||
|
@ -2637,6 +2637,7 @@ hfcmulti_interrupt(int intno, void *dev_id)
|
|||
iqcnt = 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
if (!r_irq_statech &&
|
||||
!(status & (V_DTMF_STA | V_LOST_STA | V_EXT_IRQSTA |
|
||||
V_MISC_IRQSTA | V_FR_IRQSTA))) {
|
||||
|
@ -2657,6 +2658,7 @@ hfcmulti_interrupt(int intno, void *dev_id)
|
|||
if (status & V_MISC_IRQSTA) {
|
||||
/* misc IRQ */
|
||||
r_irq_misc = HFC_inb_nodebug(hc, R_IRQ_MISC);
|
||||
r_irq_misc &= hc->hw.r_irqmsk_misc; /* ignore disabled irqs */
|
||||
if (r_irq_misc & V_STA_IRQ) {
|
||||
if (hc->type == 1) {
|
||||
/* state machine */
|
||||
|
@ -2691,23 +2693,20 @@ hfcmulti_interrupt(int intno, void *dev_id)
|
|||
plxsd_checksync(hc, 0);
|
||||
}
|
||||
}
|
||||
if (r_irq_misc & V_TI_IRQ)
|
||||
if (r_irq_misc & V_TI_IRQ) {
|
||||
if (hc->iclock_on)
|
||||
mISDN_clock_update(hc->iclock, poll, NULL);
|
||||
handle_timer_irq(hc);
|
||||
}
|
||||
|
||||
if (r_irq_misc & V_DTMF_IRQ) {
|
||||
/* -> DTMF IRQ */
|
||||
hfcmulti_dtmf(hc);
|
||||
}
|
||||
/* TODO: REPLACE !!!! 125 us Interrupts are not acceptable */
|
||||
if (r_irq_misc & V_IRQ_PROC) {
|
||||
/* IRQ every 125us */
|
||||
count++;
|
||||
/* generate 1kHz signal */
|
||||
if (count == 8) {
|
||||
if (hfc_interrupt)
|
||||
hfc_interrupt();
|
||||
count = 0;
|
||||
}
|
||||
static int irq_proc_cnt;
|
||||
if (!irq_proc_cnt++)
|
||||
printk(KERN_WARNING "%s: got V_IRQ_PROC -"
|
||||
" this should not happen\n", __func__);
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -2954,7 +2953,7 @@ mode_hfcmulti(struct hfc_multi *hc, int ch, int protocol, int slot_tx,
|
|||
HFC_outb(hc, R_INC_RES_FIFO, V_RES_F);
|
||||
HFC_wait(hc);
|
||||
/* tx silence */
|
||||
HFC_outb_nodebug(hc, A_FIFO_DATA0_NOINC, silence);
|
||||
HFC_outb_nodebug(hc, A_FIFO_DATA0_NOINC, hc->silence);
|
||||
HFC_outb(hc, R_SLOT, (((ch / 4) * 8) +
|
||||
((ch % 4) * 4)) << 1);
|
||||
HFC_outb(hc, A_SL_CFG, 0x80 | 0x20 | (ch << 1));
|
||||
|
@ -2969,7 +2968,7 @@ mode_hfcmulti(struct hfc_multi *hc, int ch, int protocol, int slot_tx,
|
|||
HFC_outb(hc, R_INC_RES_FIFO, V_RES_F);
|
||||
HFC_wait(hc);
|
||||
/* tx silence */
|
||||
HFC_outb_nodebug(hc, A_FIFO_DATA0_NOINC, silence);
|
||||
HFC_outb_nodebug(hc, A_FIFO_DATA0_NOINC, hc->silence);
|
||||
/* enable RX fifo */
|
||||
HFC_outb(hc, R_FIFO, (ch<<1)|1);
|
||||
HFC_wait(hc);
|
||||
|
@ -3461,7 +3460,7 @@ channel_bctrl(struct bchannel *bch, struct mISDN_ctrl_req *cq)
|
|||
switch (cq->op) {
|
||||
case MISDN_CTRL_GETOP:
|
||||
cq->op = MISDN_CTRL_HFC_OP | MISDN_CTRL_HW_FEATURES_OP
|
||||
| MISDN_CTRL_RX_OFF;
|
||||
| MISDN_CTRL_RX_OFF | MISDN_CTRL_FILL_EMPTY;
|
||||
break;
|
||||
case MISDN_CTRL_RX_OFF: /* turn off / on rx stream */
|
||||
hc->chan[bch->slot].rx_off = !!cq->p1;
|
||||
|
@ -3476,6 +3475,12 @@ channel_bctrl(struct bchannel *bch, struct mISDN_ctrl_req *cq)
|
|||
printk(KERN_DEBUG "%s: RX_OFF request (nr=%d off=%d)\n",
|
||||
__func__, bch->nr, hc->chan[bch->slot].rx_off);
|
||||
break;
|
||||
case MISDN_CTRL_FILL_EMPTY: /* fill fifo, if empty */
|
||||
test_and_set_bit(FLG_FILLEMPTY, &bch->Flags);
|
||||
if (debug & DEBUG_HFCMULTI_MSG)
|
||||
printk(KERN_DEBUG "%s: FILL_EMPTY request (nr=%d "
|
||||
"off=%d)\n", __func__, bch->nr, !!cq->p1);
|
||||
break;
|
||||
case MISDN_CTRL_HW_FEATURES: /* fill features structure */
|
||||
if (debug & DEBUG_HFCMULTI_MSG)
|
||||
printk(KERN_DEBUG "%s: HW_FEATURE request\n",
|
||||
|
@ -3992,6 +3997,7 @@ open_bchannel(struct hfc_multi *hc, struct dchannel *dch,
|
|||
}
|
||||
if (test_and_set_bit(FLG_OPEN, &bch->Flags))
|
||||
return -EBUSY; /* b-channel can be only open once */
|
||||
test_and_clear_bit(FLG_FILLEMPTY, &bch->Flags);
|
||||
bch->ch.protocol = rq->protocol;
|
||||
hc->chan[ch].rx_off = 0;
|
||||
rq->ch = &bch->ch;
|
||||
|
@ -4081,6 +4087,15 @@ hfcm_dctrl(struct mISDNchannel *ch, u_int cmd, void *arg)
|
|||
return err;
|
||||
}
|
||||
|
||||
static int
|
||||
clockctl(void *priv, int enable)
|
||||
{
|
||||
struct hfc_multi *hc = priv;
|
||||
|
||||
hc->iclock_on = enable;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* initialize the card
|
||||
*/
|
||||
|
@ -4495,10 +4510,14 @@ release_card(struct hfc_multi *hc)
|
|||
printk(KERN_WARNING "%s: release card (%d) entered\n",
|
||||
__func__, hc->id);
|
||||
|
||||
/* unregister clock source */
|
||||
if (hc->iclock)
|
||||
mISDN_unregister_clock(hc->iclock);
|
||||
|
||||
/* disable irq */
|
||||
spin_lock_irqsave(&hc->lock, flags);
|
||||
disable_hwirq(hc);
|
||||
spin_unlock_irqrestore(&hc->lock, flags);
|
||||
|
||||
udelay(1000);
|
||||
|
||||
/* dimm leds */
|
||||
|
@ -4699,7 +4718,7 @@ init_e1_port(struct hfc_multi *hc, struct hm_map *m)
|
|||
} else
|
||||
hc->chan[hc->dslot].jitter = 2; /* default */
|
||||
snprintf(name, MISDN_MAX_IDLEN - 1, "hfc-e1.%d", HFC_cnt + 1);
|
||||
ret = mISDN_register_device(&dch->dev, name);
|
||||
ret = mISDN_register_device(&dch->dev, &hc->pci_dev->dev, name);
|
||||
if (ret)
|
||||
goto free_chan;
|
||||
hc->created[0] = 1;
|
||||
|
@ -4807,9 +4826,9 @@ init_multi_port(struct hfc_multi *hc, int pt)
|
|||
test_and_set_bit(HFC_CFG_DIS_ECHANNEL,
|
||||
&hc->chan[i + 2].cfg);
|
||||
}
|
||||
snprintf(name, MISDN_MAX_IDLEN - 1, "hfc-%ds.%d/%d",
|
||||
snprintf(name, MISDN_MAX_IDLEN - 1, "hfc-%ds.%d-%d",
|
||||
hc->type, HFC_cnt + 1, pt + 1);
|
||||
ret = mISDN_register_device(&dch->dev, name);
|
||||
ret = mISDN_register_device(&dch->dev, &hc->pci_dev->dev, name);
|
||||
if (ret)
|
||||
goto free_chan;
|
||||
hc->created[pt] = 1;
|
||||
|
@ -4828,6 +4847,7 @@ hfcmulti_init(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|||
struct hfc_multi *hc;
|
||||
u_long flags;
|
||||
u_char dips = 0, pmj = 0; /* dip settings, port mode Jumpers */
|
||||
int i;
|
||||
|
||||
if (HFC_cnt >= MAX_CARDS) {
|
||||
printk(KERN_ERR "too many cards (max=%d).\n",
|
||||
|
@ -4861,11 +4881,11 @@ hfcmulti_init(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|||
hc->id = HFC_cnt;
|
||||
hc->pcm = pcm[HFC_cnt];
|
||||
hc->io_mode = iomode[HFC_cnt];
|
||||
if (dslot[HFC_cnt] < 0) {
|
||||
if (dslot[HFC_cnt] < 0 && hc->type == 1) {
|
||||
hc->dslot = 0;
|
||||
printk(KERN_INFO "HFC-E1 card has disabled D-channel, but "
|
||||
"31 B-channels\n");
|
||||
} if (dslot[HFC_cnt] > 0 && dslot[HFC_cnt] < 32) {
|
||||
} if (dslot[HFC_cnt] > 0 && dslot[HFC_cnt] < 32 && hc->type == 1) {
|
||||
hc->dslot = dslot[HFC_cnt];
|
||||
printk(KERN_INFO "HFC-E1 card has alternating D-channel on "
|
||||
"time slot %d\n", dslot[HFC_cnt]);
|
||||
|
@ -4876,9 +4896,17 @@ hfcmulti_init(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|||
hc->masterclk = -1;
|
||||
if (type[HFC_cnt] & 0x100) {
|
||||
test_and_set_bit(HFC_CHIP_ULAW, &hc->chip);
|
||||
silence = 0xff; /* ulaw silence */
|
||||
hc->silence = 0xff; /* ulaw silence */
|
||||
} else
|
||||
silence = 0x2a; /* alaw silence */
|
||||
hc->silence = 0x2a; /* alaw silence */
|
||||
if ((poll >> 1) > sizeof(hc->silence_data)) {
|
||||
printk(KERN_ERR "HFCMULTI error: silence_data too small, "
|
||||
"please fix\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
for (i = 0; i < (poll >> 1); i++)
|
||||
hc->silence_data[i] = hc->silence;
|
||||
|
||||
if (!(type[HFC_cnt] & 0x200))
|
||||
test_and_set_bit(HFC_CHIP_DTMF, &hc->chip);
|
||||
|
||||
|
@ -4945,9 +4973,7 @@ hfcmulti_init(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|||
switch (m->dip_type) {
|
||||
case DIP_4S:
|
||||
/*
|
||||
* get DIP Setting for beroNet 1S/2S/4S cards
|
||||
* check if Port Jumper config matches
|
||||
* module param 'protocol'
|
||||
* Get DIP setting for beroNet 1S/2S/4S cards
|
||||
* DIP Setting: (collect GPIO 13/14/15 (R_GPIO_IN1) +
|
||||
* GPI 19/23 (R_GPI_IN2))
|
||||
*/
|
||||
|
@ -4966,9 +4992,8 @@ hfcmulti_init(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|||
break;
|
||||
case DIP_8S:
|
||||
/*
|
||||
* get DIP Setting for beroNet 8S0+ cards
|
||||
*
|
||||
* enable PCI auxbridge function
|
||||
* Get DIP Setting for beroNet 8S0+ cards
|
||||
* Enable PCI auxbridge function
|
||||
*/
|
||||
HFC_outb(hc, R_BRG_PCM_CFG, 1 | V_PCM_CLK);
|
||||
/* prepare access to auxport */
|
||||
|
@ -5003,6 +5028,10 @@ hfcmulti_init(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|||
list_add_tail(&hc->list, &HFClist);
|
||||
spin_unlock_irqrestore(&HFClock, flags);
|
||||
|
||||
/* use as clock source */
|
||||
if (clock == HFC_cnt + 1)
|
||||
hc->iclock = mISDN_register_clock("HFCMulti", 0, clockctl, hc);
|
||||
|
||||
/* initialize hardware */
|
||||
ret_err = init_card(hc);
|
||||
if (ret_err) {
|
||||
|
@ -5137,8 +5166,7 @@ static struct pci_device_id hfmultipci_ids[] __devinitdata = {
|
|||
{ PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_HFC8S, PCI_VENDOR_ID_CCD,
|
||||
PCI_DEVICE_ID_CCD_HFC8S, 0, 0, H(14)}, /* old Eval */
|
||||
{ PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_HFC8S, PCI_VENDOR_ID_CCD,
|
||||
PCI_SUBDEVICE_ID_CCD_IOB8STR, 0, 0, H(15)},
|
||||
/* IOB8ST Recording */
|
||||
PCI_SUBDEVICE_ID_CCD_IOB8STR, 0, 0, H(15)}, /* IOB8ST Recording */
|
||||
{ PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_HFC8S, PCI_VENDOR_ID_CCD,
|
||||
PCI_SUBDEVICE_ID_CCD_IOB8ST, 0, 0, H(16)}, /* IOB8ST */
|
||||
{ PCI_VENDOR_ID_CCD, PCI_DEVICE_ID_CCD_HFC8S, PCI_VENDOR_ID_CCD,
|
||||
|
@ -5188,18 +5216,16 @@ hfcmulti_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|||
struct hm_map *m = (struct hm_map *)ent->driver_data;
|
||||
int ret;
|
||||
|
||||
if (m == NULL) {
|
||||
if (ent->vendor == PCI_VENDOR_ID_CCD)
|
||||
if (ent->device == PCI_DEVICE_ID_CCD_HFC4S ||
|
||||
if (m == NULL && ent->vendor == PCI_VENDOR_ID_CCD && (
|
||||
ent->device == PCI_DEVICE_ID_CCD_HFC4S ||
|
||||
ent->device == PCI_DEVICE_ID_CCD_HFC8S ||
|
||||
ent->device == PCI_DEVICE_ID_CCD_HFCE1)
|
||||
ent->device == PCI_DEVICE_ID_CCD_HFCE1)) {
|
||||
printk(KERN_ERR
|
||||
"unknown HFC multiport controller "
|
||||
"(vendor:%x device:%x subvendor:%x "
|
||||
"subdevice:%x) Please contact the "
|
||||
"driver maintainer for support.\n",
|
||||
ent->vendor, ent->device,
|
||||
"Unknown HFC multiport controller (vendor:%x device:%x "
|
||||
"subvendor:%x subdevice:%x)\n", ent->vendor, ent->device,
|
||||
ent->subvendor, ent->subdevice);
|
||||
printk(KERN_ERR
|
||||
"Please contact the driver maintainer for support.\n");
|
||||
return -ENODEV;
|
||||
}
|
||||
ret = hfcmulti_init(pdev, ent);
|
||||
|
@ -5222,22 +5248,9 @@ HFCmulti_cleanup(void)
|
|||
{
|
||||
struct hfc_multi *card, *next;
|
||||
|
||||
/* unload interrupt function symbol */
|
||||
if (hfc_interrupt)
|
||||
symbol_put(ztdummy_extern_interrupt);
|
||||
if (register_interrupt)
|
||||
symbol_put(ztdummy_register_interrupt);
|
||||
if (unregister_interrupt) {
|
||||
if (interrupt_registered) {
|
||||
interrupt_registered = 0;
|
||||
unregister_interrupt();
|
||||
}
|
||||
symbol_put(ztdummy_unregister_interrupt);
|
||||
}
|
||||
|
||||
/* get rid of all devices of this driver */
|
||||
list_for_each_entry_safe(card, next, &HFClist, list)
|
||||
release_card(card);
|
||||
/* get rid of all devices of this driver */
|
||||
pci_unregister_driver(&hfcmultipci_driver);
|
||||
}
|
||||
|
||||
|
@ -5246,8 +5259,10 @@ HFCmulti_init(void)
|
|||
{
|
||||
int err;
|
||||
|
||||
printk(KERN_INFO "mISDN: HFC-multi driver %s\n", HFC_MULTI_VERSION);
|
||||
|
||||
#ifdef IRQ_DEBUG
|
||||
printk(KERN_ERR "%s: IRQ_DEBUG IS ENABLED!\n", __func__);
|
||||
printk(KERN_DEBUG "%s: IRQ_DEBUG IS ENABLED!\n", __func__);
|
||||
#endif
|
||||
|
||||
spin_lock_init(&HFClock);
|
||||
|
@ -5256,22 +5271,11 @@ HFCmulti_init(void)
|
|||
if (debug & DEBUG_HFCMULTI_INIT)
|
||||
printk(KERN_DEBUG "%s: init entered\n", __func__);
|
||||
|
||||
hfc_interrupt = symbol_get(ztdummy_extern_interrupt);
|
||||
register_interrupt = symbol_get(ztdummy_register_interrupt);
|
||||
unregister_interrupt = symbol_get(ztdummy_unregister_interrupt);
|
||||
printk(KERN_INFO "mISDN: HFC-multi driver %s\n",
|
||||
hfcmulti_revision);
|
||||
|
||||
switch (poll) {
|
||||
case 0:
|
||||
poll_timer = 6;
|
||||
poll = 128;
|
||||
break;
|
||||
/*
|
||||
* wenn dieses break nochmal verschwindet,
|
||||
* gibt es heisse ohren :-)
|
||||
* "without the break you will get hot ears ???"
|
||||
*/
|
||||
case 8:
|
||||
poll_timer = 2;
|
||||
break;
|
||||
|
@ -5298,20 +5302,12 @@ HFCmulti_init(void)
|
|||
|
||||
}
|
||||
|
||||
if (!clock)
|
||||
clock = 1;
|
||||
|
||||
err = pci_register_driver(&hfcmultipci_driver);
|
||||
if (err < 0) {
|
||||
printk(KERN_ERR "error registering pci driver: %x\n", err);
|
||||
if (hfc_interrupt)
|
||||
symbol_put(ztdummy_extern_interrupt);
|
||||
if (register_interrupt)
|
||||
symbol_put(ztdummy_register_interrupt);
|
||||
if (unregister_interrupt) {
|
||||
if (interrupt_registered) {
|
||||
interrupt_registered = 0;
|
||||
unregister_interrupt();
|
||||
}
|
||||
symbol_put(ztdummy_unregister_interrupt);
|
||||
}
|
||||
return err;
|
||||
}
|
||||
return 0;
|
||||
|
|
|
@ -23,6 +23,25 @@
|
|||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*
|
||||
* Module options:
|
||||
*
|
||||
* debug:
|
||||
* NOTE: only one poll value must be given for all cards
|
||||
* See hfc_pci.h for debug flags.
|
||||
*
|
||||
* poll:
|
||||
* NOTE: only one poll value must be given for all cards
|
||||
* Give the number of samples for each fifo process.
|
||||
* By default 128 is used. Decrease to reduce delay, increase to
|
||||
* reduce cpu load. If unsure, don't mess with it!
|
||||
* A value of 128 will use controller's interrupt. Other values will
|
||||
* use kernel timer, because the controller will not allow lower values
|
||||
* than 128.
|
||||
* Also note that the value depends on the kernel timer frequency.
|
||||
* If kernel uses a frequency of 1000 Hz, steps of 8 samples are possible.
|
||||
* If the kernel uses 100 Hz, steps of 80 samples are possible.
|
||||
* If the kernel uses 300 Hz, steps of about 26 samples are possible.
|
||||
*
|
||||
*/
|
||||
|
||||
#include <linux/module.h>
|
||||
|
@ -34,16 +53,16 @@
|
|||
|
||||
static const char *hfcpci_revision = "2.0";
|
||||
|
||||
#define MAX_CARDS 8
|
||||
static int HFC_cnt;
|
||||
static uint debug;
|
||||
static uint poll, tics;
|
||||
struct timer_list hfc_tl;
|
||||
u32 hfc_jiffies;
|
||||
|
||||
MODULE_AUTHOR("Karsten Keil");
|
||||
MODULE_LICENSE("GPL");
|
||||
module_param(debug, uint, 0);
|
||||
|
||||
static LIST_HEAD(HFClist);
|
||||
static DEFINE_RWLOCK(HFClock);
|
||||
module_param(poll, uint, S_IRUGO | S_IWUSR);
|
||||
|
||||
enum {
|
||||
HFC_CCD_2BD0,
|
||||
|
@ -114,7 +133,6 @@ struct hfcPCI_hw {
|
|||
|
||||
|
||||
struct hfc_pci {
|
||||
struct list_head list;
|
||||
u_char subtype;
|
||||
u_char chanlimit;
|
||||
u_char initdone;
|
||||
|
@ -520,9 +538,9 @@ receive_dmsg(struct hfc_pci *hc)
|
|||
}
|
||||
|
||||
/*
|
||||
* check for transparent receive data and read max one threshold size if avail
|
||||
* check for transparent receive data and read max one 'poll' size if avail
|
||||
*/
|
||||
static int
|
||||
static void
|
||||
hfcpci_empty_fifo_trans(struct bchannel *bch, struct bzfifo *bz, u_char *bdata)
|
||||
{
|
||||
__le16 *z1r, *z2r;
|
||||
|
@ -534,17 +552,19 @@ hfcpci_empty_fifo_trans(struct bchannel *bch, struct bzfifo *bz, u_char *bdata)
|
|||
|
||||
fcnt = le16_to_cpu(*z1r) - le16_to_cpu(*z2r);
|
||||
if (!fcnt)
|
||||
return 0; /* no data avail */
|
||||
return; /* no data avail */
|
||||
|
||||
if (fcnt <= 0)
|
||||
fcnt += B_FIFO_SIZE; /* bytes actually buffered */
|
||||
if (fcnt > HFCPCI_BTRANS_THRESHOLD)
|
||||
fcnt = HFCPCI_BTRANS_THRESHOLD; /* limit size */
|
||||
|
||||
new_z2 = le16_to_cpu(*z2r) + fcnt; /* new position in fifo */
|
||||
if (new_z2 >= (B_FIFO_SIZE + B_SUB_VAL))
|
||||
new_z2 -= B_FIFO_SIZE; /* buffer wrap */
|
||||
|
||||
if (fcnt > MAX_DATA_SIZE) { /* flush, if oversized */
|
||||
*z2r = cpu_to_le16(new_z2); /* new position */
|
||||
return;
|
||||
}
|
||||
|
||||
bch->rx_skb = mI_alloc_skb(fcnt, GFP_ATOMIC);
|
||||
if (bch->rx_skb) {
|
||||
ptr = skb_put(bch->rx_skb, fcnt);
|
||||
|
@ -569,7 +589,6 @@ hfcpci_empty_fifo_trans(struct bchannel *bch, struct bzfifo *bz, u_char *bdata)
|
|||
printk(KERN_WARNING "HFCPCI: receive out of memory\n");
|
||||
|
||||
*z2r = cpu_to_le16(new_z2); /* new position */
|
||||
return 1;
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -580,12 +599,11 @@ main_rec_hfcpci(struct bchannel *bch)
|
|||
{
|
||||
struct hfc_pci *hc = bch->hw;
|
||||
int rcnt, real_fifo;
|
||||
int receive, count = 5;
|
||||
int receive = 0, count = 5;
|
||||
struct bzfifo *bz;
|
||||
u_char *bdata;
|
||||
struct zt *zp;
|
||||
|
||||
|
||||
if ((bch->nr & 2) && (!hc->hw.bswapped)) {
|
||||
bz = &((union fifo_area *)(hc->hw.fifos))->b_chans.rxbz_b2;
|
||||
bdata = ((union fifo_area *)(hc->hw.fifos))->b_chans.rxdat_b2;
|
||||
|
@ -625,9 +643,10 @@ Begin:
|
|||
receive = 1;
|
||||
else
|
||||
receive = 0;
|
||||
} else if (test_bit(FLG_TRANSPARENT, &bch->Flags))
|
||||
receive = hfcpci_empty_fifo_trans(bch, bz, bdata);
|
||||
else
|
||||
} else if (test_bit(FLG_TRANSPARENT, &bch->Flags)) {
|
||||
hfcpci_empty_fifo_trans(bch, bz, bdata);
|
||||
return;
|
||||
} else
|
||||
receive = 0;
|
||||
if (count && receive)
|
||||
goto Begin;
|
||||
|
@ -751,11 +770,41 @@ hfcpci_fill_fifo(struct bchannel *bch)
|
|||
/* fcnt contains available bytes in fifo */
|
||||
fcnt = B_FIFO_SIZE - fcnt;
|
||||
/* remaining bytes to send (bytes in fifo) */
|
||||
|
||||
/* "fill fifo if empty" feature */
|
||||
if (test_bit(FLG_FILLEMPTY, &bch->Flags) && !fcnt) {
|
||||
/* printk(KERN_DEBUG "%s: buffer empty, so we have "
|
||||
"underrun\n", __func__); */
|
||||
/* fill buffer, to prevent future underrun */
|
||||
count = HFCPCI_FILLEMPTY;
|
||||
new_z1 = le16_to_cpu(*z1t) + count;
|
||||
/* new buffer Position */
|
||||
if (new_z1 >= (B_FIFO_SIZE + B_SUB_VAL))
|
||||
new_z1 -= B_FIFO_SIZE; /* buffer wrap */
|
||||
dst = bdata + (le16_to_cpu(*z1t) - B_SUB_VAL);
|
||||
maxlen = (B_FIFO_SIZE + B_SUB_VAL) - le16_to_cpu(*z1t);
|
||||
/* end of fifo */
|
||||
if (bch->debug & DEBUG_HW_BFIFO)
|
||||
printk(KERN_DEBUG "hfcpci_FFt fillempty "
|
||||
"fcnt(%d) maxl(%d) nz1(%x) dst(%p)\n",
|
||||
fcnt, maxlen, new_z1, dst);
|
||||
fcnt += count;
|
||||
if (maxlen > count)
|
||||
maxlen = count; /* limit size */
|
||||
memset(dst, 0x2a, maxlen); /* first copy */
|
||||
count -= maxlen; /* remaining bytes */
|
||||
if (count) {
|
||||
dst = bdata; /* start of buffer */
|
||||
memset(dst, 0x2a, count);
|
||||
}
|
||||
*z1t = cpu_to_le16(new_z1); /* now send data */
|
||||
}
|
||||
|
||||
next_t_frame:
|
||||
count = bch->tx_skb->len - bch->tx_idx;
|
||||
/* maximum fill shall be HFCPCI_BTRANS_MAX */
|
||||
if (count > HFCPCI_BTRANS_MAX - fcnt)
|
||||
count = HFCPCI_BTRANS_MAX - fcnt;
|
||||
/* maximum fill shall be poll*2 */
|
||||
if (count > (poll << 1) - fcnt)
|
||||
count = (poll << 1) - fcnt;
|
||||
if (count <= 0)
|
||||
return;
|
||||
/* data is suitable for fifo */
|
||||
|
@ -1135,37 +1184,37 @@ hfcpci_int(int intno, void *dev_id)
|
|||
val &= ~0x80;
|
||||
Write_hfc(hc, HFCPCI_CTMT, hc->hw.ctmt | HFCPCI_CLTIMER);
|
||||
}
|
||||
if (val & 0x08) {
|
||||
if (val & 0x08) { /* B1 rx */
|
||||
bch = Sel_BCS(hc, hc->hw.bswapped ? 2 : 1);
|
||||
if (bch)
|
||||
main_rec_hfcpci(bch);
|
||||
else if (hc->dch.debug)
|
||||
printk(KERN_DEBUG "hfcpci spurious 0x08 IRQ\n");
|
||||
}
|
||||
if (val & 0x10) {
|
||||
if (val & 0x10) { /* B2 rx */
|
||||
bch = Sel_BCS(hc, 2);
|
||||
if (bch)
|
||||
main_rec_hfcpci(bch);
|
||||
else if (hc->dch.debug)
|
||||
printk(KERN_DEBUG "hfcpci spurious 0x10 IRQ\n");
|
||||
}
|
||||
if (val & 0x01) {
|
||||
if (val & 0x01) { /* B1 tx */
|
||||
bch = Sel_BCS(hc, hc->hw.bswapped ? 2 : 1);
|
||||
if (bch)
|
||||
tx_birq(bch);
|
||||
else if (hc->dch.debug)
|
||||
printk(KERN_DEBUG "hfcpci spurious 0x01 IRQ\n");
|
||||
}
|
||||
if (val & 0x02) {
|
||||
if (val & 0x02) { /* B2 tx */
|
||||
bch = Sel_BCS(hc, 2);
|
||||
if (bch)
|
||||
tx_birq(bch);
|
||||
else if (hc->dch.debug)
|
||||
printk(KERN_DEBUG "hfcpci spurious 0x02 IRQ\n");
|
||||
}
|
||||
if (val & 0x20)
|
||||
if (val & 0x20) /* D rx */
|
||||
receive_dmsg(hc);
|
||||
if (val & 0x04) { /* dframe transmitted */
|
||||
if (val & 0x04) { /* D tx */
|
||||
if (test_and_clear_bit(FLG_BUSY_TIMER, &hc->dch.Flags))
|
||||
del_timer(&hc->dch.timer);
|
||||
tx_dirq(&hc->dch);
|
||||
|
@ -1283,12 +1332,14 @@ mode_hfcpci(struct bchannel *bch, int bc, int protocol)
|
|||
}
|
||||
if (fifo2 & 2) {
|
||||
hc->hw.fifo_en |= HFCPCI_FIFOEN_B2;
|
||||
if (!tics)
|
||||
hc->hw.int_m1 |= (HFCPCI_INTS_B2TRANS +
|
||||
HFCPCI_INTS_B2REC);
|
||||
hc->hw.ctmt |= 2;
|
||||
hc->hw.conn &= ~0x18;
|
||||
} else {
|
||||
hc->hw.fifo_en |= HFCPCI_FIFOEN_B1;
|
||||
if (!tics)
|
||||
hc->hw.int_m1 |= (HFCPCI_INTS_B1TRANS +
|
||||
HFCPCI_INTS_B1REC);
|
||||
hc->hw.ctmt |= 1;
|
||||
|
@ -1398,6 +1449,7 @@ set_hfcpci_rxtest(struct bchannel *bch, int protocol, int chan)
|
|||
if (chan & 2) {
|
||||
hc->hw.sctrl_r |= SCTRL_B2_ENA;
|
||||
hc->hw.fifo_en |= HFCPCI_FIFOEN_B2RX;
|
||||
if (!tics)
|
||||
hc->hw.int_m1 |= HFCPCI_INTS_B2REC;
|
||||
hc->hw.ctmt |= 2;
|
||||
hc->hw.conn &= ~0x18;
|
||||
|
@ -1407,6 +1459,7 @@ set_hfcpci_rxtest(struct bchannel *bch, int protocol, int chan)
|
|||
} else {
|
||||
hc->hw.sctrl_r |= SCTRL_B1_ENA;
|
||||
hc->hw.fifo_en |= HFCPCI_FIFOEN_B1RX;
|
||||
if (!tics)
|
||||
hc->hw.int_m1 |= HFCPCI_INTS_B1REC;
|
||||
hc->hw.ctmt |= 1;
|
||||
hc->hw.conn &= ~0x03;
|
||||
|
@ -1485,7 +1538,13 @@ channel_bctrl(struct bchannel *bch, struct mISDN_ctrl_req *cq)
|
|||
|
||||
switch (cq->op) {
|
||||
case MISDN_CTRL_GETOP:
|
||||
cq->op = 0;
|
||||
cq->op = MISDN_CTRL_FILL_EMPTY;
|
||||
break;
|
||||
case MISDN_CTRL_FILL_EMPTY: /* fill fifo, if empty */
|
||||
test_and_set_bit(FLG_FILLEMPTY, &bch->Flags);
|
||||
if (debug & DEBUG_HW_OPEN)
|
||||
printk(KERN_DEBUG "%s: FILL_EMPTY request (nr=%d "
|
||||
"off=%d)\n", __func__, bch->nr, !!cq->p1);
|
||||
break;
|
||||
default:
|
||||
printk(KERN_WARNING "%s: unknown Op %x\n", __func__, cq->op);
|
||||
|
@ -1859,6 +1918,10 @@ open_dchannel(struct hfc_pci *hc, struct mISDNchannel *ch,
|
|||
hc->dch.dev.id, __builtin_return_address(0));
|
||||
if (rq->protocol == ISDN_P_NONE)
|
||||
return -EINVAL;
|
||||
if (rq->adr.channel == 1) {
|
||||
/* TODO: E-Channel */
|
||||
return -EINVAL;
|
||||
}
|
||||
if (!hc->initdone) {
|
||||
if (rq->protocol == ISDN_P_TE_S0) {
|
||||
err = create_l1(&hc->dch, hfc_l1callback);
|
||||
|
@ -1874,6 +1937,11 @@ open_dchannel(struct hfc_pci *hc, struct mISDNchannel *ch,
|
|||
if (rq->protocol != ch->protocol) {
|
||||
if (hc->hw.protocol == ISDN_P_TE_S0)
|
||||
l1_event(hc->dch.l1, CLOSE_CHANNEL);
|
||||
if (rq->protocol == ISDN_P_TE_S0) {
|
||||
err = create_l1(&hc->dch, hfc_l1callback);
|
||||
if (err)
|
||||
return err;
|
||||
}
|
||||
hc->hw.protocol = rq->protocol;
|
||||
ch->protocol = rq->protocol;
|
||||
hfcpci_setmode(hc);
|
||||
|
@ -1903,6 +1971,7 @@ open_bchannel(struct hfc_pci *hc, struct channel_req *rq)
|
|||
bch = &hc->bch[rq->adr.channel - 1];
|
||||
if (test_and_set_bit(FLG_OPEN, &bch->Flags))
|
||||
return -EBUSY; /* b-channel can be only open once */
|
||||
test_and_clear_bit(FLG_FILLEMPTY, &bch->Flags);
|
||||
bch->ch.protocol = rq->protocol;
|
||||
rq->ch = &bch->ch; /* TODO: E-channel */
|
||||
if (!try_module_get(THIS_MODULE))
|
||||
|
@ -1928,7 +1997,8 @@ hfc_dctrl(struct mISDNchannel *ch, u_int cmd, void *arg)
|
|||
switch (cmd) {
|
||||
case OPEN_CHANNEL:
|
||||
rq = arg;
|
||||
if (rq->adr.channel == 0)
|
||||
if ((rq->protocol == ISDN_P_TE_S0) ||
|
||||
(rq->protocol == ISDN_P_NT_S0))
|
||||
err = open_dchannel(hc, ch, rq);
|
||||
else
|
||||
err = open_bchannel(hc, rq);
|
||||
|
@ -2027,7 +2097,6 @@ release_card(struct hfc_pci *hc) {
|
|||
mISDN_freebchannel(&hc->bch[1]);
|
||||
mISDN_freebchannel(&hc->bch[0]);
|
||||
mISDN_freedchannel(&hc->dch);
|
||||
list_del(&hc->list);
|
||||
pci_set_drvdata(hc->pdev, NULL);
|
||||
kfree(hc);
|
||||
}
|
||||
|
@ -2037,12 +2106,8 @@ setup_card(struct hfc_pci *card)
|
|||
{
|
||||
int err = -EINVAL;
|
||||
u_int i;
|
||||
u_long flags;
|
||||
char name[MISDN_MAX_IDLEN];
|
||||
|
||||
if (HFC_cnt >= MAX_CARDS)
|
||||
return -EINVAL; /* maybe better value */
|
||||
|
||||
card->dch.debug = debug;
|
||||
spin_lock_init(&card->lock);
|
||||
mISDN_initdchannel(&card->dch, MAX_DFRAME_LEN_L1, ph_state);
|
||||
|
@ -2068,13 +2133,10 @@ setup_card(struct hfc_pci *card)
|
|||
if (err)
|
||||
goto error;
|
||||
snprintf(name, MISDN_MAX_IDLEN - 1, "hfc-pci.%d", HFC_cnt + 1);
|
||||
err = mISDN_register_device(&card->dch.dev, name);
|
||||
err = mISDN_register_device(&card->dch.dev, &card->pdev->dev, name);
|
||||
if (err)
|
||||
goto error;
|
||||
HFC_cnt++;
|
||||
write_lock_irqsave(&HFClock, flags);
|
||||
list_add_tail(&card->list, &HFClist);
|
||||
write_unlock_irqrestore(&HFClock, flags);
|
||||
printk(KERN_INFO "HFC %d cards installed\n", HFC_cnt);
|
||||
return 0;
|
||||
error:
|
||||
|
@ -2210,15 +2272,12 @@ static void __devexit
|
|||
hfc_remove_pci(struct pci_dev *pdev)
|
||||
{
|
||||
struct hfc_pci *card = pci_get_drvdata(pdev);
|
||||
u_long flags;
|
||||
|
||||
if (card) {
|
||||
write_lock_irqsave(&HFClock, flags);
|
||||
if (card)
|
||||
release_card(card);
|
||||
write_unlock_irqrestore(&HFClock, flags);
|
||||
} else
|
||||
else
|
||||
if (debug)
|
||||
printk(KERN_WARNING "%s: drvdata allready removed\n",
|
||||
printk(KERN_WARNING "%s: drvdata already removed\n",
|
||||
__func__);
|
||||
}
|
||||
|
||||
|
@ -2230,25 +2289,97 @@ static struct pci_driver hfc_driver = {
|
|||
.id_table = hfc_ids,
|
||||
};
|
||||
|
||||
static int
|
||||
_hfcpci_softirq(struct device *dev, void *arg)
|
||||
{
|
||||
struct hfc_pci *hc = dev_get_drvdata(dev);
|
||||
struct bchannel *bch;
|
||||
if (hc == NULL)
|
||||
return 0;
|
||||
|
||||
if (hc->hw.int_m2 & HFCPCI_IRQ_ENABLE) {
|
||||
spin_lock(&hc->lock);
|
||||
bch = Sel_BCS(hc, hc->hw.bswapped ? 2 : 1);
|
||||
if (bch && bch->state == ISDN_P_B_RAW) { /* B1 rx&tx */
|
||||
main_rec_hfcpci(bch);
|
||||
tx_birq(bch);
|
||||
}
|
||||
bch = Sel_BCS(hc, hc->hw.bswapped ? 1 : 2);
|
||||
if (bch && bch->state == ISDN_P_B_RAW) { /* B2 rx&tx */
|
||||
main_rec_hfcpci(bch);
|
||||
tx_birq(bch);
|
||||
}
|
||||
spin_unlock(&hc->lock);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void
|
||||
hfcpci_softirq(void *arg)
|
||||
{
|
||||
(void) driver_for_each_device(&hfc_driver.driver, NULL, arg,
|
||||
_hfcpci_softirq);
|
||||
|
||||
/* if next event would be in the past ... */
|
||||
if ((s32)(hfc_jiffies + tics - jiffies) <= 0)
|
||||
hfc_jiffies = jiffies + 1;
|
||||
else
|
||||
hfc_jiffies += tics;
|
||||
hfc_tl.expires = hfc_jiffies;
|
||||
add_timer(&hfc_tl);
|
||||
}
|
||||
|
||||
static int __init
|
||||
HFC_init(void)
|
||||
{
|
||||
int err;
|
||||
|
||||
if (!poll)
|
||||
poll = HFCPCI_BTRANS_THRESHOLD;
|
||||
|
||||
if (poll != HFCPCI_BTRANS_THRESHOLD) {
|
||||
tics = (poll * HZ) / 8000;
|
||||
if (tics < 1)
|
||||
tics = 1;
|
||||
poll = (tics * 8000) / HZ;
|
||||
if (poll > 256 || poll < 8) {
|
||||
printk(KERN_ERR "%s: Wrong poll value %d not in range "
|
||||
"of 8..256.\n", __func__, poll);
|
||||
err = -EINVAL;
|
||||
return err;
|
||||
}
|
||||
}
|
||||
if (poll != HFCPCI_BTRANS_THRESHOLD) {
|
||||
printk(KERN_INFO "%s: Using alternative poll value of %d\n",
|
||||
__func__, poll);
|
||||
hfc_tl.function = (void *)hfcpci_softirq;
|
||||
hfc_tl.data = 0;
|
||||
init_timer(&hfc_tl);
|
||||
hfc_tl.expires = jiffies + tics;
|
||||
hfc_jiffies = hfc_tl.expires;
|
||||
add_timer(&hfc_tl);
|
||||
} else
|
||||
tics = 0; /* indicate the use of controller's timer */
|
||||
|
||||
err = pci_register_driver(&hfc_driver);
|
||||
if (err) {
|
||||
if (timer_pending(&hfc_tl))
|
||||
del_timer(&hfc_tl);
|
||||
}
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
static void __exit
|
||||
HFC_cleanup(void)
|
||||
{
|
||||
struct hfc_pci *card, *next;
|
||||
if (timer_pending(&hfc_tl))
|
||||
del_timer(&hfc_tl);
|
||||
|
||||
list_for_each_entry_safe(card, next, &HFClist, list) {
|
||||
release_card(card);
|
||||
}
|
||||
pci_unregister_driver(&hfc_driver);
|
||||
}
|
||||
|
||||
module_init(HFC_init);
|
||||
module_exit(HFC_cleanup);
|
||||
|
||||
MODULE_DEVICE_TABLE(pci, hfc_ids);
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,418 @@
|
|||
/*
|
||||
* hfcsusb.h, HFC-S USB mISDN driver
|
||||
*/
|
||||
|
||||
#ifndef __HFCSUSB_H__
|
||||
#define __HFCSUSB_H__
|
||||
|
||||
|
||||
#define DRIVER_NAME "HFC-S_USB"
|
||||
|
||||
#define DBG_HFC_CALL_TRACE 0x00010000
|
||||
#define DBG_HFC_FIFO_VERBOSE 0x00020000
|
||||
#define DBG_HFC_USB_VERBOSE 0x00100000
|
||||
#define DBG_HFC_URB_INFO 0x00200000
|
||||
#define DBG_HFC_URB_ERROR 0x00400000
|
||||
|
||||
#define DEFAULT_TRANSP_BURST_SZ 128
|
||||
|
||||
#define HFC_CTRL_TIMEOUT 20 /* 5ms timeout writing/reading regs */
|
||||
#define CLKDEL_TE 0x0f /* CLKDEL in TE mode */
|
||||
#define CLKDEL_NT 0x6c /* CLKDEL in NT mode */
|
||||
|
||||
/* hfcsusb Layer1 commands */
|
||||
#define HFC_L1_ACTIVATE_TE 1
|
||||
#define HFC_L1_ACTIVATE_NT 2
|
||||
#define HFC_L1_DEACTIVATE_NT 3
|
||||
#define HFC_L1_FORCE_DEACTIVATE_TE 4
|
||||
|
||||
/* cmd FLAGS in HFCUSB_STATES register */
|
||||
#define HFCUSB_LOAD_STATE 0x10
|
||||
#define HFCUSB_ACTIVATE 0x20
|
||||
#define HFCUSB_DO_ACTION 0x40
|
||||
#define HFCUSB_NT_G2_G3 0x80
|
||||
|
||||
/* timers */
|
||||
#define NT_ACTIVATION_TIMER 0x01 /* enables NT mode activation Timer */
|
||||
#define NT_T1_COUNT 10
|
||||
|
||||
#define MAX_BCH_SIZE 2048 /* allowed B-channel packet size */
|
||||
|
||||
#define HFCUSB_RX_THRESHOLD 64 /* threshold for fifo report bit rx */
|
||||
#define HFCUSB_TX_THRESHOLD 96 /* threshold for fifo report bit tx */
|
||||
|
||||
#define HFCUSB_CHIP_ID 0x16 /* Chip ID register index */
|
||||
#define HFCUSB_CIRM 0x00 /* cirm register index */
|
||||
#define HFCUSB_USB_SIZE 0x07 /* int length register */
|
||||
#define HFCUSB_USB_SIZE_I 0x06 /* iso length register */
|
||||
#define HFCUSB_F_CROSS 0x0b /* bit order register */
|
||||
#define HFCUSB_CLKDEL 0x37 /* bit delay register */
|
||||
#define HFCUSB_CON_HDLC 0xfa /* channel connect register */
|
||||
#define HFCUSB_HDLC_PAR 0xfb
|
||||
#define HFCUSB_SCTRL 0x31 /* S-bus control register (tx) */
|
||||
#define HFCUSB_SCTRL_E 0x32 /* same for E and special funcs */
|
||||
#define HFCUSB_SCTRL_R 0x33 /* S-bus control register (rx) */
|
||||
#define HFCUSB_F_THRES 0x0c /* threshold register */
|
||||
#define HFCUSB_FIFO 0x0f /* fifo select register */
|
||||
#define HFCUSB_F_USAGE 0x1a /* fifo usage register */
|
||||
#define HFCUSB_MST_MODE0 0x14
|
||||
#define HFCUSB_MST_MODE1 0x15
|
||||
#define HFCUSB_P_DATA 0x1f
|
||||
#define HFCUSB_INC_RES_F 0x0e
|
||||
#define HFCUSB_B1_SSL 0x20
|
||||
#define HFCUSB_B2_SSL 0x21
|
||||
#define HFCUSB_B1_RSL 0x24
|
||||
#define HFCUSB_B2_RSL 0x25
|
||||
#define HFCUSB_STATES 0x30
|
||||
|
||||
|
||||
#define HFCUSB_CHIPID 0x40 /* ID value of HFC-S USB */
|
||||
|
||||
/* fifo registers */
|
||||
#define HFCUSB_NUM_FIFOS 8 /* maximum number of fifos */
|
||||
#define HFCUSB_B1_TX 0 /* index for B1 transmit bulk/int */
|
||||
#define HFCUSB_B1_RX 1 /* index for B1 receive bulk/int */
|
||||
#define HFCUSB_B2_TX 2
|
||||
#define HFCUSB_B2_RX 3
|
||||
#define HFCUSB_D_TX 4
|
||||
#define HFCUSB_D_RX 5
|
||||
#define HFCUSB_PCM_TX 6
|
||||
#define HFCUSB_PCM_RX 7
|
||||
|
||||
|
||||
#define USB_INT 0
|
||||
#define USB_BULK 1
|
||||
#define USB_ISOC 2
|
||||
|
||||
#define ISOC_PACKETS_D 8
|
||||
#define ISOC_PACKETS_B 8
|
||||
#define ISO_BUFFER_SIZE 128
|
||||
|
||||
/* defines how much ISO packets are handled in one URB */
|
||||
static int iso_packets[8] =
|
||||
{ ISOC_PACKETS_B, ISOC_PACKETS_B, ISOC_PACKETS_B, ISOC_PACKETS_B,
|
||||
ISOC_PACKETS_D, ISOC_PACKETS_D, ISOC_PACKETS_D, ISOC_PACKETS_D
|
||||
};
|
||||
|
||||
|
||||
/* Fifo flow Control for TX ISO */
|
||||
#define SINK_MAX 68
|
||||
#define SINK_MIN 48
|
||||
#define SINK_DMIN 12
|
||||
#define SINK_DMAX 18
|
||||
#define BITLINE_INF (-96*8)
|
||||
|
||||
/* HFC-S USB register access by Control-URSs */
|
||||
#define write_reg_atomic(a, b, c) \
|
||||
usb_control_msg((a)->dev, (a)->ctrl_out_pipe, 0, 0x40, (c), (b), \
|
||||
0, 0, HFC_CTRL_TIMEOUT)
|
||||
#define read_reg_atomic(a, b, c) \
|
||||
usb_control_msg((a)->dev, (a)->ctrl_in_pipe, 1, 0xC0, 0, (b), (c), \
|
||||
1, HFC_CTRL_TIMEOUT)
|
||||
#define HFC_CTRL_BUFSIZE 64
|
||||
|
||||
struct ctrl_buf {
|
||||
__u8 hfcs_reg; /* register number */
|
||||
__u8 reg_val; /* value to be written (or read) */
|
||||
};
|
||||
|
||||
/*
|
||||
* URB error codes
|
||||
* Used to represent a list of values and their respective symbolic names
|
||||
*/
|
||||
struct hfcusb_symbolic_list {
|
||||
const int num;
|
||||
const char *name;
|
||||
};
|
||||
|
||||
static struct hfcusb_symbolic_list urb_errlist[] = {
|
||||
{-ENOMEM, "No memory for allocation of internal structures"},
|
||||
{-ENOSPC, "The host controller's bandwidth is already consumed"},
|
||||
{-ENOENT, "URB was canceled by unlink_urb"},
|
||||
{-EXDEV, "ISO transfer only partially completed"},
|
||||
{-EAGAIN, "Too match scheduled for the future"},
|
||||
{-ENXIO, "URB already queued"},
|
||||
{-EFBIG, "Too much ISO frames requested"},
|
||||
{-ENOSR, "Buffer error (overrun)"},
|
||||
{-EPIPE, "Specified endpoint is stalled (device not responding)"},
|
||||
{-EOVERFLOW, "Babble (bad cable?)"},
|
||||
{-EPROTO, "Bit-stuff error (bad cable?)"},
|
||||
{-EILSEQ, "CRC/Timeout"},
|
||||
{-ETIMEDOUT, "NAK (device does not respond)"},
|
||||
{-ESHUTDOWN, "Device unplugged"},
|
||||
{-1, NULL}
|
||||
};
|
||||
|
||||
static inline const char *
|
||||
symbolic(struct hfcusb_symbolic_list list[], const int num)
|
||||
{
|
||||
int i;
|
||||
for (i = 0; list[i].name != NULL; i++)
|
||||
if (list[i].num == num)
|
||||
return list[i].name;
|
||||
return "<unkown USB Error>";
|
||||
}
|
||||
|
||||
/* USB descriptor need to contain one of the following EndPoint combination: */
|
||||
#define CNF_4INT3ISO 1 /* 4 INT IN, 3 ISO OUT */
|
||||
#define CNF_3INT3ISO 2 /* 3 INT IN, 3 ISO OUT */
|
||||
#define CNF_4ISO3ISO 3 /* 4 ISO IN, 3 ISO OUT */
|
||||
#define CNF_3ISO3ISO 4 /* 3 ISO IN, 3 ISO OUT */
|
||||
|
||||
#define EP_NUL 1 /* Endpoint at this position not allowed */
|
||||
#define EP_NOP 2 /* all type of endpoints allowed at this position */
|
||||
#define EP_ISO 3 /* Isochron endpoint mandatory at this position */
|
||||
#define EP_BLK 4 /* Bulk endpoint mandatory at this position */
|
||||
#define EP_INT 5 /* Interrupt endpoint mandatory at this position */
|
||||
|
||||
#define HFC_CHAN_B1 0
|
||||
#define HFC_CHAN_B2 1
|
||||
#define HFC_CHAN_D 2
|
||||
#define HFC_CHAN_E 3
|
||||
|
||||
|
||||
/*
|
||||
* List of all supported enpoints configiration sets, used to find the
|
||||
* best matching endpoint configuration within a devices' USB descriptor.
|
||||
* We need at least 3 RX endpoints, and 3 TX endpoints, either
|
||||
* INT-in and ISO-out, or ISO-in and ISO-out)
|
||||
* with 4 RX endpoints even E-Channel logging is possible
|
||||
*/
|
||||
static int
|
||||
validconf[][19] = {
|
||||
/* INT in, ISO out config */
|
||||
{EP_NUL, EP_INT, EP_NUL, EP_INT, EP_NUL, EP_INT, EP_NOP, EP_INT,
|
||||
EP_ISO, EP_NUL, EP_ISO, EP_NUL, EP_ISO, EP_NUL, EP_NUL, EP_NUL,
|
||||
CNF_4INT3ISO, 2, 1},
|
||||
{EP_NUL, EP_INT, EP_NUL, EP_INT, EP_NUL, EP_INT, EP_NUL, EP_NUL,
|
||||
EP_ISO, EP_NUL, EP_ISO, EP_NUL, EP_ISO, EP_NUL, EP_NUL, EP_NUL,
|
||||
CNF_3INT3ISO, 2, 0},
|
||||
/* ISO in, ISO out config */
|
||||
{EP_NOP, EP_NOP, EP_NOP, EP_NOP, EP_NOP, EP_NOP, EP_NOP, EP_NOP,
|
||||
EP_ISO, EP_ISO, EP_ISO, EP_ISO, EP_ISO, EP_ISO, EP_NOP, EP_ISO,
|
||||
CNF_4ISO3ISO, 2, 1},
|
||||
{EP_NUL, EP_NUL, EP_NUL, EP_NUL, EP_NUL, EP_NUL, EP_NUL, EP_NUL,
|
||||
EP_ISO, EP_ISO, EP_ISO, EP_ISO, EP_ISO, EP_ISO, EP_NUL, EP_NUL,
|
||||
CNF_3ISO3ISO, 2, 0},
|
||||
{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0} /* EOL element */
|
||||
};
|
||||
|
||||
/* string description of chosen config */
|
||||
char *conf_str[] = {
|
||||
"4 Interrupt IN + 3 Isochron OUT",
|
||||
"3 Interrupt IN + 3 Isochron OUT",
|
||||
"4 Isochron IN + 3 Isochron OUT",
|
||||
"3 Isochron IN + 3 Isochron OUT"
|
||||
};
|
||||
|
||||
|
||||
#define LED_OFF 0 /* no LED support */
|
||||
#define LED_SCHEME1 1 /* LED standard scheme */
|
||||
#define LED_SCHEME2 2 /* not used yet... */
|
||||
|
||||
#define LED_POWER_ON 1
|
||||
#define LED_POWER_OFF 2
|
||||
#define LED_S0_ON 3
|
||||
#define LED_S0_OFF 4
|
||||
#define LED_B1_ON 5
|
||||
#define LED_B1_OFF 6
|
||||
#define LED_B1_DATA 7
|
||||
#define LED_B2_ON 8
|
||||
#define LED_B2_OFF 9
|
||||
#define LED_B2_DATA 10
|
||||
|
||||
#define LED_NORMAL 0 /* LEDs are normal */
|
||||
#define LED_INVERTED 1 /* LEDs are inverted */
|
||||
|
||||
/* time in ms to perform a Flashing LED when B-Channel has traffic */
|
||||
#define LED_TIME 250
|
||||
|
||||
|
||||
|
||||
struct hfcsusb;
|
||||
struct usb_fifo;
|
||||
|
||||
/* structure defining input+output fifos (interrupt/bulk mode) */
|
||||
struct iso_urb {
|
||||
struct urb *urb;
|
||||
__u8 buffer[ISO_BUFFER_SIZE]; /* buffer rx/tx USB URB data */
|
||||
struct usb_fifo *owner_fifo; /* pointer to owner fifo */
|
||||
__u8 indx; /* Fifos's ISO double buffer 0 or 1 ? */
|
||||
#ifdef ISO_FRAME_START_DEBUG
|
||||
int start_frames[ISO_FRAME_START_RING_COUNT];
|
||||
__u8 iso_frm_strt_pos; /* index in start_frame[] */
|
||||
#endif
|
||||
};
|
||||
|
||||
struct usb_fifo {
|
||||
int fifonum; /* fifo index attached to this structure */
|
||||
int active; /* fifo is currently active */
|
||||
struct hfcsusb *hw; /* pointer to main structure */
|
||||
int pipe; /* address of endpoint */
|
||||
__u8 usb_packet_maxlen; /* maximum length for usb transfer */
|
||||
unsigned int max_size; /* maximum size of receive/send packet */
|
||||
__u8 intervall; /* interrupt interval */
|
||||
struct urb *urb; /* transfer structure for usb routines */
|
||||
__u8 buffer[128]; /* buffer USB INT OUT URB data */
|
||||
int bit_line; /* how much bits are in the fifo? */
|
||||
|
||||
__u8 usb_transfer_mode; /* switched between ISO and INT */
|
||||
struct iso_urb iso[2]; /* two urbs to have one always
|
||||
one pending */
|
||||
|
||||
struct dchannel *dch; /* link to hfcsusb_t->dch */
|
||||
struct bchannel *bch; /* link to hfcsusb_t->bch */
|
||||
struct dchannel *ech; /* link to hfcsusb_t->ech, TODO: E-CHANNEL */
|
||||
int last_urblen; /* remember length of last packet */
|
||||
__u8 stop_gracefull; /* stops URB retransmission */
|
||||
};
|
||||
|
||||
struct hfcsusb {
|
||||
struct list_head list;
|
||||
struct dchannel dch;
|
||||
struct bchannel bch[2];
|
||||
struct dchannel ech; /* TODO : wait for struct echannel ;) */
|
||||
|
||||
struct usb_device *dev; /* our device */
|
||||
struct usb_interface *intf; /* used interface */
|
||||
int if_used; /* used interface number */
|
||||
int alt_used; /* used alternate config */
|
||||
int cfg_used; /* configuration index used */
|
||||
int vend_idx; /* index in hfcsusb_idtab */
|
||||
int packet_size;
|
||||
int iso_packet_size;
|
||||
struct usb_fifo fifos[HFCUSB_NUM_FIFOS];
|
||||
|
||||
/* control pipe background handling */
|
||||
struct ctrl_buf ctrl_buff[HFC_CTRL_BUFSIZE];
|
||||
int ctrl_in_idx, ctrl_out_idx, ctrl_cnt;
|
||||
struct urb *ctrl_urb;
|
||||
struct usb_ctrlrequest ctrl_write;
|
||||
struct usb_ctrlrequest ctrl_read;
|
||||
int ctrl_paksize;
|
||||
int ctrl_in_pipe, ctrl_out_pipe;
|
||||
spinlock_t ctrl_lock; /* lock for ctrl */
|
||||
spinlock_t lock;
|
||||
|
||||
__u8 threshold_mask;
|
||||
__u8 led_state;
|
||||
|
||||
__u8 protocol;
|
||||
int nt_timer;
|
||||
int open;
|
||||
__u8 timers;
|
||||
__u8 initdone;
|
||||
char name[MISDN_MAX_IDLEN];
|
||||
};
|
||||
|
||||
/* private vendor specific data */
|
||||
struct hfcsusb_vdata {
|
||||
__u8 led_scheme; /* led display scheme */
|
||||
signed short led_bits[8]; /* array of 8 possible LED bitmask */
|
||||
char *vend_name; /* device name */
|
||||
};
|
||||
|
||||
|
||||
#define HFC_MAX_TE_LAYER1_STATE 8
|
||||
#define HFC_MAX_NT_LAYER1_STATE 4
|
||||
|
||||
const char *HFC_TE_LAYER1_STATES[HFC_MAX_TE_LAYER1_STATE + 1] = {
|
||||
"TE F0 - Reset",
|
||||
"TE F1 - Reset",
|
||||
"TE F2 - Sensing",
|
||||
"TE F3 - Deactivated",
|
||||
"TE F4 - Awaiting signal",
|
||||
"TE F5 - Identifying input",
|
||||
"TE F6 - Synchronized",
|
||||
"TE F7 - Activated",
|
||||
"TE F8 - Lost framing",
|
||||
};
|
||||
|
||||
const char *HFC_NT_LAYER1_STATES[HFC_MAX_NT_LAYER1_STATE + 1] = {
|
||||
"NT G0 - Reset",
|
||||
"NT G1 - Deactive",
|
||||
"NT G2 - Pending activation",
|
||||
"NT G3 - Active",
|
||||
"NT G4 - Pending deactivation",
|
||||
};
|
||||
|
||||
/* supported devices */
|
||||
static struct usb_device_id hfcsusb_idtab[] = {
|
||||
{
|
||||
USB_DEVICE(0x0959, 0x2bd0),
|
||||
.driver_info = (unsigned long) &((struct hfcsusb_vdata)
|
||||
{LED_OFF, {4, 0, 2, 1},
|
||||
"ISDN USB TA (Cologne Chip HFC-S USB based)"}),
|
||||
},
|
||||
{
|
||||
USB_DEVICE(0x0675, 0x1688),
|
||||
.driver_info = (unsigned long) &((struct hfcsusb_vdata)
|
||||
{LED_SCHEME1, {1, 2, 0, 0},
|
||||
"DrayTek miniVigor 128 USB ISDN TA"}),
|
||||
},
|
||||
{
|
||||
USB_DEVICE(0x07b0, 0x0007),
|
||||
.driver_info = (unsigned long) &((struct hfcsusb_vdata)
|
||||
{LED_SCHEME1, {0x80, -64, -32, -16},
|
||||
"Billion tiny USB ISDN TA 128"}),
|
||||
},
|
||||
{
|
||||
USB_DEVICE(0x0742, 0x2008),
|
||||
.driver_info = (unsigned long) &((struct hfcsusb_vdata)
|
||||
{LED_SCHEME1, {4, 0, 2, 1},
|
||||
"Stollmann USB TA"}),
|
||||
},
|
||||
{
|
||||
USB_DEVICE(0x0742, 0x2009),
|
||||
.driver_info = (unsigned long) &((struct hfcsusb_vdata)
|
||||
{LED_SCHEME1, {4, 0, 2, 1},
|
||||
"Aceex USB ISDN TA"}),
|
||||
},
|
||||
{
|
||||
USB_DEVICE(0x0742, 0x200A),
|
||||
.driver_info = (unsigned long) &((struct hfcsusb_vdata)
|
||||
{LED_SCHEME1, {4, 0, 2, 1},
|
||||
"OEM USB ISDN TA"}),
|
||||
},
|
||||
{
|
||||
USB_DEVICE(0x08e3, 0x0301),
|
||||
.driver_info = (unsigned long) &((struct hfcsusb_vdata)
|
||||
{LED_SCHEME1, {2, 0, 1, 4},
|
||||
"Olitec USB RNIS"}),
|
||||
},
|
||||
{
|
||||
USB_DEVICE(0x07fa, 0x0846),
|
||||
.driver_info = (unsigned long) &((struct hfcsusb_vdata)
|
||||
{LED_SCHEME1, {0x80, -64, -32, -16},
|
||||
"Bewan Modem RNIS USB"}),
|
||||
},
|
||||
{
|
||||
USB_DEVICE(0x07fa, 0x0847),
|
||||
.driver_info = (unsigned long) &((struct hfcsusb_vdata)
|
||||
{LED_SCHEME1, {0x80, -64, -32, -16},
|
||||
"Djinn Numeris USB"}),
|
||||
},
|
||||
{
|
||||
USB_DEVICE(0x07b0, 0x0006),
|
||||
.driver_info = (unsigned long) &((struct hfcsusb_vdata)
|
||||
{LED_SCHEME1, {0x80, -64, -32, -16},
|
||||
"Twister ISDN TA"}),
|
||||
},
|
||||
{
|
||||
USB_DEVICE(0x071d, 0x1005),
|
||||
.driver_info = (unsigned long) &((struct hfcsusb_vdata)
|
||||
{LED_SCHEME1, {0x02, 0, 0x01, 0x04},
|
||||
"Eicon DIVA USB 4.0"}),
|
||||
},
|
||||
{
|
||||
USB_DEVICE(0x0586, 0x0102),
|
||||
.driver_info = (unsigned long) &((struct hfcsusb_vdata)
|
||||
{LED_SCHEME1, {0x88, -64, -32, -16},
|
||||
"ZyXEL OMNI.NET USB II"}),
|
||||
},
|
||||
{ }
|
||||
};
|
||||
|
||||
MODULE_DEVICE_TABLE(usb, hfcsusb_idtab);
|
||||
|
||||
#endif /* __HFCSUSB_H__ */
|
|
@ -8,6 +8,6 @@ obj-$(CONFIG_MISDN_L1OIP) += l1oip.o
|
|||
|
||||
# multi objects
|
||||
|
||||
mISDN_core-objs := core.o fsm.o socket.o hwchannel.o stack.o layer1.o layer2.o tei.o timerdev.o
|
||||
mISDN_core-objs := core.o fsm.o socket.o clock.o hwchannel.o stack.o layer1.o layer2.o tei.o timerdev.o
|
||||
mISDN_dsp-objs := dsp_core.o dsp_cmx.o dsp_tones.o dsp_dtmf.o dsp_audio.o dsp_blowfish.o dsp_pipeline.o dsp_hwec.o
|
||||
l1oip-objs := l1oip_core.o l1oip_codec.o
|
||||
|
|
|
@ -0,0 +1,216 @@
|
|||
/*
|
||||
* Copyright 2008 by Andreas Eversberg <andreas@eversberg.eu>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License version 2 as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* Quick API description:
|
||||
*
|
||||
* A clock source registers using mISDN_register_clock:
|
||||
* name = text string to name clock source
|
||||
* priority = value to priorize clock sources (0 = default)
|
||||
* ctl = callback function to enable/disable clock source
|
||||
* priv = private pointer of clock source
|
||||
* return = pointer to clock source structure;
|
||||
*
|
||||
* Note: Callback 'ctl' can be called before mISDN_register_clock returns!
|
||||
* Also it can be called during mISDN_unregister_clock.
|
||||
*
|
||||
* A clock source calls mISDN_clock_update with given samples elapsed, if
|
||||
* enabled. If function call is delayed, tv must be set with the timestamp
|
||||
* of the actual event.
|
||||
*
|
||||
* A clock source unregisters using mISDN_unregister_clock.
|
||||
*
|
||||
* To get current clock, call mISDN_clock_get. The signed short value
|
||||
* counts the number of samples since. Time since last clock event is added.
|
||||
*
|
||||
*/
|
||||
|
||||
#include <linux/types.h>
|
||||
#include <linux/stddef.h>
|
||||
#include <linux/spinlock.h>
|
||||
#include <linux/mISDNif.h>
|
||||
#include "core.h"
|
||||
|
||||
static u_int *debug;
|
||||
static LIST_HEAD(iclock_list);
|
||||
DEFINE_RWLOCK(iclock_lock);
|
||||
u16 iclock_count; /* counter of last clock */
|
||||
struct timeval iclock_tv; /* time stamp of last clock */
|
||||
int iclock_tv_valid; /* already received one timestamp */
|
||||
struct mISDNclock *iclock_current;
|
||||
|
||||
void
|
||||
mISDN_init_clock(u_int *dp)
|
||||
{
|
||||
debug = dp;
|
||||
do_gettimeofday(&iclock_tv);
|
||||
}
|
||||
|
||||
static void
|
||||
select_iclock(void)
|
||||
{
|
||||
struct mISDNclock *iclock, *bestclock = NULL, *lastclock = NULL;
|
||||
int pri = -128;
|
||||
|
||||
list_for_each_entry(iclock, &iclock_list, list) {
|
||||
if (iclock->pri > pri) {
|
||||
pri = iclock->pri;
|
||||
bestclock = iclock;
|
||||
}
|
||||
if (iclock_current == iclock)
|
||||
lastclock = iclock;
|
||||
}
|
||||
if (lastclock && bestclock != lastclock) {
|
||||
/* last used clock source still exists but changes, disable */
|
||||
if (*debug & DEBUG_CLOCK)
|
||||
printk(KERN_DEBUG "Old clock source '%s' disable.\n",
|
||||
lastclock->name);
|
||||
lastclock->ctl(lastclock->priv, 0);
|
||||
}
|
||||
if (bestclock && bestclock != iclock_current) {
|
||||
/* new clock source selected, enable */
|
||||
if (*debug & DEBUG_CLOCK)
|
||||
printk(KERN_DEBUG "New clock source '%s' enable.\n",
|
||||
bestclock->name);
|
||||
bestclock->ctl(bestclock->priv, 1);
|
||||
}
|
||||
if (bestclock != iclock_current) {
|
||||
/* no clock received yet */
|
||||
iclock_tv_valid = 0;
|
||||
}
|
||||
iclock_current = bestclock;
|
||||
}
|
||||
|
||||
struct mISDNclock
|
||||
*mISDN_register_clock(char *name, int pri, clockctl_func_t *ctl, void *priv)
|
||||
{
|
||||
u_long flags;
|
||||
struct mISDNclock *iclock;
|
||||
|
||||
if (*debug & (DEBUG_CORE | DEBUG_CLOCK))
|
||||
printk(KERN_DEBUG "%s: %s %d\n", __func__, name, pri);
|
||||
iclock = kzalloc(sizeof(struct mISDNclock), GFP_ATOMIC);
|
||||
if (!iclock) {
|
||||
printk(KERN_ERR "%s: No memory for clock entry.\n", __func__);
|
||||
return NULL;
|
||||
}
|
||||
strncpy(iclock->name, name, sizeof(iclock->name)-1);
|
||||
iclock->pri = pri;
|
||||
iclock->priv = priv;
|
||||
iclock->ctl = ctl;
|
||||
write_lock_irqsave(&iclock_lock, flags);
|
||||
list_add_tail(&iclock->list, &iclock_list);
|
||||
select_iclock();
|
||||
write_unlock_irqrestore(&iclock_lock, flags);
|
||||
return iclock;
|
||||
}
|
||||
EXPORT_SYMBOL(mISDN_register_clock);
|
||||
|
||||
void
|
||||
mISDN_unregister_clock(struct mISDNclock *iclock)
|
||||
{
|
||||
u_long flags;
|
||||
|
||||
if (*debug & (DEBUG_CORE | DEBUG_CLOCK))
|
||||
printk(KERN_DEBUG "%s: %s %d\n", __func__, iclock->name,
|
||||
iclock->pri);
|
||||
write_lock_irqsave(&iclock_lock, flags);
|
||||
if (iclock_current == iclock) {
|
||||
if (*debug & DEBUG_CLOCK)
|
||||
printk(KERN_DEBUG
|
||||
"Current clock source '%s' unregisters.\n",
|
||||
iclock->name);
|
||||
iclock->ctl(iclock->priv, 0);
|
||||
}
|
||||
list_del(&iclock->list);
|
||||
select_iclock();
|
||||
write_unlock_irqrestore(&iclock_lock, flags);
|
||||
}
|
||||
EXPORT_SYMBOL(mISDN_unregister_clock);
|
||||
|
||||
void
|
||||
mISDN_clock_update(struct mISDNclock *iclock, int samples, struct timeval *tv)
|
||||
{
|
||||
u_long flags;
|
||||
struct timeval tv_now;
|
||||
time_t elapsed_sec;
|
||||
int elapsed_8000th;
|
||||
|
||||
write_lock_irqsave(&iclock_lock, flags);
|
||||
if (iclock_current != iclock) {
|
||||
printk(KERN_ERR "%s: '%s' sends us clock updates, but we do "
|
||||
"listen to '%s'. This is a bug!\n", __func__,
|
||||
iclock->name,
|
||||
iclock_current ? iclock_current->name : "nothing");
|
||||
iclock->ctl(iclock->priv, 0);
|
||||
write_unlock_irqrestore(&iclock_lock, flags);
|
||||
return;
|
||||
}
|
||||
if (iclock_tv_valid) {
|
||||
/* increment sample counter by given samples */
|
||||
iclock_count += samples;
|
||||
if (tv) { /* tv must be set, if function call is delayed */
|
||||
iclock_tv.tv_sec = tv->tv_sec;
|
||||
iclock_tv.tv_usec = tv->tv_usec;
|
||||
} else
|
||||
do_gettimeofday(&iclock_tv);
|
||||
} else {
|
||||
/* calc elapsed time by system clock */
|
||||
if (tv) { /* tv must be set, if function call is delayed */
|
||||
tv_now.tv_sec = tv->tv_sec;
|
||||
tv_now.tv_usec = tv->tv_usec;
|
||||
} else
|
||||
do_gettimeofday(&tv_now);
|
||||
elapsed_sec = tv_now.tv_sec - iclock_tv.tv_sec;
|
||||
elapsed_8000th = (tv_now.tv_usec / 125)
|
||||
- (iclock_tv.tv_usec / 125);
|
||||
if (elapsed_8000th < 0) {
|
||||
elapsed_sec -= 1;
|
||||
elapsed_8000th += 8000;
|
||||
}
|
||||
/* add elapsed time to counter and set new timestamp */
|
||||
iclock_count += elapsed_sec * 8000 + elapsed_8000th;
|
||||
iclock_tv.tv_sec = tv_now.tv_sec;
|
||||
iclock_tv.tv_usec = tv_now.tv_usec;
|
||||
iclock_tv_valid = 1;
|
||||
if (*debug & DEBUG_CLOCK)
|
||||
printk("Received first clock from source '%s'.\n",
|
||||
iclock_current ? iclock_current->name : "nothing");
|
||||
}
|
||||
write_unlock_irqrestore(&iclock_lock, flags);
|
||||
}
|
||||
EXPORT_SYMBOL(mISDN_clock_update);
|
||||
|
||||
unsigned short
|
||||
mISDN_clock_get(void)
|
||||
{
|
||||
u_long flags;
|
||||
struct timeval tv_now;
|
||||
time_t elapsed_sec;
|
||||
int elapsed_8000th;
|
||||
u16 count;
|
||||
|
||||
read_lock_irqsave(&iclock_lock, flags);
|
||||
/* calc elapsed time by system clock */
|
||||
do_gettimeofday(&tv_now);
|
||||
elapsed_sec = tv_now.tv_sec - iclock_tv.tv_sec;
|
||||
elapsed_8000th = (tv_now.tv_usec / 125) - (iclock_tv.tv_usec / 125);
|
||||
if (elapsed_8000th < 0) {
|
||||
elapsed_sec -= 1;
|
||||
elapsed_8000th += 8000;
|
||||
}
|
||||
/* add elapsed time to counter */
|
||||
count = iclock_count + elapsed_sec * 8000 + elapsed_8000th;
|
||||
read_unlock_irqrestore(&iclock_lock, flags);
|
||||
return count;
|
||||
}
|
||||
EXPORT_SYMBOL(mISDN_clock_get);
|
||||
|
|
@ -25,39 +25,183 @@ MODULE_AUTHOR("Karsten Keil");
|
|||
MODULE_LICENSE("GPL");
|
||||
module_param(debug, uint, S_IRUGO | S_IWUSR);
|
||||
|
||||
static LIST_HEAD(devices);
|
||||
static DEFINE_RWLOCK(device_lock);
|
||||
static u64 device_ids;
|
||||
#define MAX_DEVICE_ID 63
|
||||
|
||||
static LIST_HEAD(Bprotocols);
|
||||
static DEFINE_RWLOCK(bp_lock);
|
||||
|
||||
static void mISDN_dev_release(struct device *dev)
|
||||
{
|
||||
/* nothing to do: the device is part of its parent's data structure */
|
||||
}
|
||||
|
||||
static ssize_t _show_id(struct device *dev,
|
||||
struct device_attribute *attr, char *buf)
|
||||
{
|
||||
struct mISDNdevice *mdev = dev_to_mISDN(dev);
|
||||
|
||||
if (!mdev)
|
||||
return -ENODEV;
|
||||
return sprintf(buf, "%d\n", mdev->id);
|
||||
}
|
||||
|
||||
static ssize_t _show_nrbchan(struct device *dev,
|
||||
struct device_attribute *attr, char *buf)
|
||||
{
|
||||
struct mISDNdevice *mdev = dev_to_mISDN(dev);
|
||||
|
||||
if (!mdev)
|
||||
return -ENODEV;
|
||||
return sprintf(buf, "%d\n", mdev->nrbchan);
|
||||
}
|
||||
|
||||
static ssize_t _show_d_protocols(struct device *dev,
|
||||
struct device_attribute *attr, char *buf)
|
||||
{
|
||||
struct mISDNdevice *mdev = dev_to_mISDN(dev);
|
||||
|
||||
if (!mdev)
|
||||
return -ENODEV;
|
||||
return sprintf(buf, "%d\n", mdev->Dprotocols);
|
||||
}
|
||||
|
||||
static ssize_t _show_b_protocols(struct device *dev,
|
||||
struct device_attribute *attr, char *buf)
|
||||
{
|
||||
struct mISDNdevice *mdev = dev_to_mISDN(dev);
|
||||
|
||||
if (!mdev)
|
||||
return -ENODEV;
|
||||
return sprintf(buf, "%d\n", mdev->Bprotocols | get_all_Bprotocols());
|
||||
}
|
||||
|
||||
static ssize_t _show_protocol(struct device *dev,
|
||||
struct device_attribute *attr, char *buf)
|
||||
{
|
||||
struct mISDNdevice *mdev = dev_to_mISDN(dev);
|
||||
|
||||
if (!mdev)
|
||||
return -ENODEV;
|
||||
return sprintf(buf, "%d\n", mdev->D.protocol);
|
||||
}
|
||||
|
||||
static ssize_t _show_name(struct device *dev,
|
||||
struct device_attribute *attr, char *buf)
|
||||
{
|
||||
strcpy(buf, dev_name(dev));
|
||||
return strlen(buf);
|
||||
}
|
||||
|
||||
#if 0 /* hangs */
|
||||
static ssize_t _set_name(struct device *dev, struct device_attribute *attr,
|
||||
const char *buf, size_t count)
|
||||
{
|
||||
int err = 0;
|
||||
char *out = kmalloc(count + 1, GFP_KERNEL);
|
||||
|
||||
if (!out)
|
||||
return -ENOMEM;
|
||||
|
||||
memcpy(out, buf, count);
|
||||
if (count && out[count - 1] == '\n')
|
||||
out[--count] = 0;
|
||||
if (count)
|
||||
err = device_rename(dev, out);
|
||||
kfree(out);
|
||||
|
||||
return (err < 0) ? err : count;
|
||||
}
|
||||
#endif
|
||||
|
||||
static ssize_t _show_channelmap(struct device *dev,
|
||||
struct device_attribute *attr, char *buf)
|
||||
{
|
||||
struct mISDNdevice *mdev = dev_to_mISDN(dev);
|
||||
char *bp = buf;
|
||||
int i;
|
||||
|
||||
for (i = 0; i <= mdev->nrbchan; i++)
|
||||
*bp++ = test_channelmap(i, mdev->channelmap) ? '1' : '0';
|
||||
|
||||
return bp - buf;
|
||||
}
|
||||
|
||||
static struct device_attribute mISDN_dev_attrs[] = {
|
||||
__ATTR(id, S_IRUGO, _show_id, NULL),
|
||||
__ATTR(d_protocols, S_IRUGO, _show_d_protocols, NULL),
|
||||
__ATTR(b_protocols, S_IRUGO, _show_b_protocols, NULL),
|
||||
__ATTR(protocol, S_IRUGO, _show_protocol, NULL),
|
||||
__ATTR(channelmap, S_IRUGO, _show_channelmap, NULL),
|
||||
__ATTR(nrbchan, S_IRUGO, _show_nrbchan, NULL),
|
||||
__ATTR(name, S_IRUGO, _show_name, NULL),
|
||||
/* __ATTR(name, S_IRUGO|S_IWUSR, _show_name, _set_name), */
|
||||
{}
|
||||
};
|
||||
|
||||
#ifdef CONFIG_HOTPLUG
|
||||
static int mISDN_uevent(struct device *dev, struct kobj_uevent_env *env)
|
||||
{
|
||||
struct mISDNdevice *mdev = dev_to_mISDN(dev);
|
||||
|
||||
if (!mdev)
|
||||
return 0;
|
||||
|
||||
if (add_uevent_var(env, "nchans=%d", mdev->nrbchan))
|
||||
return -ENOMEM;
|
||||
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
static void mISDN_class_release(struct class *cls)
|
||||
{
|
||||
/* do nothing, it's static */
|
||||
}
|
||||
|
||||
static struct class mISDN_class = {
|
||||
.name = "mISDN",
|
||||
.owner = THIS_MODULE,
|
||||
#ifdef CONFIG_HOTPLUG
|
||||
.dev_uevent = mISDN_uevent,
|
||||
#endif
|
||||
.dev_attrs = mISDN_dev_attrs,
|
||||
.dev_release = mISDN_dev_release,
|
||||
.class_release = mISDN_class_release,
|
||||
};
|
||||
|
||||
static int
|
||||
_get_mdevice(struct device *dev, void *id)
|
||||
{
|
||||
struct mISDNdevice *mdev = dev_to_mISDN(dev);
|
||||
|
||||
if (!mdev)
|
||||
return 0;
|
||||
if (mdev->id != *(u_int *)id)
|
||||
return 0;
|
||||
return 1;
|
||||
}
|
||||
|
||||
struct mISDNdevice
|
||||
*get_mdevice(u_int id)
|
||||
{
|
||||
struct mISDNdevice *dev;
|
||||
return dev_to_mISDN(class_find_device(&mISDN_class, NULL, &id,
|
||||
_get_mdevice));
|
||||
}
|
||||
|
||||
read_lock(&device_lock);
|
||||
list_for_each_entry(dev, &devices, D.list)
|
||||
if (dev->id == id) {
|
||||
read_unlock(&device_lock);
|
||||
return dev;
|
||||
}
|
||||
read_unlock(&device_lock);
|
||||
return NULL;
|
||||
static int
|
||||
_get_mdevice_count(struct device *dev, void *cnt)
|
||||
{
|
||||
*(int *)cnt += 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
int
|
||||
get_mdevice_count(void)
|
||||
{
|
||||
struct mISDNdevice *dev;
|
||||
int cnt = 0;
|
||||
|
||||
read_lock(&device_lock);
|
||||
list_for_each_entry(dev, &devices, D.list)
|
||||
cnt++;
|
||||
read_unlock(&device_lock);
|
||||
class_for_each_device(&mISDN_class, NULL, &cnt, _get_mdevice_count);
|
||||
return cnt;
|
||||
}
|
||||
|
||||
|
@ -68,48 +212,66 @@ get_free_devid(void)
|
|||
|
||||
for (i = 0; i <= MAX_DEVICE_ID; i++)
|
||||
if (!test_and_set_bit(i, (u_long *)&device_ids))
|
||||
return i;
|
||||
break;
|
||||
if (i > MAX_DEVICE_ID)
|
||||
return -1;
|
||||
return i;
|
||||
}
|
||||
|
||||
int
|
||||
mISDN_register_device(struct mISDNdevice *dev, char *name)
|
||||
mISDN_register_device(struct mISDNdevice *dev,
|
||||
struct device *parent, char *name)
|
||||
{
|
||||
u_long flags;
|
||||
int err;
|
||||
|
||||
dev->id = get_free_devid();
|
||||
err = -EBUSY;
|
||||
if (dev->id < 0)
|
||||
return -EBUSY;
|
||||
goto error1;
|
||||
|
||||
device_initialize(&dev->dev);
|
||||
if (name && name[0])
|
||||
strcpy(dev->name, name);
|
||||
dev_set_name(&dev->dev, "%s", name);
|
||||
else
|
||||
sprintf(dev->name, "mISDN%d", dev->id);
|
||||
dev_set_name(&dev->dev, "mISDN%d", dev->id);
|
||||
if (debug & DEBUG_CORE)
|
||||
printk(KERN_DEBUG "mISDN_register %s %d\n",
|
||||
dev->name, dev->id);
|
||||
dev_name(&dev->dev), dev->id);
|
||||
err = create_stack(dev);
|
||||
if (err)
|
||||
return err;
|
||||
write_lock_irqsave(&device_lock, flags);
|
||||
list_add_tail(&dev->D.list, &devices);
|
||||
write_unlock_irqrestore(&device_lock, flags);
|
||||
goto error1;
|
||||
|
||||
dev->dev.class = &mISDN_class;
|
||||
dev->dev.platform_data = dev;
|
||||
dev->dev.parent = parent;
|
||||
dev_set_drvdata(&dev->dev, dev);
|
||||
|
||||
err = device_add(&dev->dev);
|
||||
if (err)
|
||||
goto error3;
|
||||
return 0;
|
||||
|
||||
error3:
|
||||
delete_stack(dev);
|
||||
return err;
|
||||
error1:
|
||||
return err;
|
||||
|
||||
}
|
||||
EXPORT_SYMBOL(mISDN_register_device);
|
||||
|
||||
void
|
||||
mISDN_unregister_device(struct mISDNdevice *dev) {
|
||||
u_long flags;
|
||||
|
||||
if (debug & DEBUG_CORE)
|
||||
printk(KERN_DEBUG "mISDN_unregister %s %d\n",
|
||||
dev->name, dev->id);
|
||||
write_lock_irqsave(&device_lock, flags);
|
||||
list_del(&dev->D.list);
|
||||
write_unlock_irqrestore(&device_lock, flags);
|
||||
dev_name(&dev->dev), dev->id);
|
||||
/* sysfs_remove_link(&dev->dev.kobj, "device"); */
|
||||
device_del(&dev->dev);
|
||||
dev_set_drvdata(&dev->dev, NULL);
|
||||
|
||||
test_and_clear_bit(dev->id, (u_long *)&device_ids);
|
||||
delete_stack(dev);
|
||||
put_device(&dev->dev);
|
||||
}
|
||||
EXPORT_SYMBOL(mISDN_unregister_device);
|
||||
|
||||
|
@ -199,43 +361,45 @@ mISDNInit(void)
|
|||
|
||||
printk(KERN_INFO "Modular ISDN core version %d.%d.%d\n",
|
||||
MISDN_MAJOR_VERSION, MISDN_MINOR_VERSION, MISDN_RELEASE);
|
||||
mISDN_init_clock(&debug);
|
||||
mISDN_initstack(&debug);
|
||||
err = class_register(&mISDN_class);
|
||||
if (err)
|
||||
goto error1;
|
||||
err = mISDN_inittimer(&debug);
|
||||
if (err)
|
||||
goto error;
|
||||
goto error2;
|
||||
err = l1_init(&debug);
|
||||
if (err) {
|
||||
mISDN_timer_cleanup();
|
||||
goto error;
|
||||
}
|
||||
if (err)
|
||||
goto error3;
|
||||
err = Isdnl2_Init(&debug);
|
||||
if (err) {
|
||||
mISDN_timer_cleanup();
|
||||
l1_cleanup();
|
||||
goto error;
|
||||
}
|
||||
if (err)
|
||||
goto error4;
|
||||
err = misdn_sock_init(&debug);
|
||||
if (err) {
|
||||
mISDN_timer_cleanup();
|
||||
l1_cleanup();
|
||||
if (err)
|
||||
goto error5;
|
||||
return 0;
|
||||
|
||||
error5:
|
||||
Isdnl2_cleanup();
|
||||
}
|
||||
error:
|
||||
error4:
|
||||
l1_cleanup();
|
||||
error3:
|
||||
mISDN_timer_cleanup();
|
||||
error2:
|
||||
class_unregister(&mISDN_class);
|
||||
error1:
|
||||
return err;
|
||||
}
|
||||
|
||||
static void mISDN_cleanup(void)
|
||||
{
|
||||
misdn_sock_cleanup();
|
||||
mISDN_timer_cleanup();
|
||||
l1_cleanup();
|
||||
Isdnl2_cleanup();
|
||||
l1_cleanup();
|
||||
mISDN_timer_cleanup();
|
||||
class_unregister(&mISDN_class);
|
||||
|
||||
if (!list_empty(&devices))
|
||||
printk(KERN_ERR "%s devices still registered\n", __func__);
|
||||
|
||||
if (!list_empty(&Bprotocols))
|
||||
printk(KERN_ERR "%s Bprotocols still registered\n", __func__);
|
||||
printk(KERN_DEBUG "mISDNcore unloaded\n");
|
||||
}
|
||||
|
||||
|
|
|
@ -74,4 +74,6 @@ extern void l1_cleanup(void);
|
|||
extern int Isdnl2_Init(u_int *);
|
||||
extern void Isdnl2_cleanup(void);
|
||||
|
||||
extern void mISDN_init_clock(u_int *);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -15,6 +15,7 @@
|
|||
#define DEBUG_DSP_TONE 0x0020
|
||||
#define DEBUG_DSP_BLOWFISH 0x0040
|
||||
#define DEBUG_DSP_DELAY 0x0100
|
||||
#define DEBUG_DSP_CLOCK 0x0200
|
||||
#define DEBUG_DSP_DTMFCOEFF 0x8000 /* heavy output */
|
||||
|
||||
/* options may be:
|
||||
|
@ -198,6 +199,7 @@ struct dsp {
|
|||
/* hardware stuff */
|
||||
struct dsp_features features;
|
||||
int features_rx_off; /* set if rx_off is featured */
|
||||
int features_fill_empty; /* set if fill_empty is featured */
|
||||
int pcm_slot_rx; /* current PCM slot (or -1) */
|
||||
int pcm_bank_rx;
|
||||
int pcm_slot_tx;
|
||||
|
|
|
@ -137,6 +137,7 @@
|
|||
/* #define CMX_CONF_DEBUG */
|
||||
|
||||
/*#define CMX_DEBUG * massive read/write pointer output */
|
||||
/*#define CMX_DELAY_DEBUG * gives rx-buffer delay overview */
|
||||
/*#define CMX_TX_DEBUG * massive read/write on tx-buffer with content */
|
||||
|
||||
static inline int
|
||||
|
@ -744,11 +745,11 @@ conf_software:
|
|||
if (dsp->pcm_slot_rx >= 0 &&
|
||||
dsp->pcm_slot_rx <
|
||||
sizeof(freeslots))
|
||||
freeslots[dsp->pcm_slot_tx] = 0;
|
||||
freeslots[dsp->pcm_slot_rx] = 0;
|
||||
if (dsp->pcm_slot_tx >= 0 &&
|
||||
dsp->pcm_slot_tx <
|
||||
sizeof(freeslots))
|
||||
freeslots[dsp->pcm_slot_rx] = 0;
|
||||
freeslots[dsp->pcm_slot_tx] = 0;
|
||||
}
|
||||
}
|
||||
i = 0;
|
||||
|
@ -836,11 +837,11 @@ conf_software:
|
|||
if (dsp->pcm_slot_rx >= 0 &&
|
||||
dsp->pcm_slot_rx <
|
||||
sizeof(freeslots))
|
||||
freeslots[dsp->pcm_slot_tx] = 0;
|
||||
freeslots[dsp->pcm_slot_rx] = 0;
|
||||
if (dsp->pcm_slot_tx >= 0 &&
|
||||
dsp->pcm_slot_tx <
|
||||
sizeof(freeslots))
|
||||
freeslots[dsp->pcm_slot_rx] = 0;
|
||||
freeslots[dsp->pcm_slot_tx] = 0;
|
||||
}
|
||||
}
|
||||
i1 = 0;
|
||||
|
@ -926,10 +927,6 @@ conf_software:
|
|||
|
||||
/* for more than two members.. */
|
||||
|
||||
/* in case of hdlc, we change to software */
|
||||
if (dsp->hdlc)
|
||||
goto conf_software;
|
||||
|
||||
/* if all members already have the same conference */
|
||||
if (all_conf)
|
||||
return;
|
||||
|
@ -940,6 +937,9 @@ conf_software:
|
|||
if (current_conf >= 0) {
|
||||
join_members:
|
||||
list_for_each_entry(member, &conf->mlist, list) {
|
||||
/* in case of hdlc, change to software */
|
||||
if (member->dsp->hdlc)
|
||||
goto conf_software;
|
||||
/* join to current conference */
|
||||
if (member->dsp->hfc_conf == current_conf)
|
||||
continue;
|
||||
|
@ -1135,6 +1135,25 @@ dsp_cmx_conf(struct dsp *dsp, u32 conf_id)
|
|||
return 0;
|
||||
}
|
||||
|
||||
#ifdef CMX_DELAY_DEBUG
|
||||
int delaycount;
|
||||
static void
|
||||
showdelay(struct dsp *dsp, int samples, int delay)
|
||||
{
|
||||
char bar[] = "--------------------------------------------------|";
|
||||
int sdelay;
|
||||
|
||||
delaycount += samples;
|
||||
if (delaycount < 8000)
|
||||
return;
|
||||
delaycount = 0;
|
||||
|
||||
sdelay = delay * 50 / (dsp_poll << 2);
|
||||
|
||||
printk(KERN_DEBUG "DELAY (%s) %3d >%s\n", dsp->name, delay,
|
||||
sdelay > 50 ? "..." : bar + 50 - sdelay);
|
||||
}
|
||||
#endif
|
||||
|
||||
/*
|
||||
* audio data is received from card
|
||||
|
@ -1168,11 +1187,18 @@ dsp_cmx_receive(struct dsp *dsp, struct sk_buff *skb)
|
|||
dsp->rx_init = 0;
|
||||
if (dsp->features.unordered) {
|
||||
dsp->rx_R = (hh->id & CMX_BUFF_MASK);
|
||||
if (dsp->cmx_delay)
|
||||
dsp->rx_W = (dsp->rx_R + dsp->cmx_delay)
|
||||
& CMX_BUFF_MASK;
|
||||
else
|
||||
dsp->rx_W = (dsp->rx_R + (dsp_poll >> 1))
|
||||
& CMX_BUFF_MASK;
|
||||
} else {
|
||||
dsp->rx_R = 0;
|
||||
if (dsp->cmx_delay)
|
||||
dsp->rx_W = dsp->cmx_delay;
|
||||
else
|
||||
dsp->rx_W = dsp_poll >> 1;
|
||||
}
|
||||
}
|
||||
/* if frame contains time code, write directly */
|
||||
|
@ -1185,19 +1211,25 @@ dsp_cmx_receive(struct dsp *dsp, struct sk_buff *skb)
|
|||
* we set our new read pointer, and write silence to buffer
|
||||
*/
|
||||
if (((dsp->rx_W-dsp->rx_R) & CMX_BUFF_MASK) >= CMX_BUFF_HALF) {
|
||||
if (dsp_debug & DEBUG_DSP_CMX)
|
||||
if (dsp_debug & DEBUG_DSP_CLOCK)
|
||||
printk(KERN_DEBUG
|
||||
"cmx_receive(dsp=%lx): UNDERRUN (or overrun the "
|
||||
"maximum delay), adjusting read pointer! "
|
||||
"(inst %s)\n", (u_long)dsp, dsp->name);
|
||||
/* flush buffer */
|
||||
/* flush rx buffer and set delay to dsp_poll / 2 */
|
||||
if (dsp->features.unordered) {
|
||||
dsp->rx_R = (hh->id & CMX_BUFF_MASK);
|
||||
if (dsp->cmx_delay)
|
||||
dsp->rx_W = (dsp->rx_R + dsp->cmx_delay)
|
||||
& CMX_BUFF_MASK;
|
||||
dsp->rx_W = (dsp->rx_R + (dsp_poll >> 1))
|
||||
& CMX_BUFF_MASK;
|
||||
} else {
|
||||
dsp->rx_R = 0;
|
||||
if (dsp->cmx_delay)
|
||||
dsp->rx_W = dsp->cmx_delay;
|
||||
else
|
||||
dsp->rx_W = dsp_poll >> 1;
|
||||
}
|
||||
memset(dsp->rx_buff, dsp_silence, sizeof(dsp->rx_buff));
|
||||
}
|
||||
|
@ -1205,7 +1237,7 @@ dsp_cmx_receive(struct dsp *dsp, struct sk_buff *skb)
|
|||
if (dsp->cmx_delay)
|
||||
if (((dsp->rx_W - dsp->rx_R) & CMX_BUFF_MASK) >=
|
||||
(dsp->cmx_delay << 1)) {
|
||||
if (dsp_debug & DEBUG_DSP_CMX)
|
||||
if (dsp_debug & DEBUG_DSP_CLOCK)
|
||||
printk(KERN_DEBUG
|
||||
"cmx_receive(dsp=%lx): OVERRUN (because "
|
||||
"twice the delay is reached), adjusting "
|
||||
|
@ -1243,6 +1275,9 @@ dsp_cmx_receive(struct dsp *dsp, struct sk_buff *skb)
|
|||
|
||||
/* increase write-pointer */
|
||||
dsp->rx_W = ((dsp->rx_W+len) & CMX_BUFF_MASK);
|
||||
#ifdef CMX_DELAY_DEBUG
|
||||
showdelay(dsp, len, (dsp->rx_W-dsp->rx_R) & CMX_BUFF_MASK);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
@ -1360,8 +1395,12 @@ dsp_cmx_send_member(struct dsp *dsp, int len, s32 *c, int members)
|
|||
t = (t+1) & CMX_BUFF_MASK;
|
||||
r = (r+1) & CMX_BUFF_MASK;
|
||||
}
|
||||
if (r != rr)
|
||||
if (r != rr) {
|
||||
if (dsp_debug & DEBUG_DSP_CLOCK)
|
||||
printk(KERN_DEBUG "%s: RX empty\n",
|
||||
__func__);
|
||||
memset(d, dsp_silence, (rr-r)&CMX_BUFF_MASK);
|
||||
}
|
||||
/* -> if echo is enabled */
|
||||
} else {
|
||||
/*
|
||||
|
@ -1540,13 +1579,11 @@ send_packet:
|
|||
schedule_work(&dsp->workq);
|
||||
}
|
||||
|
||||
static u32 samplecount;
|
||||
static u32 jittercount; /* counter for jitter check */;
|
||||
struct timer_list dsp_spl_tl;
|
||||
u32 dsp_spl_jiffies; /* calculate the next time to fire */
|
||||
#ifdef UNUSED
|
||||
static u32 dsp_start_jiffies; /* jiffies at the time, the calculation begins */
|
||||
#endif /* UNUSED */
|
||||
static struct timeval dsp_start_tv; /* time at start of calculation */
|
||||
static u16 dsp_count; /* last sample count */
|
||||
static int dsp_count_valid ; /* if we have last sample count */
|
||||
|
||||
void
|
||||
dsp_cmx_send(void *arg)
|
||||
|
@ -1560,38 +1597,32 @@ dsp_cmx_send(void *arg)
|
|||
int r, rr;
|
||||
int jittercheck = 0, delay, i;
|
||||
u_long flags;
|
||||
struct timeval tv;
|
||||
u32 elapsed;
|
||||
s16 length;
|
||||
u16 length, count;
|
||||
|
||||
/* lock */
|
||||
spin_lock_irqsave(&dsp_lock, flags);
|
||||
|
||||
if (!dsp_start_tv.tv_sec) {
|
||||
do_gettimeofday(&dsp_start_tv);
|
||||
if (!dsp_count_valid) {
|
||||
dsp_count = mISDN_clock_get();
|
||||
length = dsp_poll;
|
||||
dsp_count_valid = 1;
|
||||
} else {
|
||||
do_gettimeofday(&tv);
|
||||
elapsed = ((tv.tv_sec - dsp_start_tv.tv_sec) * 8000)
|
||||
+ ((s32)(tv.tv_usec / 125) - (dsp_start_tv.tv_usec / 125));
|
||||
dsp_start_tv.tv_sec = tv.tv_sec;
|
||||
dsp_start_tv.tv_usec = tv.tv_usec;
|
||||
length = elapsed;
|
||||
count = mISDN_clock_get();
|
||||
length = count - dsp_count;
|
||||
dsp_count = count;
|
||||
}
|
||||
if (length > MAX_POLL + 100)
|
||||
length = MAX_POLL + 100;
|
||||
/* printk(KERN_DEBUG "len=%d dsp_count=0x%x.%04x dsp_poll_diff=0x%x.%04x\n",
|
||||
length, dsp_count >> 16, dsp_count & 0xffff, dsp_poll_diff >> 16,
|
||||
dsp_poll_diff & 0xffff);
|
||||
*/
|
||||
/* printk(KERN_DEBUG "len=%d dsp_count=0x%x\n", length, dsp_count); */
|
||||
|
||||
/*
|
||||
* check if jitter needs to be checked
|
||||
* (this is about every second = 8192 samples)
|
||||
* check if jitter needs to be checked (this is every second)
|
||||
*/
|
||||
samplecount += length;
|
||||
if ((samplecount & 8191) < length)
|
||||
jittercount += length;
|
||||
if (jittercount >= 8000) {
|
||||
jittercount -= 8000;
|
||||
jittercheck = 1;
|
||||
}
|
||||
|
||||
/* loop all members that do not require conference mixing */
|
||||
list_for_each_entry(dsp, &dsp_ilist, list) {
|
||||
|
@ -1704,17 +1735,19 @@ dsp_cmx_send(void *arg)
|
|||
}
|
||||
/*
|
||||
* remove rx_delay only if we have delay AND we
|
||||
* have not preset cmx_delay
|
||||
* have not preset cmx_delay AND
|
||||
* the delay is greater dsp_poll
|
||||
*/
|
||||
if (delay && !dsp->cmx_delay) {
|
||||
if (dsp_debug & DEBUG_DSP_CMX)
|
||||
if (delay > dsp_poll && !dsp->cmx_delay) {
|
||||
if (dsp_debug & DEBUG_DSP_CLOCK)
|
||||
printk(KERN_DEBUG
|
||||
"%s lowest rx_delay of %d bytes for"
|
||||
" dsp %s are now removed.\n",
|
||||
__func__, delay,
|
||||
dsp->name);
|
||||
r = dsp->rx_R;
|
||||
rr = (r + delay) & CMX_BUFF_MASK;
|
||||
rr = (r + delay - (dsp_poll >> 1))
|
||||
& CMX_BUFF_MASK;
|
||||
/* delete rx-data */
|
||||
while (r != rr) {
|
||||
p[r] = dsp_silence;
|
||||
|
@ -1736,15 +1769,16 @@ dsp_cmx_send(void *arg)
|
|||
* remove delay only if we have delay AND we
|
||||
* have enabled tx_dejitter
|
||||
*/
|
||||
if (delay && dsp->tx_dejitter) {
|
||||
if (dsp_debug & DEBUG_DSP_CMX)
|
||||
if (delay > dsp_poll && dsp->tx_dejitter) {
|
||||
if (dsp_debug & DEBUG_DSP_CLOCK)
|
||||
printk(KERN_DEBUG
|
||||
"%s lowest tx_delay of %d bytes for"
|
||||
" dsp %s are now removed.\n",
|
||||
__func__, delay,
|
||||
dsp->name);
|
||||
r = dsp->tx_R;
|
||||
rr = (r + delay) & CMX_BUFF_MASK;
|
||||
rr = (r + delay - (dsp_poll >> 1))
|
||||
& CMX_BUFF_MASK;
|
||||
/* delete tx-data */
|
||||
while (r != rr) {
|
||||
q[r] = dsp_silence;
|
||||
|
@ -1797,14 +1831,16 @@ dsp_cmx_transmit(struct dsp *dsp, struct sk_buff *skb)
|
|||
ww = dsp->tx_R;
|
||||
p = dsp->tx_buff;
|
||||
d = skb->data;
|
||||
space = ww-w;
|
||||
if (space <= 0)
|
||||
space += CMX_BUFF_SIZE;
|
||||
space = (ww - w - 1) & CMX_BUFF_MASK;
|
||||
/* write-pointer should not overrun nor reach read pointer */
|
||||
if (space-1 < skb->len)
|
||||
if (space < skb->len) {
|
||||
/* write to the space we have left */
|
||||
ww = (ww - 1) & CMX_BUFF_MASK;
|
||||
else
|
||||
ww = (ww - 1) & CMX_BUFF_MASK; /* end one byte prior tx_R */
|
||||
if (dsp_debug & DEBUG_DSP_CLOCK)
|
||||
printk(KERN_DEBUG "%s: TX overflow space=%d skb->len="
|
||||
"%d, w=0x%04x, ww=0x%04x\n", __func__, space,
|
||||
skb->len, w, ww);
|
||||
} else
|
||||
/* write until all byte are copied */
|
||||
ww = (w + skb->len) & CMX_BUFF_MASK;
|
||||
dsp->tx_W = ww;
|
||||
|
|
|
@ -191,6 +191,8 @@ dsp_rx_off_member(struct dsp *dsp)
|
|||
struct mISDN_ctrl_req cq;
|
||||
int rx_off = 1;
|
||||
|
||||
memset(&cq, 0, sizeof(cq));
|
||||
|
||||
if (!dsp->features_rx_off)
|
||||
return;
|
||||
|
||||
|
@ -249,6 +251,32 @@ dsp_rx_off(struct dsp *dsp)
|
|||
}
|
||||
}
|
||||
|
||||
/* enable "fill empty" feature */
|
||||
static void
|
||||
dsp_fill_empty(struct dsp *dsp)
|
||||
{
|
||||
struct mISDN_ctrl_req cq;
|
||||
|
||||
memset(&cq, 0, sizeof(cq));
|
||||
|
||||
if (!dsp->ch.peer) {
|
||||
if (dsp_debug & DEBUG_DSP_CORE)
|
||||
printk(KERN_DEBUG "%s: no peer, no fill_empty\n",
|
||||
__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__);
|
||||
return;
|
||||
}
|
||||
if (dsp_debug & DEBUG_DSP_CORE)
|
||||
printk(KERN_DEBUG "%s: %s set fill_empty = 1\n",
|
||||
__func__, dsp->name);
|
||||
}
|
||||
|
||||
static int
|
||||
dsp_control_req(struct dsp *dsp, struct mISDNhead *hh, struct sk_buff *skb)
|
||||
{
|
||||
|
@ -273,6 +301,7 @@ dsp_control_req(struct dsp *dsp, struct mISDNhead *hh, struct sk_buff *skb)
|
|||
if (dsp_debug & DEBUG_DSP_CORE)
|
||||
printk(KERN_DEBUG "%s: start dtmf\n", __func__);
|
||||
if (len == sizeof(int)) {
|
||||
if (dsp_debug & DEBUG_DSP_CORE)
|
||||
printk(KERN_NOTICE "changing DTMF Threshold "
|
||||
"to %d\n", *((int *)data));
|
||||
dsp->dtmf.treshold = (*(int *)data) * 10000;
|
||||
|
@ -593,8 +622,6 @@ get_features(struct mISDNchannel *ch)
|
|||
struct dsp *dsp = container_of(ch, struct dsp, ch);
|
||||
struct mISDN_ctrl_req cq;
|
||||
|
||||
if (dsp_options & DSP_OPT_NOHARDWARE)
|
||||
return;
|
||||
if (!ch->peer) {
|
||||
if (dsp_debug & DEBUG_DSP_CORE)
|
||||
printk(KERN_DEBUG "%s: no peer, no features\n",
|
||||
|
@ -610,6 +637,10 @@ get_features(struct mISDNchannel *ch)
|
|||
}
|
||||
if (cq.op & MISDN_CTRL_RX_OFF)
|
||||
dsp->features_rx_off = 1;
|
||||
if (cq.op & MISDN_CTRL_FILL_EMPTY)
|
||||
dsp->features_fill_empty = 1;
|
||||
if (dsp_options & DSP_OPT_NOHARDWARE)
|
||||
return;
|
||||
if ((cq.op & MISDN_CTRL_HW_FEATURES_OP)) {
|
||||
cq.op = MISDN_CTRL_HW_FEATURES;
|
||||
*((u_long *)&cq.p1) = (u_long)&dsp->features;
|
||||
|
@ -837,11 +868,14 @@ dsp_function(struct mISDNchannel *ch, struct sk_buff *skb)
|
|||
}
|
||||
if (dsp->hdlc) {
|
||||
/* hdlc */
|
||||
if (!dsp->b_active) {
|
||||
ret = -EIO;
|
||||
break;
|
||||
}
|
||||
hh->prim = PH_DATA_REQ;
|
||||
spin_lock_irqsave(&dsp_lock, flags);
|
||||
if (dsp->b_active) {
|
||||
skb_queue_tail(&dsp->sendq, skb);
|
||||
schedule_work(&dsp->workq);
|
||||
}
|
||||
spin_unlock_irqrestore(&dsp_lock, flags);
|
||||
return 0;
|
||||
}
|
||||
|
@ -865,6 +899,9 @@ dsp_function(struct mISDNchannel *ch, struct sk_buff *skb)
|
|||
if (dsp->dtmf.hardware || dsp->dtmf.software)
|
||||
dsp_dtmf_goertzel_init(dsp);
|
||||
get_features(ch);
|
||||
/* enable fill_empty feature */
|
||||
if (dsp->features_fill_empty)
|
||||
dsp_fill_empty(dsp);
|
||||
/* send ph_activate */
|
||||
hh->prim = PH_ACTIVATE_REQ;
|
||||
if (ch->peer)
|
||||
|
@ -1105,7 +1142,7 @@ static int dsp_init(void)
|
|||
} else {
|
||||
poll = 8;
|
||||
while (poll <= MAX_POLL) {
|
||||
tics = poll * HZ / 8000;
|
||||
tics = (poll * HZ) / 8000;
|
||||
if (tics * 8000 == poll * HZ) {
|
||||
dsp_tics = tics;
|
||||
dsp_poll = poll;
|
||||
|
|
|
@ -75,6 +75,15 @@ static struct device_attribute element_attributes[] = {
|
|||
__ATTR(args, 0444, attr_show_args, NULL),
|
||||
};
|
||||
|
||||
static void
|
||||
mISDN_dsp_dev_release(struct device *dev)
|
||||
{
|
||||
struct dsp_element_entry *entry =
|
||||
container_of(dev, struct dsp_element_entry, dev);
|
||||
list_del(&entry->list);
|
||||
kfree(entry);
|
||||
}
|
||||
|
||||
int mISDN_dsp_element_register(struct mISDN_dsp_element *elem)
|
||||
{
|
||||
struct dsp_element_entry *entry;
|
||||
|
@ -83,13 +92,14 @@ int mISDN_dsp_element_register(struct mISDN_dsp_element *elem)
|
|||
if (!elem)
|
||||
return -EINVAL;
|
||||
|
||||
entry = kzalloc(sizeof(struct dsp_element_entry), GFP_KERNEL);
|
||||
entry = kzalloc(sizeof(struct dsp_element_entry), GFP_ATOMIC);
|
||||
if (!entry)
|
||||
return -ENOMEM;
|
||||
|
||||
entry->elem = elem;
|
||||
|
||||
entry->dev.class = elements_class;
|
||||
entry->dev.release = mISDN_dsp_dev_release;
|
||||
dev_set_drvdata(&entry->dev, elem);
|
||||
dev_set_name(&entry->dev, elem->name);
|
||||
ret = device_register(&entry->dev);
|
||||
|
@ -98,6 +108,7 @@ int mISDN_dsp_element_register(struct mISDN_dsp_element *elem)
|
|||
__func__, elem->name);
|
||||
goto err1;
|
||||
}
|
||||
list_add_tail(&entry->list, &dsp_elements);
|
||||
|
||||
for (i = 0; i < (sizeof(element_attributes)
|
||||
/ sizeof(struct device_attribute)); ++i)
|
||||
|
@ -109,14 +120,15 @@ int mISDN_dsp_element_register(struct mISDN_dsp_element *elem)
|
|||
goto err2;
|
||||
}
|
||||
|
||||
list_add_tail(&entry->list, &dsp_elements);
|
||||
|
||||
#ifdef PIPELINE_DEBUG
|
||||
printk(KERN_DEBUG "%s: %s registered\n", __func__, elem->name);
|
||||
#endif
|
||||
|
||||
return 0;
|
||||
|
||||
err2:
|
||||
device_unregister(&entry->dev);
|
||||
return ret;
|
||||
err1:
|
||||
kfree(entry);
|
||||
return ret;
|
||||
|
@ -132,11 +144,11 @@ void mISDN_dsp_element_unregister(struct mISDN_dsp_element *elem)
|
|||
|
||||
list_for_each_entry_safe(entry, n, &dsp_elements, list)
|
||||
if (entry->elem == elem) {
|
||||
list_del(&entry->list);
|
||||
device_unregister(&entry->dev);
|
||||
kfree(entry);
|
||||
#ifdef PIPELINE_DEBUG
|
||||
printk(KERN_DEBUG "%s: %s unregistered\n",
|
||||
__func__, elem->name);
|
||||
#endif
|
||||
return;
|
||||
}
|
||||
printk(KERN_ERR "%s: element %s not in list.\n", __func__, elem->name);
|
||||
|
@ -173,7 +185,9 @@ void dsp_pipeline_module_exit(void)
|
|||
kfree(entry);
|
||||
}
|
||||
|
||||
#ifdef PIPELINE_DEBUG
|
||||
printk(KERN_DEBUG "%s: dsp pipeline module exited\n", __func__);
|
||||
#endif
|
||||
}
|
||||
|
||||
int dsp_pipeline_init(struct dsp_pipeline *pipeline)
|
||||
|
@ -239,7 +253,7 @@ int dsp_pipeline_build(struct dsp_pipeline *pipeline, const char *cfg)
|
|||
if (!len)
|
||||
return 0;
|
||||
|
||||
dup = kmalloc(len + 1, GFP_KERNEL);
|
||||
dup = kmalloc(len + 1, GFP_ATOMIC);
|
||||
if (!dup)
|
||||
return 0;
|
||||
strcpy(dup, cfg);
|
||||
|
@ -256,9 +270,9 @@ int dsp_pipeline_build(struct dsp_pipeline *pipeline, const char *cfg)
|
|||
elem = entry->elem;
|
||||
|
||||
pipeline_entry = kmalloc(sizeof(struct
|
||||
dsp_pipeline_entry), GFP_KERNEL);
|
||||
dsp_pipeline_entry), GFP_ATOMIC);
|
||||
if (!pipeline_entry) {
|
||||
printk(KERN_DEBUG "%s: failed to add "
|
||||
printk(KERN_ERR "%s: failed to add "
|
||||
"entry to pipeline: %s (out of "
|
||||
"memory)\n", __func__, elem->name);
|
||||
incomplete = 1;
|
||||
|
@ -286,7 +300,7 @@ int dsp_pipeline_build(struct dsp_pipeline *pipeline, const char *cfg)
|
|||
args : "");
|
||||
#endif
|
||||
} else {
|
||||
printk(KERN_DEBUG "%s: failed "
|
||||
printk(KERN_ERR "%s: failed "
|
||||
"to add entry to pipeline: "
|
||||
"%s (new() returned NULL)\n",
|
||||
__func__, elem->name);
|
||||
|
@ -301,7 +315,7 @@ int dsp_pipeline_build(struct dsp_pipeline *pipeline, const char *cfg)
|
|||
if (found)
|
||||
found = 0;
|
||||
else {
|
||||
printk(KERN_DEBUG "%s: element not found, skipping: "
|
||||
printk(KERN_ERR "%s: element not found, skipping: "
|
||||
"%s\n", __func__, name);
|
||||
incomplete = 1;
|
||||
}
|
||||
|
|
|
@ -50,9 +50,6 @@ bchannel_bh(struct work_struct *ws)
|
|||
|
||||
if (test_and_clear_bit(FLG_RECVQUEUE, &bch->Flags)) {
|
||||
while ((skb = skb_dequeue(&bch->rqueue))) {
|
||||
if (bch->rcount >= 64)
|
||||
printk(KERN_WARNING "B-channel %p receive "
|
||||
"queue if full, but empties...\n", bch);
|
||||
bch->rcount--;
|
||||
if (likely(bch->ch.peer)) {
|
||||
err = bch->ch.recv(bch->ch.peer, skb);
|
||||
|
@ -168,6 +165,25 @@ recv_Dchannel(struct dchannel *dch)
|
|||
}
|
||||
EXPORT_SYMBOL(recv_Dchannel);
|
||||
|
||||
void
|
||||
recv_Echannel(struct dchannel *ech, struct dchannel *dch)
|
||||
{
|
||||
struct mISDNhead *hh;
|
||||
|
||||
if (ech->rx_skb->len < 2) { /* at least 2 for sapi / tei */
|
||||
dev_kfree_skb(ech->rx_skb);
|
||||
ech->rx_skb = NULL;
|
||||
return;
|
||||
}
|
||||
hh = mISDN_HEAD_P(ech->rx_skb);
|
||||
hh->prim = PH_DATA_E_IND;
|
||||
hh->id = get_sapi_tei(ech->rx_skb->data);
|
||||
skb_queue_tail(&dch->rqueue, ech->rx_skb);
|
||||
ech->rx_skb = NULL;
|
||||
schedule_event(dch, FLG_RECVQUEUE);
|
||||
}
|
||||
EXPORT_SYMBOL(recv_Echannel);
|
||||
|
||||
void
|
||||
recv_Bchannel(struct bchannel *bch)
|
||||
{
|
||||
|
@ -177,8 +193,10 @@ recv_Bchannel(struct bchannel *bch)
|
|||
hh->prim = PH_DATA_IND;
|
||||
hh->id = MISDN_ID_ANY;
|
||||
if (bch->rcount >= 64) {
|
||||
dev_kfree_skb(bch->rx_skb);
|
||||
bch->rx_skb = NULL;
|
||||
printk(KERN_WARNING "B-channel %p receive queue overflow, "
|
||||
"fushing!\n", bch);
|
||||
skb_queue_purge(&bch->rqueue);
|
||||
bch->rcount = 0;
|
||||
return;
|
||||
}
|
||||
bch->rcount++;
|
||||
|
@ -200,8 +218,10 @@ void
|
|||
recv_Bchannel_skb(struct bchannel *bch, struct sk_buff *skb)
|
||||
{
|
||||
if (bch->rcount >= 64) {
|
||||
dev_kfree_skb(skb);
|
||||
return;
|
||||
printk(KERN_WARNING "B-channel %p receive queue overflow, "
|
||||
"fushing!\n", bch);
|
||||
skb_queue_purge(&bch->rqueue);
|
||||
bch->rcount = 0;
|
||||
}
|
||||
bch->rcount++;
|
||||
skb_queue_tail(&bch->rqueue, skb);
|
||||
|
@ -245,8 +265,12 @@ confirm_Bsend(struct bchannel *bch)
|
|||
{
|
||||
struct sk_buff *skb;
|
||||
|
||||
if (bch->rcount >= 64)
|
||||
return;
|
||||
if (bch->rcount >= 64) {
|
||||
printk(KERN_WARNING "B-channel %p receive queue overflow, "
|
||||
"fushing!\n", bch);
|
||||
skb_queue_purge(&bch->rqueue);
|
||||
bch->rcount = 0;
|
||||
}
|
||||
skb = _alloc_mISDN_skb(PH_DATA_CNF, mISDN_HEAD_ID(bch->tx_skb),
|
||||
0, NULL, GFP_ATOMIC);
|
||||
if (!skb) {
|
||||
|
|
|
@ -777,6 +777,8 @@ fail:
|
|||
static void
|
||||
l1oip_socket_close(struct l1oip *hc)
|
||||
{
|
||||
struct dchannel *dch = hc->chan[hc->d_idx].dch;
|
||||
|
||||
/* kill thread */
|
||||
if (hc->socket_thread) {
|
||||
if (debug & DEBUG_L1OIP_SOCKET)
|
||||
|
@ -785,6 +787,16 @@ l1oip_socket_close(struct l1oip *hc)
|
|||
send_sig(SIGTERM, hc->socket_thread, 0);
|
||||
wait_for_completion(&hc->socket_complete);
|
||||
}
|
||||
|
||||
/* if active, we send up a PH_DEACTIVATE and deactivate */
|
||||
if (test_bit(FLG_ACTIVE, &dch->Flags)) {
|
||||
if (debug & (DEBUG_L1OIP_MSG|DEBUG_L1OIP_SOCKET))
|
||||
printk(KERN_DEBUG "%s: interface become deactivated "
|
||||
"due to timeout\n", __func__);
|
||||
test_and_clear_bit(FLG_ACTIVE, &dch->Flags);
|
||||
_queue_data(&dch->dev.D, PH_DEACTIVATE_IND, MISDN_ID_ANY, 0,
|
||||
NULL, GFP_ATOMIC);
|
||||
}
|
||||
}
|
||||
|
||||
static int
|
||||
|
@ -944,7 +956,8 @@ channel_dctrl(struct dchannel *dch, struct mISDN_ctrl_req *cq)
|
|||
|
||||
switch (cq->op) {
|
||||
case MISDN_CTRL_GETOP:
|
||||
cq->op = MISDN_CTRL_SETPEER | MISDN_CTRL_UNSETPEER;
|
||||
cq->op = MISDN_CTRL_SETPEER | MISDN_CTRL_UNSETPEER
|
||||
| MISDN_CTRL_GETPEER;
|
||||
break;
|
||||
case MISDN_CTRL_SETPEER:
|
||||
hc->remoteip = (u32)cq->p1;
|
||||
|
@ -964,6 +977,13 @@ channel_dctrl(struct dchannel *dch, struct mISDN_ctrl_req *cq)
|
|||
hc->remoteip = 0;
|
||||
l1oip_socket_open(hc);
|
||||
break;
|
||||
case MISDN_CTRL_GETPEER:
|
||||
if (debug & DEBUG_L1OIP_SOCKET)
|
||||
printk(KERN_DEBUG "%s: getting ip address.\n",
|
||||
__func__);
|
||||
cq->p1 = hc->remoteip;
|
||||
cq->p2 = hc->remoteport | (hc->localport << 16);
|
||||
break;
|
||||
default:
|
||||
printk(KERN_WARNING "%s: unknown Op %x\n",
|
||||
__func__, cq->op);
|
||||
|
@ -1413,7 +1433,8 @@ init_card(struct l1oip *hc, int pri, int bundle)
|
|||
hc->chan[i + ch].bch = bch;
|
||||
set_channelmap(bch->nr, dch->dev.channelmap);
|
||||
}
|
||||
ret = mISDN_register_device(&dch->dev, hc->name);
|
||||
/* TODO: create a parent device for this driver */
|
||||
ret = mISDN_register_device(&dch->dev, NULL, hc->name);
|
||||
if (ret)
|
||||
return ret;
|
||||
hc->registered = 1;
|
||||
|
|
|
@ -101,7 +101,7 @@ l1m_debug(struct FsmInst *fi, char *fmt, ...)
|
|||
va_list va;
|
||||
|
||||
va_start(va, fmt);
|
||||
printk(KERN_DEBUG "%s: ", l1->dch->dev.name);
|
||||
printk(KERN_DEBUG "%s: ", dev_name(&l1->dch->dev.dev));
|
||||
vprintk(fmt, va);
|
||||
printk("\n");
|
||||
va_end(va);
|
||||
|
|
|
@ -381,7 +381,7 @@ data_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
|
|||
memcpy(di.channelmap, dev->channelmap,
|
||||
sizeof(di.channelmap));
|
||||
di.nrbchan = dev->nrbchan;
|
||||
strcpy(di.name, dev->name);
|
||||
strcpy(di.name, dev_name(&dev->dev));
|
||||
if (copy_to_user((void __user *)arg, &di, sizeof(di)))
|
||||
err = -EFAULT;
|
||||
} else
|
||||
|
@ -460,6 +460,8 @@ data_sock_bind(struct socket *sock, struct sockaddr *addr, int addr_len)
|
|||
{
|
||||
struct sockaddr_mISDN *maddr = (struct sockaddr_mISDN *) addr;
|
||||
struct sock *sk = sock->sk;
|
||||
struct hlist_node *node;
|
||||
struct sock *csk;
|
||||
int err = 0;
|
||||
|
||||
if (*debug & DEBUG_SOCKET)
|
||||
|
@ -480,6 +482,26 @@ data_sock_bind(struct socket *sock, struct sockaddr *addr, int addr_len)
|
|||
err = -ENODEV;
|
||||
goto done;
|
||||
}
|
||||
|
||||
if (sk->sk_protocol < ISDN_P_B_START) {
|
||||
read_lock_bh(&data_sockets.lock);
|
||||
sk_for_each(csk, node, &data_sockets.head) {
|
||||
if (sk == csk)
|
||||
continue;
|
||||
if (_pms(csk)->dev != _pms(sk)->dev)
|
||||
continue;
|
||||
if (csk->sk_protocol >= ISDN_P_B_START)
|
||||
continue;
|
||||
if (IS_ISDN_P_TE(csk->sk_protocol)
|
||||
== IS_ISDN_P_TE(sk->sk_protocol))
|
||||
continue;
|
||||
read_unlock_bh(&data_sockets.lock);
|
||||
err = -EBUSY;
|
||||
goto done;
|
||||
}
|
||||
read_unlock_bh(&data_sockets.lock);
|
||||
}
|
||||
|
||||
_pms(sk)->ch.send = mISDN_send;
|
||||
_pms(sk)->ch.ctrl = mISDN_ctrl;
|
||||
|
||||
|
@ -639,12 +661,27 @@ base_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
|
|||
memcpy(di.channelmap, dev->channelmap,
|
||||
sizeof(di.channelmap));
|
||||
di.nrbchan = dev->nrbchan;
|
||||
strcpy(di.name, dev->name);
|
||||
strcpy(di.name, dev_name(&dev->dev));
|
||||
if (copy_to_user((void __user *)arg, &di, sizeof(di)))
|
||||
err = -EFAULT;
|
||||
} else
|
||||
err = -ENODEV;
|
||||
break;
|
||||
case IMSETDEVNAME:
|
||||
{
|
||||
struct mISDN_devrename dn;
|
||||
if (copy_from_user(&dn, (void __user *)arg,
|
||||
sizeof(dn))) {
|
||||
err = -EFAULT;
|
||||
break;
|
||||
}
|
||||
dev = get_mdevice(dn.id);
|
||||
if (dev)
|
||||
err = device_rename(&dev->dev, dn.name);
|
||||
else
|
||||
err = -ENODEV;
|
||||
}
|
||||
break;
|
||||
default:
|
||||
err = -EINVAL;
|
||||
}
|
||||
|
|
|
@ -172,7 +172,8 @@ send_msg_to_layer(struct mISDNstack *st, struct sk_buff *skb)
|
|||
else
|
||||
printk(KERN_WARNING
|
||||
"%s: dev(%s) prim(%x) id(%x) no channel\n",
|
||||
__func__, st->dev->name, hh->prim, hh->id);
|
||||
__func__, dev_name(&st->dev->dev), hh->prim,
|
||||
hh->id);
|
||||
} else if (lm == 0x8) {
|
||||
WARN_ON(lm == 0x8);
|
||||
ch = get_channel4id(st, hh->id);
|
||||
|
@ -181,11 +182,12 @@ send_msg_to_layer(struct mISDNstack *st, struct sk_buff *skb)
|
|||
else
|
||||
printk(KERN_WARNING
|
||||
"%s: dev(%s) prim(%x) id(%x) no channel\n",
|
||||
__func__, st->dev->name, hh->prim, hh->id);
|
||||
__func__, dev_name(&st->dev->dev), hh->prim,
|
||||
hh->id);
|
||||
} else {
|
||||
/* broadcast not handled yet */
|
||||
printk(KERN_WARNING "%s: dev(%s) prim %x not delivered\n",
|
||||
__func__, st->dev->name, hh->prim);
|
||||
__func__, dev_name(&st->dev->dev), hh->prim);
|
||||
}
|
||||
return -ESRCH;
|
||||
}
|
||||
|
@ -209,7 +211,8 @@ mISDNStackd(void *data)
|
|||
unlock_kernel();
|
||||
#endif
|
||||
if (*debug & DEBUG_MSG_THREAD)
|
||||
printk(KERN_DEBUG "mISDNStackd %s started\n", st->dev->name);
|
||||
printk(KERN_DEBUG "mISDNStackd %s started\n",
|
||||
dev_name(&st->dev->dev));
|
||||
|
||||
if (st->notify != NULL) {
|
||||
complete(st->notify);
|
||||
|
@ -245,7 +248,7 @@ mISDNStackd(void *data)
|
|||
printk(KERN_DEBUG
|
||||
"%s: %s prim(%x) id(%x) "
|
||||
"send call(%d)\n",
|
||||
__func__, st->dev->name,
|
||||
__func__, dev_name(&st->dev->dev),
|
||||
mISDN_HEAD_PRIM(skb),
|
||||
mISDN_HEAD_ID(skb), err);
|
||||
dev_kfree_skb(skb);
|
||||
|
@ -288,7 +291,7 @@ mISDNStackd(void *data)
|
|||
mISDN_STACK_ACTION_MASK));
|
||||
if (*debug & DEBUG_MSG_THREAD)
|
||||
printk(KERN_DEBUG "%s: %s wake status %08lx\n",
|
||||
__func__, st->dev->name, st->status);
|
||||
__func__, dev_name(&st->dev->dev), st->status);
|
||||
test_and_set_bit(mISDN_STACK_ACTIVE, &st->status);
|
||||
|
||||
test_and_clear_bit(mISDN_STACK_WAKEUP, &st->status);
|
||||
|
@ -303,15 +306,16 @@ mISDNStackd(void *data)
|
|||
#ifdef MISDN_MSG_STATS
|
||||
printk(KERN_DEBUG "mISDNStackd daemon for %s proceed %d "
|
||||
"msg %d sleep %d stopped\n",
|
||||
st->dev->name, st->msg_cnt, st->sleep_cnt, st->stopped_cnt);
|
||||
dev_name(&st->dev->dev), st->msg_cnt, st->sleep_cnt,
|
||||
st->stopped_cnt);
|
||||
printk(KERN_DEBUG
|
||||
"mISDNStackd daemon for %s utime(%ld) stime(%ld)\n",
|
||||
st->dev->name, st->thread->utime, st->thread->stime);
|
||||
dev_name(&st->dev->dev), st->thread->utime, st->thread->stime);
|
||||
printk(KERN_DEBUG
|
||||
"mISDNStackd daemon for %s nvcsw(%ld) nivcsw(%ld)\n",
|
||||
st->dev->name, st->thread->nvcsw, st->thread->nivcsw);
|
||||
dev_name(&st->dev->dev), st->thread->nvcsw, st->thread->nivcsw);
|
||||
printk(KERN_DEBUG "mISDNStackd daemon for %s killed now\n",
|
||||
st->dev->name);
|
||||
dev_name(&st->dev->dev));
|
||||
#endif
|
||||
test_and_set_bit(mISDN_STACK_KILLED, &st->status);
|
||||
test_and_clear_bit(mISDN_STACK_RUNNING, &st->status);
|
||||
|
@ -401,15 +405,16 @@ create_stack(struct mISDNdevice *dev)
|
|||
newst->own.send = mISDN_queue_message;
|
||||
newst->own.recv = mISDN_queue_message;
|
||||
if (*debug & DEBUG_CORE_FUNC)
|
||||
printk(KERN_DEBUG "%s: st(%s)\n", __func__, newst->dev->name);
|
||||
printk(KERN_DEBUG "%s: st(%s)\n", __func__,
|
||||
dev_name(&newst->dev->dev));
|
||||
newst->notify = &done;
|
||||
newst->thread = kthread_run(mISDNStackd, (void *)newst, "mISDN_%s",
|
||||
newst->dev->name);
|
||||
dev_name(&newst->dev->dev));
|
||||
if (IS_ERR(newst->thread)) {
|
||||
err = PTR_ERR(newst->thread);
|
||||
printk(KERN_ERR
|
||||
"mISDN:cannot create kernel thread for %s (%d)\n",
|
||||
newst->dev->name, err);
|
||||
dev_name(&newst->dev->dev), err);
|
||||
delete_teimanager(dev->teimgr);
|
||||
kfree(newst);
|
||||
} else
|
||||
|
@ -428,29 +433,21 @@ connect_layer1(struct mISDNdevice *dev, struct mISDNchannel *ch,
|
|||
|
||||
if (*debug & DEBUG_CORE_FUNC)
|
||||
printk(KERN_DEBUG "%s: %s proto(%x) adr(%d %d %d %d)\n",
|
||||
__func__, dev->name, protocol, adr->dev, adr->channel,
|
||||
adr->sapi, adr->tei);
|
||||
__func__, dev_name(&dev->dev), protocol, adr->dev,
|
||||
adr->channel, adr->sapi, adr->tei);
|
||||
switch (protocol) {
|
||||
case ISDN_P_NT_S0:
|
||||
case ISDN_P_NT_E1:
|
||||
case ISDN_P_TE_S0:
|
||||
case ISDN_P_TE_E1:
|
||||
#ifdef PROTOCOL_CHECK
|
||||
/* this should be enhanced */
|
||||
if (!list_empty(&dev->D.st->layer2)
|
||||
&& dev->D.protocol != protocol)
|
||||
return -EBUSY;
|
||||
if (!hlist_empty(&dev->D.st->l1sock.head)
|
||||
&& dev->D.protocol != protocol)
|
||||
return -EBUSY;
|
||||
#endif
|
||||
ch->recv = mISDN_queue_message;
|
||||
ch->peer = &dev->D.st->own;
|
||||
ch->st = dev->D.st;
|
||||
rq.protocol = protocol;
|
||||
rq.adr.channel = 0;
|
||||
rq.adr.channel = adr->channel;
|
||||
err = dev->D.ctrl(&dev->D, OPEN_CHANNEL, &rq);
|
||||
printk(KERN_DEBUG "%s: ret 1 %d\n", __func__, err);
|
||||
printk(KERN_DEBUG "%s: ret %d (dev %d)\n", __func__, err,
|
||||
dev->id);
|
||||
if (err)
|
||||
return err;
|
||||
write_lock_bh(&dev->D.st->l1sock.lock);
|
||||
|
@ -473,7 +470,7 @@ connect_Bstack(struct mISDNdevice *dev, struct mISDNchannel *ch,
|
|||
|
||||
if (*debug & DEBUG_CORE_FUNC)
|
||||
printk(KERN_DEBUG "%s: %s proto(%x) adr(%d %d %d %d)\n",
|
||||
__func__, dev->name, protocol,
|
||||
__func__, dev_name(&dev->dev), protocol,
|
||||
adr->dev, adr->channel, adr->sapi,
|
||||
adr->tei);
|
||||
ch->st = dev->D.st;
|
||||
|
@ -529,7 +526,7 @@ create_l2entity(struct mISDNdevice *dev, struct mISDNchannel *ch,
|
|||
|
||||
if (*debug & DEBUG_CORE_FUNC)
|
||||
printk(KERN_DEBUG "%s: %s proto(%x) adr(%d %d %d %d)\n",
|
||||
__func__, dev->name, protocol,
|
||||
__func__, dev_name(&dev->dev), protocol,
|
||||
adr->dev, adr->channel, adr->sapi,
|
||||
adr->tei);
|
||||
rq.protocol = ISDN_P_TE_S0;
|
||||
|
@ -541,15 +538,6 @@ create_l2entity(struct mISDNdevice *dev, struct mISDNchannel *ch,
|
|||
if (dev->Dprotocols & (1 << ISDN_P_NT_E1))
|
||||
rq.protocol = ISDN_P_NT_E1;
|
||||
case ISDN_P_LAPD_TE:
|
||||
#ifdef PROTOCOL_CHECK
|
||||
/* this should be enhanced */
|
||||
if (!list_empty(&dev->D.st->layer2)
|
||||
&& dev->D.protocol != protocol)
|
||||
return -EBUSY;
|
||||
if (!hlist_empty(&dev->D.st->l1sock.head)
|
||||
&& dev->D.protocol != protocol)
|
||||
return -EBUSY;
|
||||
#endif
|
||||
ch->recv = mISDN_queue_message;
|
||||
ch->peer = &dev->D.st->own;
|
||||
ch->st = dev->D.st;
|
||||
|
@ -590,7 +578,7 @@ delete_channel(struct mISDNchannel *ch)
|
|||
}
|
||||
if (*debug & DEBUG_CORE_FUNC)
|
||||
printk(KERN_DEBUG "%s: st(%s) protocol(%x)\n", __func__,
|
||||
ch->st->dev->name, ch->protocol);
|
||||
dev_name(&ch->st->dev->dev), ch->protocol);
|
||||
if (ch->protocol >= ISDN_P_B_START) {
|
||||
if (ch->peer) {
|
||||
ch->peer->ctrl(ch->peer, CLOSE_CHANNEL, NULL);
|
||||
|
@ -643,7 +631,7 @@ delete_stack(struct mISDNdevice *dev)
|
|||
|
||||
if (*debug & DEBUG_CORE_FUNC)
|
||||
printk(KERN_DEBUG "%s: st(%s)\n", __func__,
|
||||
st->dev->name);
|
||||
dev_name(&st->dev->dev));
|
||||
if (dev->teimgr)
|
||||
delete_teimanager(dev->teimgr);
|
||||
if (st->thread) {
|
||||
|
|
|
@ -968,9 +968,9 @@ create_teimgr(struct manager *mgr, struct channel_req *crq)
|
|||
|
||||
if (*debug & DEBUG_L2_TEI)
|
||||
printk(KERN_DEBUG "%s: %s proto(%x) adr(%d %d %d %d)\n",
|
||||
__func__, mgr->ch.st->dev->name, crq->protocol,
|
||||
crq->adr.dev, crq->adr.channel, crq->adr.sapi,
|
||||
crq->adr.tei);
|
||||
__func__, dev_name(&mgr->ch.st->dev->dev),
|
||||
crq->protocol, crq->adr.dev, crq->adr.channel,
|
||||
crq->adr.sapi, crq->adr.tei);
|
||||
if (crq->adr.sapi != 0) /* not supported yet */
|
||||
return -EINVAL;
|
||||
if (crq->adr.tei > GROUP_TEI)
|
||||
|
|
|
@ -57,20 +57,21 @@
|
|||
#define FLG_L2DATA 14 /* channel use L2 DATA primitivs */
|
||||
#define FLG_ORIGIN 15 /* channel is on origin site */
|
||||
/* channel specific stuff */
|
||||
#define FLG_FILLEMPTY 16 /* fill fifo on first frame (empty) */
|
||||
/* arcofi specific */
|
||||
#define FLG_ARCOFI_TIMER 16
|
||||
#define FLG_ARCOFI_ERROR 17
|
||||
#define FLG_ARCOFI_TIMER 17
|
||||
#define FLG_ARCOFI_ERROR 18
|
||||
/* isar specific */
|
||||
#define FLG_INITIALIZED 16
|
||||
#define FLG_DLEETX 17
|
||||
#define FLG_LASTDLE 18
|
||||
#define FLG_FIRST 19
|
||||
#define FLG_LASTDATA 20
|
||||
#define FLG_NMD_DATA 21
|
||||
#define FLG_FTI_RUN 22
|
||||
#define FLG_LL_OK 23
|
||||
#define FLG_LL_CONN 24
|
||||
#define FLG_DTMFSEND 25
|
||||
#define FLG_INITIALIZED 17
|
||||
#define FLG_DLEETX 18
|
||||
#define FLG_LASTDLE 19
|
||||
#define FLG_FIRST 20
|
||||
#define FLG_LASTDATA 21
|
||||
#define FLG_NMD_DATA 22
|
||||
#define FLG_FTI_RUN 23
|
||||
#define FLG_LL_OK 24
|
||||
#define FLG_LL_CONN 25
|
||||
#define FLG_DTMFSEND 26
|
||||
|
||||
/* workq events */
|
||||
#define FLG_RECVQUEUE 30
|
||||
|
@ -183,6 +184,7 @@ extern void queue_ch_frame(struct mISDNchannel *, u_int,
|
|||
extern int dchannel_senddata(struct dchannel *, struct sk_buff *);
|
||||
extern int bchannel_senddata(struct bchannel *, struct sk_buff *);
|
||||
extern void recv_Dchannel(struct dchannel *);
|
||||
extern void recv_Echannel(struct dchannel *, struct dchannel *);
|
||||
extern void recv_Bchannel(struct bchannel *);
|
||||
extern void recv_Dchannel_skb(struct dchannel *, struct sk_buff *);
|
||||
extern void recv_Bchannel_skb(struct bchannel *, struct sk_buff *);
|
||||
|
|
|
@ -36,8 +36,8 @@
|
|||
* - should be incremented on every checkin
|
||||
*/
|
||||
#define MISDN_MAJOR_VERSION 1
|
||||
#define MISDN_MINOR_VERSION 0
|
||||
#define MISDN_RELEASE 19
|
||||
#define MISDN_MINOR_VERSION 1
|
||||
#define MISDN_RELEASE 20
|
||||
|
||||
/* primitives for information exchange
|
||||
* generell format
|
||||
|
@ -80,6 +80,7 @@
|
|||
#define PH_DEACTIVATE_IND 0x0202
|
||||
#define PH_DEACTIVATE_CNF 0x4202
|
||||
#define PH_DATA_IND 0x2002
|
||||
#define PH_DATA_E_IND 0x3002
|
||||
#define MPH_ACTIVATE_IND 0x0502
|
||||
#define MPH_DEACTIVATE_IND 0x0602
|
||||
#define MPH_INFORMATION_IND 0x0702
|
||||
|
@ -199,6 +200,18 @@
|
|||
#define ISDN_P_NT_S0 0x02
|
||||
#define ISDN_P_TE_E1 0x03
|
||||
#define ISDN_P_NT_E1 0x04
|
||||
#define ISDN_P_TE_UP0 0x05
|
||||
#define ISDN_P_NT_UP0 0x06
|
||||
|
||||
#define IS_ISDN_P_TE(p) ((p == ISDN_P_TE_S0) || (p == ISDN_P_TE_E1) || \
|
||||
(p == ISDN_P_TE_UP0) || (p == ISDN_P_LAPD_TE))
|
||||
#define IS_ISDN_P_NT(p) ((p == ISDN_P_NT_S0) || (p == ISDN_P_NT_E1) || \
|
||||
(p == ISDN_P_NT_UP0) || (p == ISDN_P_LAPD_NT))
|
||||
#define IS_ISDN_P_S0(p) ((p == ISDN_P_TE_S0) || (p == ISDN_P_NT_S0))
|
||||
#define IS_ISDN_P_E1(p) ((p == ISDN_P_TE_E1) || (p == ISDN_P_NT_E1))
|
||||
#define IS_ISDN_P_UP0(p) ((p == ISDN_P_TE_UP0) || (p == ISDN_P_NT_UP0))
|
||||
|
||||
|
||||
#define ISDN_P_LAPD_TE 0x10
|
||||
#define ISDN_P_LAPD_NT 0x11
|
||||
|
||||
|
@ -255,16 +268,6 @@ struct sockaddr_mISDN {
|
|||
unsigned char tei;
|
||||
};
|
||||
|
||||
/* timer device ioctl */
|
||||
#define IMADDTIMER _IOR('I', 64, int)
|
||||
#define IMDELTIMER _IOR('I', 65, int)
|
||||
/* socket ioctls */
|
||||
#define IMGETVERSION _IOR('I', 66, int)
|
||||
#define IMGETCOUNT _IOR('I', 67, int)
|
||||
#define IMGETDEVINFO _IOR('I', 68, int)
|
||||
#define IMCTRLREQ _IOR('I', 69, int)
|
||||
#define IMCLEAR_L2 _IOR('I', 70, int)
|
||||
|
||||
struct mISDNversion {
|
||||
unsigned char major;
|
||||
unsigned char minor;
|
||||
|
@ -281,6 +284,40 @@ struct mISDN_devinfo {
|
|||
char name[MISDN_MAX_IDLEN];
|
||||
};
|
||||
|
||||
struct mISDN_devrename {
|
||||
u_int id;
|
||||
char name[MISDN_MAX_IDLEN]; /* new name */
|
||||
};
|
||||
|
||||
/* MPH_INFORMATION_REQ payload */
|
||||
struct ph_info_ch {
|
||||
__u32 protocol;
|
||||
__u64 Flags;
|
||||
};
|
||||
|
||||
struct ph_info_dch {
|
||||
struct ph_info_ch ch;
|
||||
__u16 state;
|
||||
__u16 num_bch;
|
||||
};
|
||||
|
||||
struct ph_info {
|
||||
struct ph_info_dch dch;
|
||||
struct ph_info_ch bch[];
|
||||
};
|
||||
|
||||
/* timer device ioctl */
|
||||
#define IMADDTIMER _IOR('I', 64, int)
|
||||
#define IMDELTIMER _IOR('I', 65, int)
|
||||
|
||||
/* socket ioctls */
|
||||
#define IMGETVERSION _IOR('I', 66, int)
|
||||
#define IMGETCOUNT _IOR('I', 67, int)
|
||||
#define IMGETDEVINFO _IOR('I', 68, int)
|
||||
#define IMCTRLREQ _IOR('I', 69, int)
|
||||
#define IMCLEAR_L2 _IOR('I', 70, int)
|
||||
#define IMSETDEVNAME _IOR('I', 71, struct mISDN_devrename)
|
||||
|
||||
static inline int
|
||||
test_channelmap(u_int nr, u_char *map)
|
||||
{
|
||||
|
@ -312,6 +349,8 @@ clear_channelmap(u_int nr, u_char *map)
|
|||
#define MISDN_CTRL_SETPEER 0x0040
|
||||
#define MISDN_CTRL_UNSETPEER 0x0080
|
||||
#define MISDN_CTRL_RX_OFF 0x0100
|
||||
#define MISDN_CTRL_FILL_EMPTY 0x0200
|
||||
#define MISDN_CTRL_GETPEER 0x0400
|
||||
#define MISDN_CTRL_HW_FEATURES_OP 0x2000
|
||||
#define MISDN_CTRL_HW_FEATURES 0x2001
|
||||
#define MISDN_CTRL_HFC_OP 0x4000
|
||||
|
@ -362,6 +401,7 @@ struct mISDN_ctrl_req {
|
|||
#define DEBUG_L2_TEI 0x00100000
|
||||
#define DEBUG_L2_TEIFSM 0x00200000
|
||||
#define DEBUG_TIMER 0x01000000
|
||||
#define DEBUG_CLOCK 0x02000000
|
||||
|
||||
#define mISDN_HEAD_P(s) ((struct mISDNhead *)&s->cb[0])
|
||||
#define mISDN_HEAD_PRIM(s) (((struct mISDNhead *)&s->cb[0])->prim)
|
||||
|
@ -375,6 +415,7 @@ struct mISDN_ctrl_req {
|
|||
struct mISDNchannel;
|
||||
struct mISDNdevice;
|
||||
struct mISDNstack;
|
||||
struct mISDNclock;
|
||||
|
||||
struct channel_req {
|
||||
u_int protocol;
|
||||
|
@ -423,7 +464,6 @@ struct mISDN_sock {
|
|||
struct mISDNdevice {
|
||||
struct mISDNchannel D;
|
||||
u_int id;
|
||||
char name[MISDN_MAX_IDLEN];
|
||||
u_int Dprotocols;
|
||||
u_int Bprotocols;
|
||||
u_int nrbchan;
|
||||
|
@ -452,6 +492,16 @@ struct mISDNstack {
|
|||
#endif
|
||||
};
|
||||
|
||||
typedef int (clockctl_func_t)(void *, int);
|
||||
|
||||
struct mISDNclock {
|
||||
struct list_head list;
|
||||
char name[64];
|
||||
int pri;
|
||||
clockctl_func_t *ctl;
|
||||
void *priv;
|
||||
};
|
||||
|
||||
/* global alloc/queue functions */
|
||||
|
||||
static inline struct sk_buff *
|
||||
|
@ -498,12 +548,23 @@ _queue_data(struct mISDNchannel *ch, u_int prim,
|
|||
|
||||
/* global register/unregister functions */
|
||||
|
||||
extern int mISDN_register_device(struct mISDNdevice *, char *name);
|
||||
extern int mISDN_register_device(struct mISDNdevice *,
|
||||
struct device *parent, char *name);
|
||||
extern void mISDN_unregister_device(struct mISDNdevice *);
|
||||
extern int mISDN_register_Bprotocol(struct Bprotocol *);
|
||||
extern void mISDN_unregister_Bprotocol(struct Bprotocol *);
|
||||
extern struct mISDNclock *mISDN_register_clock(char *, int, clockctl_func_t *,
|
||||
void *);
|
||||
extern void mISDN_unregister_clock(struct mISDNclock *);
|
||||
|
||||
static inline struct mISDNdevice *dev_to_mISDN(struct device *dev)
|
||||
{
|
||||
return dev_get_drvdata(dev);
|
||||
}
|
||||
|
||||
extern void set_channel_address(struct mISDNchannel *, u_int, u_int);
|
||||
extern void mISDN_clock_update(struct mISDNclock *, int, struct timeval *);
|
||||
extern unsigned short mISDN_clock_get(void);
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
#endif /* mISDNIF_H */
|
||||
|
|
Loading…
Reference in New Issue