[svn-commits] moy: branch moy/mfcr2 r122800 - /team/moy/mfcr2/channels/chan_zap.c

[SVN commits to the Digium repositories]

Author: moy
Date: Sat Jun 14 23:53:43 2008
New Revision: 122800

URL: http://svn.digium.com/view/asterisk?view=rev&rev=122800
Log:
updated p->inalarm flag when getting hardware alarm event from openr2

Modified:
    team/moy/mfcr2/channels/chan_zap.c

Modified: team/moy/mfcr2/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/moy/mfcr2/channels/chan_zap.c?view=diff&rev=122800&r1=122799&r2=122800
==============================================================================
--- team/moy/mfcr2/channels/chan_zap.c (original)
+++ team/moy/mfcr2/channels/chan_zap.c Sat Jun 14 23:53:43 2008
@@ -1288,9 +1288,11 @@
 	ast_log(LOG_NOTICE, "New MFC/R2 call detected on chan %d.\n", openr2_chan_get_number(r2chan));
 }
 
-static void zt_r2_on_zap_alarm(openr2_chan_t *r2chan, int alarm)
-{
+static void zt_r2_on_hardware_alarm(openr2_chan_t *r2chan, int alarm)
+{
+	struct zt_pvt *p = openr2_chan_get_client_data(r2chan);
 	ast_log(LOG_WARNING, "Zap alarm on chan %d.\n", openr2_chan_get_number(r2chan));
+	p->inalarm = alarm ? 1 : 0;
 }
 
 static void zt_r2_on_os_error(openr2_chan_t *r2chan, int errorcode)
@@ -1520,7 +1522,7 @@
 	zt_r2_on_call_disconnected,
 	zt_r2_on_call_end,
 	zt_r2_on_call_read,
-	zt_r2_on_zap_alarm,
+	zt_r2_on_hardware_alarm,
 	zt_r2_on_os_error,
 	zt_r2_on_protocol_error,
 	zt_r2_on_line_blocked,