[zaptel-commits] sruffell: branch 1.4 r4662 - in /branches/1.4/kernel: wct4xxp/base.c wcte11xp.c

[SVN commits to the Zaptel project]

Author: sruffell
Date: Wed Jun 24 13:46:27 2009
New Revision: 4662

URL: http://svn.asterisk.org/svn-view/zaptel?view=rev&rev=4662
Log:
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.

Modified:
    branches/1.4/kernel/wct4xxp/base.c
    branches/1.4/kernel/wcte11xp.c

Modified: branches/1.4/kernel/wct4xxp/base.c
URL: http://svn.asterisk.org/svn-view/zaptel/branches/1.4/kernel/wct4xxp/base.c?view=diff&rev=4662&r1=4661&r2=4662
==============================================================================
--- branches/1.4/kernel/wct4xxp/base.c (original)
+++ branches/1.4/kernel/wct4xxp/base.c Wed Jun 24 13:46:27 2009
@@ -6,7 +6,7 @@
  * written by Jim Dixon <jim at 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 @@
 			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);

Modified: branches/1.4/kernel/wcte11xp.c
URL: http://svn.asterisk.org/svn-view/zaptel/branches/1.4/kernel/wcte11xp.c?view=diff&rev=4662&r1=4661&r2=4662
==============================================================================
--- branches/1.4/kernel/wcte11xp.c (original)
+++ branches/1.4/kernel/wcte11xp.c Wed Jun 24 13:46:27 2009
@@ -5,7 +5,7 @@
  *            Matthew Fredrickson <creslin at digium.com>
  *            William Meadows <wmeadows at digium.com>
  *
- * Copyright (C) 2004, Digium, Inc.
+ * Copyright (C) 2004-2009, Digium, Inc.
  *
  * All rights reserved.
  *
@@ -1016,6 +1016,10 @@
 		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;
 }