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

[SVN commits to the Digium repositories]

Author: mnicholson
Date: Wed Mar 18 16:41:16 2009
New Revision: 813

URL: http://svn.digium.com/svn-view/asterisk-addons?view=rev&rev=813
Log:
Remove the the "state" var and any references to it from struct mbl_pvt.  It is
no longer used.

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=813&r1=812&r2=813
==============================================================================
--- team/mnicholson/chan-mobile-refactor/channels/chan_mobile.c (original)
+++ team/mnicholson/chan-mobile-refactor/channels/chan_mobile.c Wed Mar 18 16:41:16 2009
@@ -91,15 +91,6 @@
 enum mbl_type {
 	MBL_TYPE_PHONE,
 	MBL_TYPE_HEADSET
-};
-
-enum mbl_state {
-	MBL_STATE_INIT = 0,
-	MBL_STATE_PREIDLE,
-	MBL_STATE_IDLE,
-	MBL_STATE_RING,
-	MBL_STATE_RING2,
-	MBL_STATE_INCOMING,
 };
 
 struct adapter_pvt {
@@ -141,7 +132,6 @@
 	int io_pipe[2];
 	struct ast_smoother *smoother;			/* our smoother, for making 48 byte frames */
 	int sco_socket;					/* sco socket descriptor */
-	enum mbl_state state;				/* monitor thread current state */
 	pthread_t monitor_thread;			/* monitor thread handle */
 	int timeout;					/*!< used to set the timeout for rfcomm data (may be used in the future) */
 	unsigned int no_callsetup:1;
@@ -3646,7 +3636,6 @@
 					ast_mutex_lock(&pvt->lock);
 					if (!adapter->inuse && !pvt->connected && !strcmp(adapter->id, pvt->adapter->id)) {
 						if ((pvt->rfcomm_socket = rfcomm_connect(adapter->addr, pvt->addr, pvt->rfcomm_port)) > -1) {
-							pvt->state = 0;
 							if (start_monitor(pvt)) {
 								pvt->connected = 1;
 								adapter->inuse = 1;
@@ -3883,7 +3872,6 @@
 	ast_copy_string(pvt->id, cat, sizeof(pvt->id));
 	str2ba(address, &pvt->addr);
 	pvt->timeout = -1;
-	pvt->state = MBL_STATE_INIT;
 	pvt->rfcomm_socket = -1;
 	pvt->rfcomm_port = atoi(port);
 	pvt->sco_socket = -1;