From 67f75bfa2de581982017df205ad3994b3f28bcde Mon Sep 17 00:00:00 2001
From: Johan Hedberg <johan.hedberg@intel.com>
Date: Tue, 17 Jan 2012 21:39:55 +0200
Subject: [PATCH] mgmt: Remove ev_remote name and update event codes

---
 lib/mgmt.h        | 12 +++---------
 mgmt/main.c       | 20 --------------------
 plugins/mgmtops.c | 27 ---------------------------
 3 files changed, 3 insertions(+), 56 deletions(-)

diff --git a/lib/mgmt.h b/lib/mgmt.h
index 83f9f77fa..fa684e826 100644
--- a/lib/mgmt.h
+++ b/lib/mgmt.h
@@ -363,20 +363,14 @@ struct mgmt_ev_device_found {
 	uint8_t eir[HCI_MAX_EIR_LENGTH];
 } __packed;
 
-#define MGMT_EV_REMOTE_NAME		0x0012
-struct mgmt_ev_remote_name {
-	bdaddr_t bdaddr;
-	uint8_t name[MGMT_MAX_NAME_LENGTH];
-} __packed;
-
-#define MGMT_EV_DISCOVERING		0x0013
+#define MGMT_EV_DISCOVERING		0x0012
 
-#define MGMT_EV_DEVICE_BLOCKED		0x0014
+#define MGMT_EV_DEVICE_BLOCKED		0x0013
 struct mgmt_ev_device_blocked {
 	bdaddr_t bdaddr;
 } __packed;
 
-#define MGMT_EV_DEVICE_UNBLOCKED	0x0015
+#define MGMT_EV_DEVICE_UNBLOCKED	0x0014
 struct mgmt_ev_device_unblocked {
 	bdaddr_t bdaddr;
 } __packed;
diff --git a/mgmt/main.c b/mgmt/main.c
index 45d989dc2..d13d19fac 100644
--- a/mgmt/main.c
+++ b/mgmt/main.c
@@ -582,24 +582,6 @@ static int mgmt_device_found(int mgmt_sk, uint16_t index,
 	return 0;
 }
 
-static int mgmt_remote_name(int mgmt_sk, uint16_t index,
-				struct mgmt_ev_remote_name *ev, uint16_t len)
-{
-	if (len != sizeof(*ev)) {
-		fprintf(stderr,
-			"Invalid remote_name event length (%u bytes)\n", len);
-		return -EINVAL;
-	}
-
-	if (monitor || discovery) {
-		char addr[18];
-		ba2str(&ev->bdaddr, addr);
-		printf("hci%u %s name %s\n", index, addr, ev->name);
-	}
-
-	return 0;
-}
-
 static void pin_rsp(int mgmt_sk, uint16_t op, uint16_t id, uint8_t status,
 				void *rsp, uint16_t len, void *user_data)
 {
@@ -819,8 +801,6 @@ static int mgmt_handle_event(int mgmt_sk, uint16_t ev, uint16_t index,
 		return mgmt_name_changed(mgmt_sk, index, data, len);
 	case MGMT_EV_DEVICE_FOUND:
 		return mgmt_device_found(mgmt_sk, index, data, len);
-	case MGMT_EV_REMOTE_NAME:
-		return mgmt_remote_name(mgmt_sk, index, data, len);
 	case MGMT_EV_PIN_CODE_REQUEST:
 		return mgmt_request_pin(mgmt_sk, index, data, len);
 	case MGMT_EV_USER_CONFIRM_REQUEST:
diff --git a/plugins/mgmtops.c b/plugins/mgmtops.c
index 8314581f6..6d98ad952 100644
--- a/plugins/mgmtops.c
+++ b/plugins/mgmtops.c
@@ -1311,30 +1311,6 @@ static void mgmt_device_found(int sk, uint16_t index, void *buf, size_t len)
 					eir, HCI_MAX_EIR_LENGTH);
 }
 
-static void mgmt_remote_name(int sk, uint16_t index, void *buf, size_t len)
-{
-	struct mgmt_ev_remote_name *ev = buf;
-	struct controller_info *info;
-	char addr[18];
-
-	if (len < sizeof(*ev)) {
-		error("Too small mgmt_remote_name packet");
-		return;
-	}
-
-	if (index > max_index) {
-		error("Unexpected index %u in remote_name event", index);
-		return;
-	}
-
-	info = &controllers[index];
-
-	ba2str(&ev->bdaddr, addr);
-	DBG("hci%u addr %s, name %s", index, addr, ev->name);
-
-	btd_event_remote_name(&info->bdaddr, &ev->bdaddr, (char *) ev->name);
-}
-
 static void mgmt_discovering(int sk, uint16_t index, void *buf, size_t len)
 {
 	struct mgmt_mode *ev = buf;
@@ -1499,9 +1475,6 @@ static gboolean mgmt_event(GIOChannel *io, GIOCondition cond, gpointer user_data
 	case MGMT_EV_DEVICE_FOUND:
 		mgmt_device_found(sk, index, buf + MGMT_HDR_SIZE, len);
 		break;
-	case MGMT_EV_REMOTE_NAME:
-		mgmt_remote_name(sk, index, buf + MGMT_HDR_SIZE, len);
-		break;
 	case MGMT_EV_DISCOVERING:
 		mgmt_discovering(sk, index, buf + MGMT_HDR_SIZE, len);
 		break;
-- 
2.47.3