[zaptel-commits] kpfleming: branch 1.4 r1536 - in /branches/1.4: ./ wctdm.c wctdm24xxp.c

[zaptel-commits at lists.digium.com]

Author: kpfleming
Date: Wed Oct 25 19:03:22 2006
New Revision: 1536

URL: http://svn.digium.com/view/zaptel?rev=1536&view=rev
Log:
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:
    branches/1.4/   (props changed)
    branches/1.4/wctdm.c
    branches/1.4/wctdm24xxp.c

Propchange: branches/1.4/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: branches/1.4/wctdm.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/wctdm.c?rev=1536&r1=1535&r2=1536&view=diff
==============================================================================
--- branches/1.4/wctdm.c (original)
+++ branches/1.4/wctdm.c Wed Oct 25 19:03:22 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: branches/1.4/wctdm24xxp.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/wctdm24xxp.c?rev=1536&r1=1535&r2=1536&view=diff
==============================================================================
--- branches/1.4/wctdm24xxp.c (original)
+++ branches/1.4/wctdm24xxp.c Wed Oct 25 19:03:22 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);