[svn-commits] tzafrir: branch 1.4 r4472 - in /branches/1.4: ./ kernel/xpp/card_fxo.c

[SVN commits to the Digium repositories]

Author: tzafrir
Date: Mon Aug 11 08:33:00 2008
New Revision: 4472

URL: http://svn.digium.com/view/zaptel?view=rev&rev=4472
Log:
xpp: fxo: fix caller-id CID_STYLE_PASS_ALWAYS.

Merged revisions 4468 via svnmerge from 
http://svn.digium.com/svn/zaptel/branches/1.2

Modified:
    branches/1.4/   (props changed)
    branches/1.4/kernel/xpp/card_fxo.c

Propchange: branches/1.4/
------------------------------------------------------------------------------
--- branch-1.2-blocked (original)
+++ branch-1.2-blocked Mon Aug 11 08:33:00 2008
@@ -1,1 +1,1 @@
-/branches/1.2:917,937,1073,1206,1613,2018,2434,2583,2668,2750,2789,2868,2871,2878,3083,3098-3099,3201,3509,3645,3833,3847,3917,3951,4037-4038,4117,4233,4442
+/branches/1.2:917,937,1073,1206,1613,2018,2434,2583,2668,2750,2789,2868,2871,2878,3083,3098-3099,3201,3509,3645,3833,3847,3917,3951,4037-4038,4117,4233,4442,4461-4463

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

Modified: branches/1.4/kernel/xpp/card_fxo.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/xpp/card_fxo.c?view=diff&rev=4472&r1=4471&r2=4472
==============================================================================
--- branches/1.4/kernel/xpp/card_fxo.c (original)
+++ branches/1.4/kernel/xpp/card_fxo.c Mon Aug 11 08:33:00 2008
@@ -466,6 +466,8 @@
 		priv->polarity[i] = POL_UNKNOWN;	/* will be updated on next battery sample */
 		priv->battery[i] = BATTERY_UNKNOWN;	/* will be updated on next battery sample */
 		priv->power[i] = POWER_UNKNOWN;	/* will be updated on next battery sample */
+		if(caller_id_style == CID_STYLE_PASS_ALWAYS)
+			BIT_SET(xpd->cid_on, i);
 	}
 	XPD_DBG(GENERAL, xpd, "done\n");
 	for_each_line(xpd, i) {