commit 6827467e469f38b2c89522943a5adc937fc29347
author Bruna Moreira <bruna.moreira@openbossa.org> Mon Dec 20 14:16:45 2010 -0400
committer Johan Hedberg <johan.hedberg@nokia.com> Tue Dec 21 00:41:39 2010 +0200
tree 27233e72e1fca11062635c11900daaf659965e7a
parent 2634978c8242a05a0765191a113c383bc9f90a97

Remove le_advertising_info struct from adapter.c

src/adapter.c

diff --git a/src/adapter.c b/src/adapter.c
index 0e6a6e3..ea81722 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -2764,23 +2764,18 @@
 }
 
 void adapter_update_device_from_info(struct btd_adapter *adapter,
-						le_advertising_info *info,
-						char *name, GSList *services,
-						uint8_t flags)
+						bdaddr_t bdaddr, int8_t rssi,
+						uint8_t evt_type, char *name,
+						GSList *services, uint8_t flags)
 {
 	struct remote_dev_info *dev;
-	bdaddr_t bdaddr;
 	gboolean new_dev;
-	int8_t rssi;
-
-	rssi = *(info->data + info->length);
-	bdaddr = info->bdaddr;
 
 	dev = get_found_dev(adapter, &bdaddr, &new_dev);
 
 	if (new_dev) {
 		dev->le = TRUE;
-		dev->evt_type = info->evt_type;
+		dev->evt_type = evt_type;
 	} else if (dev->rssi == rssi)
 		return;
 

src/adapter.h

diff --git a/src/adapter.h b/src/adapter.h
index 77ae1e9..ebbe633 100644
--- a/src/adapter.h
+++ b/src/adapter.h
@@ -136,9 +136,9 @@
 struct remote_dev_info *adapter_search_found_devices(struct btd_adapter *adapter,
 						struct remote_dev_info *match);
 void adapter_update_device_from_info(struct btd_adapter *adapter,
-						le_advertising_info *info,
-						char *name, GSList *services,
-						uint8_t flags);
+						bdaddr_t bdaddr, int8_t rssi,
+						uint8_t evt_type, char *name,
+						GSList *services, uint8_t flags);
 void adapter_update_found_devices(struct btd_adapter *adapter, bdaddr_t *bdaddr,
 				int8_t rssi, uint32_t class, const char *name,
 				const char *alias, gboolean legacy,

src/event.c

diff --git a/src/event.c b/src/event.c
index 95e5bfc..cfc47bf 100644
--- a/src/event.c
+++ b/src/event.c
@@ -435,6 +435,7 @@
 {
 	struct btd_adapter *adapter;
 	struct eir_data eir_data;
+	int8_t rssi;
 	int err;
 
 	adapter = manager_find_adapter(local);
@@ -450,7 +451,10 @@
 		error("Error parsing advertising data: %s (%d)",
 							strerror(-err), -err);
 
-	adapter_update_device_from_info(adapter, info, eir_data.name,
+	rssi = *(info->data + info->length);
+
+	adapter_update_device_from_info(adapter, info->bdaddr, rssi,
+					info->evt_type, eir_data.name,
 					eir_data.services, eir_data.flags);
 }