FGCOM/dahdi-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wcte12xp: Force spanconfig/chanconfig to wait for ready.

Browse Source 
This is always true currently but will not necessarily be in the future.

Signed-off-by: Shaun Ruffell <sruffell@digium.com>

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9945 a0bf4364-ded3-4de4-8d8a-66a801d63aff
This commit is contained in:
Shaun Ruffell 2011-06-02 20:01:59 +00:00
parent 27acb7088c
commit c5691ec293
2 changed files with 36 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/dahdi/wcte12xp/base.c
View File

@ -957,6 +957,18 @@ static int t1xxp_chanconfig(struct file *file,
struct dahdi_chan *chan, int sigtype) struct dahdi_chan *chan, int sigtype)
{ {
struct t1 *wc = chan->pvt; struct t1 *wc = chan->pvt;
if (file->f_flags & O_NONBLOCK) {
if (!test_bit(READY, &wc->bit_flags))
return -EAGAIN;
} else {
while (!test_bit(READY, &wc->bit_flags)) {
if (fatal_signal_pending(current))
return -EIO;
msleep_interruptible(250);
}
}
if (test_bit(DAHDI_FLAGBIT_RUNNING, &chan->span->flags) && if (test_bit(DAHDI_FLAGBIT_RUNNING, &chan->span->flags) &&
(wc->spantype != TYPE_E1)) { (wc->spantype != TYPE_E1)) {
__t1xxp_set_clear(wc); __t1xxp_set_clear(wc);
@ -1368,6 +1380,12 @@ setchanconfig_from_state(struct vpmadt032 *vpm, int channel,
} }
#ifdef VPM_SUPPORT #ifdef VPM_SUPPORT
struct vpm_load_work {
struct work_struct work;
struct t1 *wc;
};
static int check_and_load_vpm(struct t1 *wc) static int check_and_load_vpm(struct t1 *wc)
{ {
int res; int res;
@ -1490,6 +1508,17 @@ t1xxp_spanconfig(struct file *file, struct dahdi_span *span,
struct t1 *wc = container_of(span, struct t1, span); struct t1 *wc = container_of(span, struct t1, span);
int i; int i;
if (file->f_flags & O_NONBLOCK) {
if (!test_bit(READY, &wc->bit_flags))
return -EAGAIN;
} else {
while (!test_bit(READY, &wc->bit_flags)) {
if (fatal_signal_pending(current))
return -EIO;
msleep_interruptible(250);
}
}
/* Do we want to SYNC on receive or not */ /* Do we want to SYNC on receive or not */
if (lc->sync) { if (lc->sync) {
set_bit(7, &wc->ctlreg); set_bit(7, &wc->ctlreg);
@ -2110,6 +2139,7 @@ static void vpm_check_func(struct work_struct *work)
set_bit(VPM150M_ACTIVE, &wc->ctlreg); set_bit(VPM150M_ACTIVE, &wc->ctlreg);
t1_info(wc, "VPMADT032 is reenabled.\n"); t1_info(wc, "VPMADT032 is reenabled.\n");
wc->vpm_check = jiffies + HZ*5; wc->vpm_check = jiffies + HZ*5;
set_bit(READY, &wc->bit_flags);
return; return;
} }
@ -2361,6 +2391,11 @@ static int __devinit te12xp_init_one(struct pci_dev *pdev, const struct pci_devi
t1_software_init(wc); t1_software_init(wc);
t1_info(wc, "Found a %s\n", wc->variety); t1_info(wc, "Found a %s\n", wc->variety);
voicebus_unlock_latency(&wc->vb); voicebus_unlock_latency(&wc->vb);
/* If there is VPMADT032 module attached to this device, it will
* signal ready after the channels are configured and ready for use. */
if (!wc->vpmadt032)
set_bit(READY, &wc->bit_flags);
return 0; return 0;
} }

1
drivers/dahdi/wcte12xp/wcte12xp.h
View File

@ -111,6 +111,7 @@ struct t1 {
int loopdowncnt; int loopdowncnt;
#define INITIALIZED 1 #define INITIALIZED 1
#define SHUTDOWN 2 #define SHUTDOWN 2
#define READY 3
unsigned long bit_flags; unsigned long bit_flags;
unsigned long alarmtimer; unsigned long alarmtimer;
unsigned char ledstate; unsigned char ledstate;