summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorShaun Ruffell <sruffell@digium.com>2009-06-24 19:13:35 +0000
committerShaun Ruffell <sruffell@digium.com>2009-06-24 19:13:35 +0000
commitd5b606088144ccf33d7811f4e48e9600372be94e (patch)
tree8636f282902b2398f72a9253e8f28e3540c68b34 /drivers
parent3a5a5ede168e0eafb346ffcdf7eef91c862acf84 (diff)
wct4xxp, wcte11xp: Use the default configuration by default at startup.
This change allows hardware to provide timing to asterisk before normal configuration. DAHDI-275. git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@6712 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'drivers')
-rw-r--r--drivers/dahdi/wct4xxp/base.c8
-rw-r--r--drivers/dahdi/wcte11xp.c7
2 files changed, 13 insertions, 2 deletions
diff --git a/drivers/dahdi/wct4xxp/base.c b/drivers/dahdi/wct4xxp/base.c
index 96fabde..6558de8 100644
--- a/drivers/dahdi/wct4xxp/base.c
+++ b/drivers/dahdi/wct4xxp/base.c
@@ -6,7 +6,7 @@
* written by Jim Dixon <jim@lambdatel.com>.
*
* Copyright (C) 2001 Jim Dixon / Zapata Telephony.
- * Copyright (C) 2001-2005, Digium, Inc.
+ * Copyright (C) 2001-2009, Digium, Inc.
*
* All rights reserved.
*
@@ -3547,6 +3547,12 @@ static int __devinit t4_launch(struct t4 *wc)
__t4_set_timing_source(wc,4, 0, 0);
spin_unlock_irqrestore(&wc->reglock, flags);
tasklet_init(&wc->t4_tlet, t4_isr_bh, (unsigned long)wc);
+
+ /* Start the first span on the card with the default configuration so
+ * that it may provide timing to Asterisk before being properly
+ * configured. */
+ t4_startup(&wc->tspans[0]->span);
+
return 0;
}
diff --git a/drivers/dahdi/wcte11xp.c b/drivers/dahdi/wcte11xp.c
index 390c834..26f47fa 100644
--- a/drivers/dahdi/wcte11xp.c
+++ b/drivers/dahdi/wcte11xp.c
@@ -5,7 +5,7 @@
* Matthew Fredrickson <creslin@digium.com>
* William Meadows <wmeadows@digium.com>
*
- * Copyright (C) 2004, Digium, Inc.
+ * Copyright (C) 2004-2009, Digium, Inc.
*
* All rights reserved.
*/
@@ -1013,6 +1013,11 @@ static int t1xxp_software_init(struct t1 *wc)
printk(KERN_NOTICE "Unable to register span with DAHDI\n");
return -1;
}
+
+ /* Start off with the defaults so this card can provide timing to
+ * Asterisk before being properly configured. */
+ t1xxp_startup(&wc->span);
+
return 0;
}