From 45dd8276744c31241cc4e10d8d0c5182b204b2fd Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Fri, 2 Apr 2021 07:42:09 +0200
Subject: [PATCH] monitor: Update RSSI printing function

---
 monitor/broadcom.c |  2 +-
 monitor/packet.c   | 13 +++++++------
 monitor/packet.h   |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/monitor/broadcom.c b/monitor/broadcom.c
index 81908d549..b144032c3 100644
--- a/monitor/broadcom.c
+++ b/monitor/broadcom.c
@@ -39,7 +39,7 @@ static void print_handle(uint16_t handle)
 
 static void print_rssi(int8_t rssi)
 {
-	packet_print_rssi(rssi);
+	packet_print_rssi("RSSI", rssi);
 }
 
 static void print_sco_routing(uint8_t routing)
diff --git a/monitor/packet.c b/monitor/packet.c
index 2fdea532d..d729a01cc 100644
--- a/monitor/packet.c
+++ b/monitor/packet.c
@@ -2185,10 +2185,7 @@ static void print_adv_filter_policy(const char *label, uint8_t value)
 
 static void print_rssi(int8_t rssi)
 {
-	if ((uint8_t) rssi == 0x99 || rssi == 127)
-		print_field("RSSI: invalid (0x%2.2x)", (uint8_t) rssi);
-	else
-		print_field("RSSI: %d dBm (0x%2.2x)", rssi, (uint8_t) rssi);
+	packet_print_rssi("RSSI", rssi);
 }
 
 static void print_slot_625(const char *label, uint16_t value)
@@ -3798,9 +3795,13 @@ void packet_print_handle(uint16_t handle)
 	print_handle_native(handle);
 }
 
-void packet_print_rssi(int8_t rssi)
+void packet_print_rssi(const char *label, int8_t rssi)
 {
-	print_rssi(rssi);
+	if ((uint8_t) rssi == 0x99 || rssi == 127)
+		print_field("%s: invalid (0x%2.2x)", label, (uint8_t) rssi);
+	else
+		print_field("%s: %d dBm (0x%2.2x)", label, rssi,
+							(uint8_t) rssi);
 }
 
 void packet_print_ad(const void *data, uint8_t size)
diff --git a/monitor/packet.h b/monitor/packet.h
index afbe10f5b..f859fa945 100644
--- a/monitor/packet.h
+++ b/monitor/packet.h
@@ -39,7 +39,7 @@ void packet_print_version(const char *label, uint8_t version,
 void packet_print_company(const char *label, uint16_t company);
 void packet_print_addr(const char *label, const void *data, bool random);
 void packet_print_handle(uint16_t handle);
-void packet_print_rssi(int8_t rssi);
+void packet_print_rssi(const char *label, int8_t rssi);
 void packet_print_ad(const void *data, uint8_t size);
 void packet_print_features_lmp(const uint8_t *features, uint8_t page);
 void packet_print_features_ll(const uint8_t *features);
-- 
2.47.3