[PATCHv2 bluez 0/2] Definitions needed for hcidump

[PATCHv2 bluez 0/2] Definitions needed for hcidump

[Emeltchenko Andrei]

From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>

Those definitions are used in decoding L2CAP fixed channels

Andrei Emeltchenko (2):
  add definitions for L2CAP fixed channels
  add btohll / htobll macros

 lib/bluetooth.h |    4 ++++
 lib/l2cap.h     |    5 +++++
 2 files changed, 9 insertions(+), 0 deletions(-)

-- 
1.7.4.1

[PATCHv2 bluez 1/2] add definitions for L2CAP fixed channels

[Emeltchenko Andrei]

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 a40cb6c..68593d3 100644
--- a/lib/l2cap.h
+++ b/lib/l2cap.h
@@ -95,6 +95,11 @@ struct l2cap_conninfo {
 #define L2CAP_FEAT_EXT_WINDOW	0x00000100
 #define L2CAP_FEAT_UCD		0x00000200
 
+/* 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

[PATCHv2 bluez 2/2] add btohll / htobll macros

[Emeltchenko Andrei]

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

Re: [PATCHv2 bluez 0/2] Definitions needed for hcidump

[Johan Hedberg]

Hi Andrei,

On Tue, Oct 18, 2011, Emeltchenko Andrei wrote:
> Those definitions are used in decoding L2CAP fixed channels
> 
> Andrei Emeltchenko (2):
>   add definitions for L2CAP fixed channels
>   add btohll / htobll macros
> 
>  lib/bluetooth.h |    4 ++++
>  lib/l2cap.h     |    5 +++++
>  2 files changed, 9 insertions(+), 0 deletions(-)

Both patches have been applied. Thanks

In the future, please start your commit messages with capital letters so
we maintain a consistent commit history.

Johan