[svn-commits] mnicholson: branch mnicholson/chan-mobile-refactor r814 - /team/mnicholson/ch...

[SVN commits to the Digium repositories]

Author: mnicholson
Date: Wed Mar 18 16:43:34 2009
New Revision: 814

URL: http://svn.digium.com/svn-view/asterisk-addons?view=rev&rev=814
Log:
renamed struct mbl_pvt->sent_answer to answered

Modified:
    team/mnicholson/chan-mobile-refactor/channels/chan_mobile.c

Modified: team/mnicholson/chan-mobile-refactor/channels/chan_mobile.c
URL: http://svn.digium.com/svn-view/asterisk-addons/team/mnicholson/chan-mobile-refactor/channels/chan_mobile.c?view=diff&rev=814&r1=813&r2=814
==============================================================================
--- team/mnicholson/chan-mobile-refactor/channels/chan_mobile.c (original)
+++ team/mnicholson/chan-mobile-refactor/channels/chan_mobile.c Wed Mar 18 16:43:34 2009
@@ -153,7 +153,7 @@
 	unsigned int needcallerid:1;	/*!< we need callerid */
 	unsigned int needchup:1;	/*!< we need to send a chup */
 	unsigned int needring:1;	/*!< we need to send a RING */
-	unsigned int sent_answer:1;	/*!< we sent an answer */
+	unsigned int answered:1;	/*!< we sent/recieved an answer */
 	unsigned int connected:1;	/*!< do we have an rfcomm connection to a device */
 
 	AST_LIST_ENTRY(mbl_pvt) entry;
@@ -773,7 +773,7 @@
 		goto e_return;
 	}
 
-	pvt->sent_answer = 0;
+	pvt->answered = 0;
 	pvt->alignment_count = 0;
 	pvt->alignment_detection_triggered = 0;
 	if (pvt->adapter->alignment_detection)
@@ -993,7 +993,7 @@
 	if (pvt->incoming) {
 		hfp_send_ata(pvt->hfp);
 		msg_queue_push(pvt, AT_OK, AT_A);
-		pvt->sent_answer = 1;
+		pvt->answered = 1;
 	}
 	ast_mutex_unlock(&pvt->lock);
 
@@ -3057,7 +3057,7 @@
 			if (pvt->outgoing) {
 				ast_debug(1, "[%s] remote end answered\n", pvt->id);
 				mbl_queue_control(pvt, AST_CONTROL_ANSWER);
-			} else if (pvt->incoming && pvt->sent_answer) {
+			} else if (pvt->incoming && pvt->answered) {
 				ast_setstate(pvt->owner, AST_STATE_UP);
 			} else if (pvt->incoming) {
 				/* user answered from handset, disconnecting */
@@ -3490,7 +3490,7 @@
 			if (pvt->outgoing) {
 				pvt->needring = 1;
 				hsp_send_ok(pvt->rfcomm_socket);
-				if (pvt->sent_answer) {
+				if (pvt->answered) {
 					/* we have an answered call up to the
 					 * HS, he wants to hangup */
 					mbl_queue_hangup(pvt);
@@ -3512,7 +3512,7 @@
 					}
 
 					mbl_queue_control(pvt, AST_CONTROL_ANSWER);
-					pvt->sent_answer = 1;
+					pvt->answered = 1;
 
 					if (hsp_send_vgs(pvt->rfcomm_socket, 13) || hsp_send_vgm(pvt->rfcomm_socket, 13)) {
 						ast_debug(1, "[%s] error sending VGS/VGM\n", pvt->id);