Diff between b92687ef244760448b8a4435bf3dc16cc61699cf and 36c9b884fa7db2642306c3ba1ca99ebcdc671f68

Changed Files

File Additions Deletions Status
src/device.c +0 -9 modified
src/device.h +0 -1 modified
src/event.c +0 -20 modified
src/event.h +0 -2 modified

Full Patch

diff --git a/src/device.c b/src/device.c
index 29b76cb..254aa77 100644
--- a/src/device.c
+++ b/src/device.c
@@ -3424,15 +3424,6 @@ DBusMessage *device_create_bonding(struct btd_device *device,
 	return NULL;
 }
 
-void device_simple_pairing_complete(struct btd_device *device, uint8_t status)
-{
-	struct authentication_req *auth = device->authr;
-
-	if (auth && (auth->type == AUTH_TYPE_NOTIFY_PASSKEY
-		     || auth->type == AUTH_TYPE_NOTIFY_PINCODE) && auth->agent)
-		agent_cancel(auth->agent);
-}
-
 static void device_auth_req_free(struct btd_device *device)
 {
 	if (device->authr)
diff --git a/src/device.h b/src/device.h
index 1e3dced..7c8765d 100644
--- a/src/device.h
+++ b/src/device.h
@@ -81,7 +81,6 @@ gboolean device_is_connected(struct btd_device *device);
 DBusMessage *device_create_bonding(struct btd_device *device, DBusMessage *msg,
 				const char *agent_path, uint8_t capability);
 void device_bonding_complete(struct btd_device *device, uint8_t status);
-void device_simple_pairing_complete(struct btd_device *device, uint8_t status);
 gboolean device_is_creating(struct btd_device *device, const char *sender);
 gboolean device_is_bonding(struct btd_device *device, const char *sender);
 void device_cancel_bonding(struct btd_device *device, uint8_t status);
diff --git a/src/event.c b/src/event.c
index 6f5f6f1..f3cd1af 100644
--- a/src/event.c
+++ b/src/event.c
@@ -141,26 +141,6 @@ int btd_event_user_notify(bdaddr_t *sba, bdaddr_t *dba, uint32_t passkey,
 	return device_notify_passkey(device, passkey, entered);
 }
 
-void btd_event_simple_pairing_complete(bdaddr_t *local, bdaddr_t *peer,
-								uint8_t status)
-{
-	struct btd_adapter *adapter;
-	struct btd_device *device;
-	gboolean create;
-
-	DBG("status=%02x", status);
-
-	create = status ? FALSE : TRUE;
-
-	if (!get_adapter_and_device(local, peer, &adapter, &device, create))
-		return;
-
-	if (!device)
-		return;
-
-	device_simple_pairing_complete(device, status);
-}
-
 static void update_lastused(bdaddr_t *sba, bdaddr_t *dba, uint8_t dba_type)
 {
 	time_t t;
diff --git a/src/event.h b/src/event.h
index bae3ebb..f9a2798 100644
--- a/src/event.h
+++ b/src/event.h
@@ -34,8 +34,6 @@ void btd_event_conn_complete(bdaddr_t *local, bdaddr_t *peer,
 					uint32_t class);
 void btd_event_conn_failed(bdaddr_t *local, bdaddr_t *peer, uint8_t status);
 void btd_event_disconn_complete(bdaddr_t *local, bdaddr_t *peer);
-void btd_event_simple_pairing_complete(bdaddr_t *local, bdaddr_t *peer,
-							uint8_t status);
 void btd_event_returned_link_key(bdaddr_t *local, bdaddr_t *peer);
 int btd_event_user_confirm(bdaddr_t *sba, bdaddr_t *dba, uint32_t passkey);
 int btd_event_user_passkey(bdaddr_t *sba, bdaddr_t *dba);