diff options
| author | sruffell <sruffell@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2009-06-24 18:46:27 +0000 |
|---|---|---|
| committer | sruffell <sruffell@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2009-06-24 18:46:27 +0000 |
| commit | 54e66b8cb829527f62732abc364d136037ae5568 (patch) | |
| tree | 28e6e2f155782733c2d48e2c5184d87e79a9799b | |
| parent | b3ccefd237138e94466b4eb402b974c201b55c77 (diff) | |
wct4xxp, wcte11xp: Use the default configuration by default at startup.
This change allows the hardware to provide timeing to asterisk before they
have been properly configured. DAHDI-275.
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@4662 5390a7c7-147a-4af0-8ec9-7488f05a26cb
| -rw-r--r-- | kernel/wct4xxp/base.c | 6 | ||||
| -rw-r--r-- | kernel/wcte11xp.c | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/kernel/wct4xxp/base.c b/kernel/wct4xxp/base.c index e9bc1c2..ad8b7c6 100644 --- a/kernel/wct4xxp/base.c +++ b/kernel/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. * @@ -3500,6 +3500,10 @@ static int __devinit t4_launch(struct t4 *wc) return -1; } } + /* 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); set_bit(T4_CHECK_TIMING, &wc->checkflag); spin_lock_irqsave(&wc->reglock, flags); __t4_set_timing_source(wc,4, 0, 0); diff --git a/kernel/wcte11xp.c b/kernel/wcte11xp.c index a50fd25..24d62a0 100644 --- a/kernel/wcte11xp.c +++ b/kernel/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. * @@ -1016,6 +1016,10 @@ static int t1xxp_software_init(struct t1 *wc) printk("Unable to register span with zaptel\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; } |