diff options
| author | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-05-19 12:42:19 +0000 |
|---|---|---|
| committer | tzafrir <tzafrir@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2008-05-19 12:42:19 +0000 |
| commit | 619379a49371ac44c87a89e237bb7f60c841d23a (patch) | |
| tree | 9207951e6474eb627744f159b58cb0ef7d41cb34 /kernel/xpp/card_fxo.c | |
| parent | dd3fad8de5df2f25630d66154f209b6b7cbf4049 (diff) | |
* Zaptel-1.2.x does not have zt_alarm_channel(). Move up the backward
compatibility kludge so it actually affect code (failed compilation on
zaptel-1.2 from Digium without (Closes issue #12654 ).
* Cleanup a compile warning in xpp/card_global.c .
* Fix regression in PRI init script (case of less than 4 modules).
* Update changelog and bump version.
Merged revisions 4304 via svnmerge from
http://svn.digium.com/svn/zaptel/branches/1.2
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@4305 5390a7c7-147a-4af0-8ec9-7488f05a26cb
Diffstat (limited to 'kernel/xpp/card_fxo.c')
| -rw-r--r-- | kernel/xpp/card_fxo.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/kernel/xpp/card_fxo.c b/kernel/xpp/card_fxo.c index 0bb30ff..2e48dca 100644 --- a/kernel/xpp/card_fxo.c +++ b/kernel/xpp/card_fxo.c @@ -41,6 +41,12 @@ static DEF_PARM(uint, poll_metering_interval, 500, 0644, "Poll metering interval static DEF_PARM(int, ring_debounce, 50, 0644, "Number of ticks to debounce a false RING indication"); static DEF_PARM(int, caller_id_style, 0, 0444, "Caller-Id detection style: 0 - [BELL], 1 - [BT], 2 - [PASS]"); +/* Backward compatibility plug */ +#ifndef ZT_GET_PARAMS_V1 +#define zt_alarm_channel(a,b) zt_qevent_lock(a,( (b)==ZT_ALARM_NONE )? \ + ZT_EVENT_NOALARM : ZT_EVENT_ALARM) +#endif + enum cid_style { CID_STYLE_BELL = 0, /* E.g: US (Bellcore) */ CID_STYLE_ETSI_POLREV = 1, /* E.g: UK (British Telecom) */ @@ -826,10 +832,6 @@ HANDLER_DEF(FXO, SIG_CHANGED) return 0; } -#ifndef ZT_GET_PARAMS_V1 -#define zt_alarm_channel(a,b) zt_qevent_lock(a,( (b)==ZT_ALARM_NONE )? \ - ZT_EVENT_NOALARM : ZT_EVENT_ALARM) -#endif static void update_battery_voltage(xpd_t *xpd, byte data_low, xportno_t portno) { struct FXO_priv_data *priv; |