[PATCH 1/2] Add master/slave parsing for le_conn_complete event

[PATCH 1/2] Add master/slave parsing for le_conn_complete event

[Ville Tervo]

---
 parser/hci.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/parser/hci.c b/parser/hci.c
index 250ba58..7f23605 100644
--- a/parser/hci.c
+++ b/parser/hci.c
@@ -3239,7 +3239,8 @@ static inline void evt_le_conn_complete_dump(int level, struct frame *frm)
 	evt_le_connection_complete *evt = frm->ptr;
 
 	p_indent(level, frm);
-	printf("status 0x%2.2x handle %d\n", evt->status, btohs(evt->handle));
+	printf("status 0x%2.2x handle %d, role %s\n",
+		evt->status, btohs(evt->handle), evt->role?"slave":"master");
 }
 
 static inline void le_meta_ev_dump(int level, struct frame *frm)
-- 
1.7.1

[PATCH 2/2] Fix missing comma in cmd_le_str

[Ville Tervo]

---
 parser/hci.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/parser/hci.c b/parser/hci.c
index 7f23605..863afd9 100644
--- a/parser/hci.c
+++ b/parser/hci.c
@@ -381,7 +381,7 @@ static char *cmd_testing_str[CMD_TESTING_NUM + 1] = {
 	"Unknown",
 };
 
-#define CMD_LE_NUM 30
+#define CMD_LE_NUM 31
 static char *cmd_le_str[CMD_LE_NUM + 1] = {
 	"Unknown",
 	"LE Set Event Mask",
@@ -403,7 +403,7 @@ static char *cmd_le_str[CMD_LE_NUM + 1] = {
 	"LE Add Device To White List",
 	"LE Remove Device From White List",
 	"LE Connection Update",
-	"LE Set Host Channel Classification"
+	"LE Set Host Channel Classification",
 	"LE Read Channel Map",
 	"LE Read Remote Used Features",
 	"LE Encrypt",
-- 
1.7.1

Re: [PATCH 1/2] Add master/slave parsing for le_conn_complete event

[Johan Hedberg]

Hi Ville,

On Wed, Sep 29, 2010, Ville Tervo wrote:
> ---
>  parser/hci.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)

Thanks for the patch. I've pushed it to the upstream hcidump tree with
the following whitespace fix:

> +		evt->status, btohs(evt->handle), evt->role?"slave":"master");

It should be 'evt->role ? "slave" : "master"' i.e. you've got some
missing spaces there.

Johan

Re: [PATCH 2/2] Fix missing comma in cmd_le_str

[Johan Hedberg]

Hi Ville,

On Wed, Sep 29, 2010, Ville Tervo wrote:
> ---
>  parser/hci.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)

Thanks. This one has also been pushed upstream.

Johan