* [PATCHv2 hcidump 0/3] decode fixed channels
@ 2011-10-12 8:31 Emeltchenko Andrei
2011-10-12 8:31 ` [PATCHv2 hcidump 1/3] add btohll macro Emeltchenko Andrei
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Emeltchenko Andrei @ 2011-10-12 8:31 UTC (permalink / raw)
To: linux-bluetooth
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Decode fixed channels in L2CAP Information Response
Changes:
v2: split headers to different patch per request
Andrei Emeltchenko (3):
add btohll macro
add fixed channel definitions
decode fixed channel list info rsp
lib/bluetooth.h | 4 ++++
lib/l2cap.h | 5 +++++
parser/l2cap.c | 28 +++++++++++++++++++++++-----
3 files changed, 32 insertions(+), 5 deletions(-)
--
1.7.4.1
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCHv2 hcidump 1/3] add btohll macro 2011-10-12 8:31 [PATCHv2 hcidump 0/3] decode fixed channels Emeltchenko Andrei @ 2011-10-12 8:31 ` Emeltchenko Andrei 2011-10-12 8:31 ` [PATCHv2 hcidump 2/3] add fixed channel definitions Emeltchenko Andrei 2011-10-12 8:31 ` [PATCHv2 hcidump 3/3] decode fixed channel list info rsp Emeltchenko Andrei 2 siblings, 0 replies; 6+ messages in thread From: Emeltchenko Andrei @ 2011-10-12 8:31 UTC (permalink / raw) To: linux-bluetooth From: Andrei Emeltchenko <andrei.emeltchenko@intel.com> handle 64 bit swap --- lib/bluetooth.h | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/lib/bluetooth.h b/lib/bluetooth.h index 738e07a..b0680e2 100644 --- a/lib/bluetooth.h +++ b/lib/bluetooth.h @@ -93,13 +93,17 @@ enum { #if __BYTE_ORDER == __LITTLE_ENDIAN #define htobs(d) (d) #define htobl(d) (d) +#define htobll(d) (d) #define btohs(d) (d) #define btohl(d) (d) +#define btohll(d) (d) #elif __BYTE_ORDER == __BIG_ENDIAN #define htobs(d) bswap_16(d) #define htobl(d) bswap_32(d) +#define htobll(d) bswap_64(d) #define btohs(d) bswap_16(d) #define btohl(d) bswap_32(d) +#define btohll(d) bswap_64(d) #else #error "Unknown byte order" #endif -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCHv2 hcidump 2/3] add fixed channel definitions 2011-10-12 8:31 [PATCHv2 hcidump 0/3] decode fixed channels Emeltchenko Andrei 2011-10-12 8:31 ` [PATCHv2 hcidump 1/3] add btohll macro Emeltchenko Andrei @ 2011-10-12 8:31 ` Emeltchenko Andrei 2011-10-12 8:31 ` [PATCHv2 hcidump 3/3] decode fixed channel list info rsp Emeltchenko Andrei 2 siblings, 0 replies; 6+ messages in thread From: Emeltchenko Andrei @ 2011-10-12 8:31 UTC (permalink / raw) To: linux-bluetooth From: Andrei Emeltchenko <andrei.emeltchenko@intel.com> --- lib/l2cap.h | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/lib/l2cap.h b/lib/l2cap.h index 47b3dc3..3880551 100644 --- a/lib/l2cap.h +++ b/lib/l2cap.h @@ -139,6 +139,11 @@ struct l2cap_conninfo { #define L2CAP_SDULEN_SIZE 2 +/* L2CAP fixed channels */ +#define L2CAP_FC_L2CAP 0x02 +#define L2CAP_FC_CONNLESS 0x04 +#define L2CAP_FC_A2MP 0x08 + /* L2CAP structures */ typedef struct { uint16_t len; -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCHv2 hcidump 3/3] decode fixed channel list info rsp 2011-10-12 8:31 [PATCHv2 hcidump 0/3] decode fixed channels Emeltchenko Andrei 2011-10-12 8:31 ` [PATCHv2 hcidump 1/3] add btohll macro Emeltchenko Andrei 2011-10-12 8:31 ` [PATCHv2 hcidump 2/3] add fixed channel definitions Emeltchenko Andrei @ 2011-10-12 8:31 ` Emeltchenko Andrei 2011-10-14 19:15 ` Johan Hedberg 2 siblings, 1 reply; 6+ messages in thread From: Emeltchenko Andrei @ 2011-10-12 8:31 UTC (permalink / raw) To: linux-bluetooth From: Andrei Emeltchenko <andrei.emeltchenko@intel.com> Decode fixed channels in information response < ACL data: handle 1 flags 0x00 dlen 10 L2CAP(s): Info req: type 3 > ACL data: handle 1 flags 0x02 dlen 20 L2CAP(s): Info rsp: type 3 result 0 Fixed channel list 0x000a L2CAP Signalling Channel AMP Manager Protocol --- parser/l2cap.c | 28 +++++++++++++++++++++++----- 1 files changed, 23 insertions(+), 5 deletions(-) diff --git a/parser/l2cap.c b/parser/l2cap.c index 6a5a4b2..8a76021 100644 --- a/parser/l2cap.c +++ b/parser/l2cap.c @@ -61,10 +61,12 @@ static cid_info cid_table[2][CID_TABLE_SIZE]; #define DCID cid_table[1] /* Can we move this to l2cap.h? */ -static struct { +struct features { char *name; int flag; -} l2cap_features[] = { +}; + +static struct features l2cap_features[] = { { "Flow control mode", L2CAP_FEAT_FLOWCTL }, { "Retransmission mode", L2CAP_FEAT_RETRANS }, { "Bi-directional QoS", L2CAP_FEAT_BIDIR_QOS }, @@ -78,6 +80,13 @@ static struct { { 0 } }; +static struct features l2cap_fix_chan[] = { + { "L2CAP Signalling Channel", L2CAP_FC_L2CAP }, + { "L2CAP Connless", L2CAP_FC_CONNLESS }, + { "AMP Manager Protocol", L2CAP_FC_A2MP }, + { 0 } +}; + static struct frame *add_handle(uint16_t handle) { register handle_info *t = handle_table; @@ -241,6 +250,8 @@ static uint32_t get_val(uint8_t *ptr, uint8_t len) return btohs(bt_get_unaligned((uint16_t *) ptr)); case 4: return btohl(bt_get_unaligned((uint32_t *) ptr)); + case 8: + return btohll(bt_get_unaligned((uint64_t *) ptr)); } return 0; } @@ -727,7 +738,7 @@ static inline void echo_rsp(int level, l2cap_cmd_hdr *cmd, struct frame *frm) static void info_opt(int level, int type, void *ptr, int len) { - uint32_t mask; + uint64_t mask; int i; p_indent(level, 0); @@ -738,7 +749,7 @@ static void info_opt(int level, int type, void *ptr, int len) break; case 0x0002: mask = get_val(ptr, len); - printf("Extended feature mask 0x%4.4x\n", mask); + printf("Extended feature mask 0x%4.4x\n", (uint32_t) mask); if (parser.flags & DUMP_VERBOSE) for (i=0; l2cap_features[i].name; i++) if (mask & l2cap_features[i].flag) { @@ -747,7 +758,14 @@ static void info_opt(int level, int type, void *ptr, int len) } break; case 0x0003: - printf("Fixed channel list\n"); + mask = get_val(ptr, len); + printf("Fixed channel list 0x%4.4llx\n", mask); + if (parser.flags & DUMP_VERBOSE) + for (i=0; l2cap_fix_chan[i].name; i++) + if (mask & l2cap_fix_chan[i].flag) { + p_indent(level + 1, 0); + printf("%s\n", l2cap_fix_chan[i].name); + } break; default: printf("Unknown (len %d)\n", len); -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCHv2 hcidump 3/3] decode fixed channel list info rsp 2011-10-12 8:31 ` [PATCHv2 hcidump 3/3] decode fixed channel list info rsp Emeltchenko Andrei @ 2011-10-14 19:15 ` Johan Hedberg 2011-10-17 8:22 ` Andrei Emeltchenko 0 siblings, 1 reply; 6+ messages in thread From: Johan Hedberg @ 2011-10-14 19:15 UTC (permalink / raw) To: Emeltchenko Andrei; +Cc: linux-bluetooth Hi Andrei, On Wed, Oct 12, 2011, Emeltchenko Andrei wrote: > @@ -241,6 +250,8 @@ static uint32_t get_val(uint8_t *ptr, uint8_t len) > return btohs(bt_get_unaligned((uint16_t *) ptr)); > case 4: > return btohl(bt_get_unaligned((uint32_t *) ptr)); > + case 8: > + return btohll(bt_get_unaligned((uint64_t *) ptr)); > } > return 0; > } Looks to me like you've forgotten to update the return type of get_val() from uint32_t to uint64_t. Other than that I haven't spotted any major issues with this patch series. Johan ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCHv2 hcidump 3/3] decode fixed channel list info rsp 2011-10-14 19:15 ` Johan Hedberg @ 2011-10-17 8:22 ` Andrei Emeltchenko 0 siblings, 0 replies; 6+ messages in thread From: Andrei Emeltchenko @ 2011-10-17 8:22 UTC (permalink / raw) To: linux-bluetooth Hi Johan, On Fri, Oct 14, 2011 at 10:15:54PM +0300, Johan Hedberg wrote: > Hi Andrei, > > On Wed, Oct 12, 2011, Emeltchenko Andrei wrote: > > @@ -241,6 +250,8 @@ static uint32_t get_val(uint8_t *ptr, uint8_t len) > > return btohs(bt_get_unaligned((uint16_t *) ptr)); > > case 4: > > return btohl(bt_get_unaligned((uint32_t *) ptr)); > > + case 8: > > + return btohll(bt_get_unaligned((uint64_t *) ptr)); > > } > > return 0; > > } > > Looks to me like you've forgotten to update the return type of get_val() > from uint32_t to uint64_t. Other than that I haven't spotted any major > issues with this patch series. This shall be fixed in my v3 patch series. Best regards Andrei Emeltchenko ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-10-17 8:22 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-10-12 8:31 [PATCHv2 hcidump 0/3] decode fixed channels Emeltchenko Andrei 2011-10-12 8:31 ` [PATCHv2 hcidump 1/3] add btohll macro Emeltchenko Andrei 2011-10-12 8:31 ` [PATCHv2 hcidump 2/3] add fixed channel definitions Emeltchenko Andrei 2011-10-12 8:31 ` [PATCHv2 hcidump 3/3] decode fixed channel list info rsp Emeltchenko Andrei 2011-10-14 19:15 ` Johan Hedberg 2011-10-17 8:22 ` Andrei Emeltchenko
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox