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

wct4xxp: Ensure all spans are configured by default.

Browse Source 
Not configuring all the spans on an octal card can result in some of the
spans not working in clear channel modes.

Now ensure that all spans receive a default configuration regardless how
they are configured from user space.

Internal-Issue-ID: DAHLIN-289
Signed-off-by: Shaun Ruffell <sruffell@digium.com>
Signed-off-by: Russ Meyerriecks <rmeyerriecks@digium.com>

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@10728 a0bf4364-ded3-4de4-8d8a-66a801d63aff
This commit is contained in:
Shaun Ruffell 2012-10-04 20:24:29 +00:00 committed by Russ Meyerriecks
parent 25ce85e770
commit ba595821ce
1 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
drivers/dahdi/wct4xxp/base.c
View File

@ -436,6 +436,7 @@ static const struct dahdi_echocan_ops vpm_ec_ops = {
#endif #endif
static void __set_clear(struct t4 *wc, int span); static void __set_clear(struct t4 *wc, int span);
static int _t4_startup(struct file *file, struct dahdi_span *span);
static int t4_startup(struct file *file, struct dahdi_span *span); static int t4_startup(struct file *file, struct dahdi_span *span);
static int t4_shutdown(struct dahdi_span *span); static int t4_shutdown(struct dahdi_span *span);
static int t4_rbsbits(struct dahdi_chan *chan, int bits); static int t4_rbsbits(struct dahdi_chan *chan, int bits);
@ -1693,7 +1694,7 @@ static void t4_chan_set_sigcap(struct dahdi_span *span, int x)
} }
static int static int
t4_spanconfig(struct file *file, struct dahdi_span *span, _t4_spanconfig(struct file *file, struct dahdi_span *span,
struct dahdi_lineconfig *lc) struct dahdi_lineconfig *lc)
{ {
int i; int i;
@ -1733,13 +1734,36 @@ t4_spanconfig(struct file *file, struct dahdi_span *span,
/* If we're already running, then go ahead and apply the changes */ /* If we're already running, then go ahead and apply the changes */
if (span->flags & DAHDI_FLAG_RUNNING) if (span->flags & DAHDI_FLAG_RUNNING)
return t4_startup(file, span); return _t4_startup(file, span);
if (debug) if (debug)
dev_info(&wc->dev->dev, "Done with spanconfig!\n"); dev_info(&wc->dev->dev, "Done with spanconfig!\n");
return 0; return 0;
} }
static int
t4_spanconfig(struct file *file, struct dahdi_span *span,
struct dahdi_lineconfig *lc)
{
int ret;
struct dahdi_device *const ddev = span->parent;
struct dahdi_span *s;
ret = _t4_spanconfig(file, span, lc);
/* Make sure all the spans have a basic configuration in case they are
* not all specified in the configuration files. */
lc->sync = 0;
list_for_each_entry(s, &ddev->spans, device_node) {
WARN_ON(!s->channels);
if (!s->channels)
continue;
if (!s->chans[0]->sigcap)
_t4_spanconfig(file, s, lc);
}
return ret;
}
static int static int
t4_chanconfig(struct file *file, struct dahdi_chan *chan, int sigtype) t4_chanconfig(struct file *file, struct dahdi_chan *chan, int sigtype)
{ {
@ -2833,7 +2857,7 @@ static int t4_check_for_interrupts(struct t4 *wc)
return 0; return 0;
} }
static int t4_startup(struct file *file, struct dahdi_span *span) static int _t4_startup(struct file *file, struct dahdi_span *span)
{ {
#ifdef SUPPORT_GEN1 #ifdef SUPPORT_GEN1
int i; int i;
@ -2966,6 +2990,21 @@ static int t4_startup(struct file *file, struct dahdi_span *span)
return 0; return 0;
} }
static int t4_startup(struct file *file, struct dahdi_span *span)
{
int ret;
struct dahdi_device *const ddev = span->parent;
struct dahdi_span *s;
ret = _t4_startup(file, span);
list_for_each_entry(s, &ddev->spans, device_node) {
if (!test_bit(DAHDI_FLAGBIT_RUNNING, &s->flags)) {
_t4_startup(file, s);
}
}
return ret;
}
#ifdef SUPPORT_GEN1 #ifdef SUPPORT_GEN1
static inline void e1_check(struct t4 *wc, int span, int val) static inline void e1_check(struct t4 *wc, int span, int val)
{ {