[zaptel-commits] kpfleming: trunk r1537 - in /trunk: ./ wctdm.c wctdm24xxp.c

[zaptel-commits at lists.digium.com]

Author: kpfleming
Date: Wed Oct 25 19:09:28 2006
New Revision: 1537

URL: http://svn.digium.com/view/zaptel?rev=1537&view=rev
Log:
Merged revisions 1536 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.4

................
r1536 | kpfleming | 2006-10-25 19:03:22 -0500 (Wed, 25 Oct 2006) | 15 lines

Merged revisions 1534-1535 via svnmerge from 
https://origsvn.digium.com/svn/zaptel/branches/1.2

........
r1534 | kpfleming | 2006-10-25 18:54:41 -0500 (Wed, 25 Oct 2006) | 2 lines

do ProSLIC 3215 check properly

........
r1535 | kpfleming | 2006-10-25 19:00:31 -0500 (Wed, 25 Oct 2006) | 2 lines

do ProSLIC 3215 check properly in this driver too

........

................

Modified:
    trunk/   (props changed)
    trunk/wctdm.c
    trunk/wctdm24xxp.c

Propchange: trunk/
------------------------------------------------------------------------------
--- branch-1.4-merged (original)
+++ branch-1.4-merged Wed Oct 25 19:09:28 2006
@@ -1,1 +1,1 @@
-/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530
+/branches/1.4:1-1471,1490,1500,1507,1520,1528,1530,1536

Modified: trunk/wctdm.c
URL: http://svn.digium.com/view/zaptel/trunk/wctdm.c?rev=1537&r1=1536&r2=1537&view=diff
==============================================================================
--- trunk/wctdm.c (original)
+++ trunk/wctdm.c Wed Oct 25 19:09:28 2006
@@ -1189,10 +1189,10 @@
 		printk("ProSLIC 3210 version %d is too old\n", blah & 0xf);
 		return -1;
 	}
-	if ((blah & 0xf) == 2) {
+	if (wctdm_getreg(wc, card, 1) & 0x80)
 		/* ProSLIC 3215, not a 3210 */
 		wc->flags[card] |= FLAG_3215;
-	}
+
 	blah = wctdm_getreg(wc, card, 8);
 	if (blah != 0x2) {
 		printk("ProSLIC on module %d insane (1) %d should be 2\n", card, blah);

Modified: trunk/wctdm24xxp.c
URL: http://svn.digium.com/view/zaptel/trunk/wctdm24xxp.c?rev=1537&r1=1536&r2=1537&view=diff
==============================================================================
--- trunk/wctdm24xxp.c (original)
+++ trunk/wctdm24xxp.c Wed Oct 25 19:09:28 2006
@@ -1629,10 +1629,10 @@
 		printk("ProSLIC 3210 version %d is too old\n", blah & 0xf);
 		return -1;
 	}
-	if ((blah & 0xf) == 2) {
+	if (wctdm_getreg(wc, card, 1) & 0x80)
 		/* ProSLIC 3215, not a 3210 */
 		wc->flags[card] |= FLAG_3215;
-	}
+
 	blah = wctdm_getreg(wc, card, 8);
 	if (blah != 0x2) {
 		printk("ProSLIC on module %d insane (1) %d should be 2\n", card, blah);