From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Date: Thu, 28 Jun 2012 13:09:22 +0000 (+0300)
Subject: hcidump: Add decoding AMP Assoc data in HCI parser
X-Git-Tag: android-x86-4.4-r3~9607
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1935fd4bc0879b58fe56a3a8c1be47edebfd5967;p=android-x86%2Fexternal-bluetooth-bluez.git

hcidump: Add decoding AMP Assoc data in HCI parser
---

diff --git a/tools/parser/hci.c b/tools/parser/hci.c
index ce3f32c3c..31c0b7e99 100644
--- a/tools/parser/hci.c
+++ b/tools/parser/hci.c
@@ -36,6 +36,7 @@
 #include "parser.h"
 #include "lib/hci.h"
 #include "lib/hci_lib.h"
+#include "lib/amp.h"
 
 static uint16_t manufacturer = DEFAULT_COMPID;
 
@@ -2599,7 +2600,6 @@ static inline void read_local_amp_assoc_dump(int level, struct frame *frm)
 {
 	read_local_amp_assoc_rp *rp = frm->ptr;
 	uint16_t len = btohs(rp->length);
-	int i;
 
 	p_indent(level, frm);
 	printf("status 0x%2.2x handle 0x%2.2x remaining len %d\n",
@@ -2608,16 +2608,7 @@ static inline void read_local_amp_assoc_dump(int level, struct frame *frm)
 		p_indent(level, frm);
 		printf("Error: %s\n", status2str(rp->status));
 	} else {
-		p_indent(level, frm);
-		printf("assoc data");
-		for (i = 0; i < len; i++) {
-			if (!(i % 16)) {
-				printf("\n");
-				p_indent(level, frm);
-			}
-			printf("%2.2x ", rp->fragment[i]);
-		}
-		printf("\n");
+		amp_assoc_dump(level + 1, rp->fragment, len);
 	}
 }