[asterisk-commits] mmichelson: branch group/CCSS_Monitor_Restructure r241726 - /team/group/CCSS_...

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Wed Jan 20 15:19:42 2010
New Revision: 241726

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=241726
Log:
Define the unsuspend2 callback. It is nearly identical to the old unsuspend callback.


Modified:
    team/group/CCSS_Monitor_Restructure/main/ccss.c

Modified: team/group/CCSS_Monitor_Restructure/main/ccss.c
URL: http://svnview.digium.com/svn/asterisk/team/group/CCSS_Monitor_Restructure/main/ccss.c?view=diff&rev=241726&r1=241725&r2=241726
==============================================================================
--- team/group/CCSS_Monitor_Restructure/main/ccss.c (original)
+++ team/group/CCSS_Monitor_Restructure/main/ccss.c Wed Jan 20 15:19:42 2010
@@ -1009,7 +1009,7 @@
 static int cc_generic_monitor_request_cc2(struct cc_monitor *monitor, int *available_timer_id);
 static int cc_generic_monitor_suspend2(struct cc_monitor *monitor);
 static int cc_generic_monitor_status_response(struct ast_cc_monitor *monitor, const int core_id, enum ast_device_state devstate);
-static int cc_generic_monitor_unsuspend(struct ast_cc_monitor *monitor, const int core_id);
+static int cc_generic_monitor_unsuspend2(struct cc_monitor *monitor);
 static int cc_generic_monitor_cancel_available_timer(struct ast_cc_monitor *monitor, const int core_id, int *sched_id);
 static void cc_generic_monitor_destructor(struct ast_cc_monitor *monitor);
 static void cc_generic_monitor_instance_destructor(const int core_id);
@@ -1020,7 +1020,7 @@
 	.request_cc2 = cc_generic_monitor_request_cc2,
 	.suspend2 = cc_generic_monitor_suspend2,
 	.status_response = cc_generic_monitor_status_response,
-	.unsuspend = cc_generic_monitor_unsuspend,
+	.unsuspend2 = cc_generic_monitor_unsuspend2,
 	.cancel_available_timer = cc_generic_monitor_cancel_available_timer,
 	.destructor = cc_generic_monitor_destructor,
 	.instance_destructor = cc_generic_monitor_instance_destructor,
@@ -1291,14 +1291,14 @@
 	return 0;
 }
 
-static int cc_generic_monitor_unsuspend(struct ast_cc_monitor *monitor, const int core_id)
+static int cc_generic_monitor_unsuspend2(struct cc_monitor *monitor)
 {
 	/* When a generic monitor becomes unsuspended, we should do a status request
 	 * to see if the device is available. That way, if it is, we can trigger an
 	 * immediate state change
 	 */
 	if (ast_device_state(monitor->interface->name) == AST_DEVICE_NOT_INUSE) {
-		ast_cc_monitor_callee_available(monitor);
+		ast_cc_monitor_callee_available2(monitor);
 	}
 	return 0;
 }