[zaptel-commits] sruffell: branch sruffell/voicebus r3891 - in /team/sruffell/voicebus: ./ ker...

[SVN commits to the Zaptel project]

Author: sruffell
Date: Wed Feb 27 17:41:16 2008
New Revision: 3891

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3891
Log:
Merging in more changes from the trunk.


Modified:
    team/sruffell/voicebus/   (props changed)
    team/sruffell/voicebus/kernel/tor2.c
    team/sruffell/voicebus/kernel/torisa.c

Propchange: team/sruffell/voicebus/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Feb 27 17:41:16 2008
@@ -1,1 +1,1 @@
-/branches/1.4:1-3886
+/branches/1.4:1-3890

Modified: team/sruffell/voicebus/kernel/tor2.c
URL: http://svn.digium.com/view/zaptel/team/sruffell/voicebus/kernel/tor2.c?view=diff&rev=3891&r1=3890&r2=3891
==============================================================================
--- team/sruffell/voicebus/kernel/tor2.c (original)
+++ team/sruffell/voicebus/kernel/tor2.c Wed Feb 27 17:41:16 2008
@@ -269,7 +269,7 @@
 	for (x = 0; x < SPANS_PER_CARD; x++) {
 		sprintf(tor->spans[x].name, "Tor2/%d/%d", tor->num, x + 1);
 		snprintf(tor->spans[x].desc, sizeof(tor->spans[x].desc) - 1,
-			 "Tormenta 2 (PCI) fQuad %s Card %d Span %d",
+			 "Tormenta 2 (PCI) Quad %s Card %d Span %d",
 			 (tor->cardtype == TYPE_T1)  ?  "T1"  :  "E1", tor->num, x + 1);
 		tor->spans[x].manufacturer = "Digium";
 		zap_copy_string(tor->spans[x].devicetype, tor->type, sizeof(tor->spans[x].devicetype));

Modified: team/sruffell/voicebus/kernel/torisa.c
URL: http://svn.digium.com/view/zaptel/team/sruffell/voicebus/kernel/torisa.c?view=diff&rev=3891&r1=3890&r2=3891
==============================================================================
--- team/sruffell/voicebus/kernel/torisa.c (original)
+++ team/sruffell/voicebus/kernel/torisa.c Wed Feb 27 17:41:16 2008
@@ -1095,11 +1095,11 @@
 	spans[0].irq = irq;
 
 	if (card_type == TYPE_E1) {
-		spans[0].spantype = "T1";
+		spans[0].spantype = "E1";
 		spans[0].linecompat = ZT_CONFIG_AMI | ZT_CONFIG_B8ZS | ZT_CONFIG_D4 | ZT_CONFIG_ESF;
 		spans[0].deflaw = ZT_LAW_ALAW;
 	} else {
-		spans[0].spantype = "E1";
+		spans[0].spantype = "T1";
 		spans[0].linecompat = ZT_CONFIG_HDB3 | ZT_CONFIG_CCS | ZT_CONFIG_CRC4;
 		spans[0].deflaw = ZT_LAW_MULAW;
 	}