diff options
| author | Johan Hedberg <johan.hedberg@nokia.com> | 2008-11-29 21:17:53 +0200 | 
|---|---|---|
| committer | Johan Hedberg <johan.hedberg@nokia.com> | 2008-11-29 21:17:53 +0200 | 
| commit | 7335a40a60e8d4fbdf774bf20dea4fddc0b4b925 (patch) | |
| tree | fac2050e7aba9d041254214da484af91da48e9f7 /src/adapter.c | |
| parent | 9c03b30330d7b483b307c0077b3f5d676d166073 (diff) | |
Remove unnecessary adapter_set_mode function
Diffstat (limited to 'src/adapter.c')
| -rw-r--r-- | src/adapter.c | 14 | 
1 files changed, 3 insertions, 11 deletions
| diff --git a/src/adapter.c b/src/adapter.c index aafc1f76..f1823d80 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -3031,14 +3031,6 @@ uint8_t adapter_get_scan_mode(struct btd_adapter *adapter)  	return adapter->scan_mode;  } -void adapter_set_mode(struct btd_adapter *adapter, uint8_t mode) -{ -	if (!adapter) -		return; - -	adapter->mode = mode; -} -  uint8_t adapter_get_mode(struct btd_adapter *adapter)  {  	return adapter->mode; @@ -3219,13 +3211,13 @@ void adapter_mode_changed(struct btd_adapter *adapter, uint8_t scan_mode)  	switch (scan_mode) {  	case SCAN_DISABLED:  		mode = "off"; -		adapter_set_mode(adapter, MODE_OFF); +		adapter->mode = MODE_OFF;  		powered = FALSE;  		discoverable = FALSE;  		break;  	case SCAN_PAGE:  		mode = "connectable"; -		adapter_set_mode(adapter, MODE_CONNECTABLE); +		adapter->mode = MODE_CONNECTABLE;  		powered = TRUE;  		discoverable = FALSE;  		break; @@ -3235,7 +3227,7 @@ void adapter_mode_changed(struct btd_adapter *adapter, uint8_t scan_mode)  		if (adapter_get_mode(adapter) == MODE_LIMITED) {  			mode = "limited";  		} else { -			adapter_set_mode(adapter, MODE_DISCOVERABLE); +			adapter->mode = MODE_DISCOVERABLE;  			mode = "discoverable";  		}  		if (adapter->discov_timeout != 0) | 
