[PATCH 1/2] mgmt: Add wrapper for Set SSP

[PATCH 1/2] mgmt: Add wrapper for Set SSP

[Andrzej Kaczmarek]

Wrap mgmt_set_mode for Set SSP into separate function to be consistent
with other calls and have debug printout.
---
 src/mgmt.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/mgmt.c b/src/mgmt.c
index 58aab2d..6dc87e1 100644
--- a/src/mgmt.c
+++ b/src/mgmt.c
@@ -245,6 +245,12 @@ int mgmt_set_pairable(int index, gboolean pairable)
 	return mgmt_set_mode(index, MGMT_OP_SET_PAIRABLE, pairable);
 }
 
+static int mgmt_set_ssp(int index, gboolean ssp)
+{
+	DBG("index %d ssp %d", index, ssp);
+	return mgmt_set_mode(index, MGMT_OP_SET_SSP, ssp);
+}
+
 static inline int mgmt_powered(uint32_t settings)
 {
 	return (settings & MGMT_SETTING_POWERED) != 0;
@@ -333,7 +339,7 @@ static void update_settings(struct btd_adapter *adapter, uint32_t settings)
 		mgmt_set_pairable(index, pairable);
 
 	if (mgmt_ssp(info->supported_settings) && !mgmt_ssp(settings))
-		mgmt_set_mode(index, MGMT_OP_SET_SSP, 1);
+		mgmt_set_ssp(index, TRUE);
 
 	if (mgmt_low_energy(info->supported_settings) &&
 						!mgmt_low_energy(settings))
-- 
1.7.11.3

[PATCH 2/2] mgmt: Add wrapper for Set LE

[Andrzej Kaczmarek]

Wrap mgmt_set_mode for Set LE into separate function to be consistent
with other calls and have debug printout.
---
 src/mgmt.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/mgmt.c b/src/mgmt.c
index 6dc87e1..19e2972 100644
--- a/src/mgmt.c
+++ b/src/mgmt.c
@@ -251,6 +251,12 @@ static int mgmt_set_ssp(int index, gboolean ssp)
 	return mgmt_set_mode(index, MGMT_OP_SET_SSP, ssp);
 }
 
+static int mgmt_set_low_energy(int index, gboolean le)
+{
+	DBG("index %d le %d", index, le);
+	return mgmt_set_mode(index, MGMT_OP_SET_LE, le);
+}
+
 static inline int mgmt_powered(uint32_t settings)
 {
 	return (settings & MGMT_SETTING_POWERED) != 0;
@@ -343,7 +349,7 @@ static void update_settings(struct btd_adapter *adapter, uint32_t settings)
 
 	if (mgmt_low_energy(info->supported_settings) &&
 						!mgmt_low_energy(settings))
-		mgmt_set_mode(index, MGMT_OP_SET_LE, 1);
+		mgmt_set_low_energy(index, TRUE);
 }
 
 static int mgmt_update_powered(struct btd_adapter *adapter,
-- 
1.7.11.3

Re: [PATCH 1/2] mgmt: Add wrapper for Set SSP

[Johan Hedberg]

Hi Andrzej,

On Tue, Aug 28, 2012, Andrzej Kaczmarek wrote:
> Wrap mgmt_set_mode for Set SSP into separate function to be consistent
> with other calls and have debug printout.
> ---
>  src/mgmt.c | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)

Both patches have been applied. Thanks.

Johan