From 70d0eac937ee6e9eb431d537d0550503d77573d0 Mon Sep 17 00:00:00 2001
From: Claudio Takahasi <claudio.takahasi@openbossa.org>
Date: Wed, 4 May 2011 10:13:48 -0400
Subject: [PATCH] Remove advertise event type from adapter functions

---
 src/adapter.c | 9 ++++-----
 src/adapter.h | 5 ++---
 src/event.c   | 4 ++--
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/adapter.c b/src/adapter.c
index d8e49d519..e13695de6 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -2993,18 +2993,17 @@ static void dev_prepend_uuid(gpointer data, gpointer user_data)
 
 void adapter_update_device_from_info(struct btd_adapter *adapter,
 					bdaddr_t bdaddr, int8_t rssi,
-					uint8_t evt_type, const char *name,
-					GSList *services, int flags)
+					const char *name, GSList *services,
+					int flags)
 {
 	struct remote_dev_info *dev;
 	gboolean new_dev;
 
 	dev = get_found_dev(adapter, &bdaddr, &new_dev);
 
-	if (new_dev) {
+	if (new_dev)
 		dev->le = TRUE;
-		dev->evt_type = evt_type;
-	} else if (dev->rssi == rssi)
+	else if (dev->rssi == rssi)
 		return;
 
 	dev->rssi = rssi;
diff --git a/src/adapter.h b/src/adapter.h
index 4e15c177e..9406b9b08 100644
--- a/src/adapter.h
+++ b/src/adapter.h
@@ -82,7 +82,6 @@ struct remote_dev_info {
 	char **uuids;
 	size_t uuid_count;
 	GSList *services;
-	uint8_t evt_type;
 	uint8_t bdaddr_type;
 	uint8_t flags;
 };
@@ -118,8 +117,8 @@ 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,
 					bdaddr_t bdaddr, int8_t rssi,
-					uint8_t evt_type, const char *name,
-					GSList *services, int flags);
+					const char *name, GSList *services,
+					int 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,
diff --git a/src/event.c b/src/event.c
index b22344855..d5bf96714 100644
--- a/src/event.c
+++ b/src/event.c
@@ -399,8 +399,8 @@ void btd_event_advertising_report(bdaddr_t *local, le_advertising_info *info)
 	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);
+					eir_data.name, eir_data.services,
+					eir_data.flags);
 
 	free_eir_data(&eir_data);
 }
-- 
2.47.3