commit f8b204fb64f6e70f2c78672560080fc66c91e6de
author Johan Hedberg <johan.hedberg@nokia.com> Thu Nov 04 04:19:54 2010 +0200
committer Jaikumar Ganesh <jaikumar@google.com> Thu Mar 10 16:47:47 2011 -0800
tree 579844e07b69e6c946257ca954875d417d2b48d5
parent 0e30b231d2be1d5af2c7f4aa0f0d5e8260634200

Remove redundant tracking of ignored adapters

Since hciops already takes care of hiding ignored adapters there's no
need to have special logic for them in adapter.c.

plugins/hciops.c

diff --git a/plugins/hciops.c b/plugins/hciops.c
index 8a79010..73a7455 100644
--- a/plugins/hciops.c
+++ b/plugins/hciops.c
@@ -62,6 +62,11 @@
 	int sk;
 } *devs = NULL;
 
+static int ignore_device(struct hci_dev_info *di)
+{
+	return hci_test_bit(HCI_RAW, &di->flags) || di->type >> 4 != HCI_BREDR;
+}
+
 static void init_dev_info(int index, int sk)
 {
 	memset(&devs[index], 0, sizeof(struct dev_info));

src/adapter.c

diff --git a/src/adapter.c b/src/adapter.c
index e12d9e5..d023801 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -285,8 +285,7 @@
 						strerror(-ret), -ret);
 }
 
-static int adapter_set_service_classes(struct btd_adapter *adapter,
-							uint8_t value)
+int adapter_set_service_classes(struct btd_adapter *adapter, uint8_t value)
 {
 	int err;
 
@@ -2481,11 +2480,6 @@
 	if (hci_devinfo(adapter->dev_id, &di) < 0)
 		return -errno;
 
-	if (ignore_device(&di)) {
-		dev->ignore = 1;
-		return -1;
-	}
-
 	if (!bacmp(&di.bdaddr, BDADDR_ANY)) {
 		int err;
 
@@ -2685,18 +2679,6 @@
 	return 0;
 }
 
-int adapter_update(struct btd_adapter *adapter, uint8_t new_svc)
-{
-	struct hci_dev *dev = &adapter->dev;
-
-	if (dev->ignore)
-		return 0;
-
-	adapter_set_service_classes(adapter, new_svc);
-
-	return 0;
-}
-
 int adapter_update_ssp_mode(struct btd_adapter *adapter, uint8_t mode)
 {
 	struct hci_dev *dev = &adapter->dev;

src/adapter.h

diff --git a/src/adapter.h b/src/adapter.h
index aa4d686..8019cfc 100644
--- a/src/adapter.h
+++ b/src/adapter.h
@@ -72,8 +72,6 @@
 };
 
 struct hci_dev {
-	int ignore;
-
 	uint8_t  features[8];
 	uint8_t  extfeatures[8];
 	uint8_t  lmp_ver;
@@ -89,7 +87,7 @@
 
 int adapter_stop(struct btd_adapter *adapter);
 
-int adapter_update(struct btd_adapter *adapter, uint8_t cls);
+int adapter_set_service_classes(struct btd_adapter *adapter, uint8_t value);
 
 int adapter_update_ssp_mode(struct btd_adapter *adapter, uint8_t mode);
 

src/hcid.h

diff --git a/src/hcid.h b/src/hcid.h
index c73fe80..caa1d62 100644
--- a/src/hcid.h
+++ b/src/hcid.h
@@ -85,8 +85,3 @@
 
 void rfkill_init(void);
 void rfkill_exit(void);
-
-static inline int ignore_device(struct hci_dev_info *di)
-{
-	return hci_test_bit(HCI_RAW, &di->flags) || di->type >> 4 != HCI_BREDR;
-}

src/manager.c

diff --git a/src/manager.c b/src/manager.c
index dd9560f..3fad9e6 100644
--- a/src/manager.c
+++ b/src/manager.c
@@ -63,7 +63,7 @@
 
 void manager_update_svc(struct btd_adapter* adapter, uint8_t svc)
 {
-	adapter_update(adapter, svc);
+	adapter_set_service_classes(adapter, svc);
 }
 
 static inline DBusMessage *invalid_args(DBusMessage *msg)