diff options
Diffstat (limited to 'meta-oe/recipes-connectivity/bluez/bluez-hcidump-2.0/remove.ntoh64.definition.patch')
-rw-r--r-- | meta-oe/recipes-connectivity/bluez/bluez-hcidump-2.0/remove.ntoh64.definition.patch | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/meta-oe/recipes-connectivity/bluez/bluez-hcidump-2.0/remove.ntoh64.definition.patch b/meta-oe/recipes-connectivity/bluez/bluez-hcidump-2.0/remove.ntoh64.definition.patch deleted file mode 100644 index 994326514..000000000 --- a/meta-oe/recipes-connectivity/bluez/bluez-hcidump-2.0/remove.ntoh64.definition.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | Upstream-Status: Accepted, already in git, expected to be included in next version after 2.0 | ||
2 | From 95ea4ff5c9c7dbda2f3faaef4e5cd46d542a48c8 Mon Sep 17 00:00:00 2001 | ||
3 | From: Anderson Lizardo <anderson.lizardo@openbossa.org> | ||
4 | Date: Fri, 18 Mar 2011 15:10:19 -0400 | ||
5 | Subject: [PATCH] Fix compilation against latest BlueZ | ||
6 | |||
7 | BlueZ now has ntoh64()/hton64() functions in bluetooth.h, therefore the | ||
8 | hcidump local copy is not necessary. | ||
9 | --- | ||
10 | src/hcidump.c | 16 ---------------- | ||
11 | 1 files changed, 0 insertions(+), 16 deletions(-) | ||
12 | |||
13 | diff --git a/src/hcidump.c b/src/hcidump.c | ||
14 | index af086c7..2023130 100644 | ||
15 | --- a/src/hcidump.c | ||
16 | +++ b/src/hcidump.c | ||
17 | @@ -50,22 +50,6 @@ | ||
18 | #include "parser/parser.h" | ||
19 | #include "parser/sdp.h" | ||
20 | |||
21 | -#if __BYTE_ORDER == __LITTLE_ENDIAN | ||
22 | -static inline uint64_t ntoh64(uint64_t n) | ||
23 | -{ | ||
24 | - uint64_t h; | ||
25 | - uint64_t tmp = ntohl(n & 0x00000000ffffffff); | ||
26 | - h = ntohl(n >> 32); | ||
27 | - h |= tmp << 32; | ||
28 | - return h; | ||
29 | -} | ||
30 | -#elif __BYTE_ORDER == __BIG_ENDIAN | ||
31 | -#define ntoh64(x) (x) | ||
32 | -#else | ||
33 | -#error "Unknown byte order" | ||
34 | -#endif | ||
35 | -#define hton64(x) ntoh64(x) | ||
36 | - | ||
37 | #define SNAP_LEN HCI_MAX_FRAME_SIZE | ||
38 | #define DEFAULT_PORT "10839"; | ||
39 | |||
40 | -- | ||
41 | 1.7.4.4 | ||
42 | |||