From 43fed039a0c6a713b5b653882eb355792b4870e2 Mon Sep 17 00:00:00 2001
From: Johan Hedberg <johan.hedberg@intel.com>
Date: Tue, 4 Dec 2012 10:57:02 +0200
Subject: [PATCH] core: Remove event.c as a middle-man for device found events

---
 src/event.c | 17 -----------------
 src/event.h |  4 ----
 src/mgmt.c  | 12 ++++++++----
 3 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/src/event.c b/src/event.c
index a54bee833..65a506354 100644
--- a/src/event.c
+++ b/src/event.c
@@ -94,23 +94,6 @@ static void update_lastused(bdaddr_t *sba, bdaddr_t *dba, uint8_t dba_type)
 	write_lastused_info(sba, dba, dba_type, tm);
 }
 
-void btd_event_device_found(bdaddr_t *local, bdaddr_t *peer, uint8_t bdaddr_type,
-					int8_t rssi, bool confirm_name,
-					bool legacy, uint8_t *data,
-					uint8_t data_len)
-{
-	struct btd_adapter *adapter;
-
-	adapter = manager_find_adapter(local);
-	if (!adapter) {
-		error("No matching adapter found");
-		return;
-	}
-
-	adapter_update_found_devices(adapter, peer, bdaddr_type, rssi,
-					confirm_name, legacy, data, data_len);
-}
-
 void btd_event_remote_name(const bdaddr_t *local, bdaddr_t *peer,
 							const char *name)
 {
diff --git a/src/event.h b/src/event.h
index 89e94c609..1381c94f7 100644
--- a/src/event.h
+++ b/src/event.h
@@ -22,10 +22,6 @@
  *
  */
 
-void btd_event_device_found(bdaddr_t *local, bdaddr_t *peer,
-				uint8_t bdaddr_type, int8_t rssi,
-				bool confirm_name, bool legacy,
-				uint8_t *data, uint8_t data_len);
 void btd_event_remote_name(const bdaddr_t *local, bdaddr_t *peer,
 							const char *name);
 void btd_event_conn_complete(bdaddr_t *local, bdaddr_t *peer,
diff --git a/src/mgmt.c b/src/mgmt.c
index 2ec78c0c3..e0bc80818 100644
--- a/src/mgmt.c
+++ b/src/mgmt.c
@@ -1679,6 +1679,7 @@ static void mgmt_device_found(int sk, uint16_t index, void *buf, size_t len)
 {
 	struct mgmt_ev_device_found *ev = buf;
 	struct controller_info *info;
+	struct btd_adapter *adapter;
 	char addr[18];
 	uint32_t flags;
 	uint16_t eir_len;
@@ -1705,6 +1706,10 @@ static void mgmt_device_found(int sk, uint16_t index, void *buf, size_t len)
 
 	info = &controllers[index];
 
+	adapter = manager_find_adapter(&info->bdaddr);
+	if (!adapter)
+		return;
+
 	if (eir_len == 0)
 		eir = NULL;
 	else
@@ -1719,10 +1724,9 @@ static void mgmt_device_found(int sk, uint16_t index, void *buf, size_t len)
 	confirm_name = (flags & MGMT_DEV_FOUND_CONFIRM_NAME);
 	legacy = (flags & MGMT_DEV_FOUND_LEGACY_PAIRING);
 
-	btd_event_device_found(&info->bdaddr, &ev->addr.bdaddr,
-						ev->addr.type,
-						ev->rssi, confirm_name,
-						legacy, eir, eir_len);
+	adapter_update_found_devices(adapter, &ev->addr.bdaddr, ev->addr.type,
+					ev->rssi, confirm_name, legacy,
+					eir, eir_len);
 }
 
 static void mgmt_discovering(int sk, uint16_t index, void *buf, size_t len)
-- 
2.47.3