You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
58 lines
1.7 KiB
58 lines
1.7 KiB
14 years ago
|
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
|
||
|
|
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||
|
|
#
|
||
|
|
# Filename: package/.../bluez-hcidump/0005-Fix-compilation-against-latest-BlueZ.patch
|
||
|
|
# Copyright (C) 2011 The OpenSDE Project
|
||
|
|
#
|
||
|
|
# More information can be found in the files COPYING and README.
|
||
|
|
#
|
||
|
|
# This patch file is dual-licensed. It is available under the license the
|
||
|
|
# patched project is licensed under, as long as it is an OpenSource license
|
||
|
|
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||
|
|
# of the GNU General Public License as published by the Free Software
|
||
|
|
# Foundation; either version 2 of the License, or (at your option) any later
|
||
|
|
# version.
|
||
|
|
# --- SDE-COPYRIGHT-NOTE-END ---
|
||
|
|
|
||
|
|
From 79a379cf1d576f7dd02c3c9cc25d418d856bf9ad Mon Sep 17 00:00:00 2001
|
||
|
|
From: Anderson Lizardo <anderson.lizardo@openbossa.org>
|
||
|
|
Date: Fri, 18 Mar 2011 15:10:19 -0400
|
||
|
|
Subject: [PATCH 5/6] Fix compilation against latest BlueZ
|
||
|
|
|
||
|
|
BlueZ now has ntoh64()/hton64() functions in bluetooth.h, therefore the
|
||
|
|
hcidump local copy is not necessary.
|
||
|
|
---
|
||
|
|
src/hcidump.c | 16 ----------------
|
||
|
|
1 files changed, 0 insertions(+), 16 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/hcidump.c b/src/hcidump.c
|
||
|
|
index b344489..2f406db 100644
|
||
|
|
--- a/src/hcidump.c
|
||
|
|
+++ b/src/hcidump.c
|
||
|
|
@@ -50,22 +50,6 @@
|
||
|
|
#include "parser/parser.h"
|
||
|
|
#include "parser/sdp.h"
|
||
|
|
|
||
|
|
-#if __BYTE_ORDER == __LITTLE_ENDIAN
|
||
|
|
-static inline uint64_t ntoh64(uint64_t n)
|
||
|
|
-{
|
||
|
|
- uint64_t h;
|
||
|
|
- uint64_t tmp = ntohl(n & 0x00000000ffffffff);
|
||
|
|
- h = ntohl(n >> 32);
|
||
|
|
- h |= tmp << 32;
|
||
|
|
- return h;
|
||
|
|
-}
|
||
|
|
-#elif __BYTE_ORDER == __BIG_ENDIAN
|
||
|
|
-#define ntoh64(x) (x)
|
||
|
|
-#else
|
||
|
|
-#error "Unknown byte order"
|
||
|
|
-#endif
|
||
|
|
-#define hton64(x) ntoh64(x)
|
||
|
|
-
|
||
|
|
#define SNAP_LEN HCI_MAX_FRAME_SIZE
|
||
|
|
#define DEFAULT_PORT "10839";
|
||
|
|
|
||
|
|
--
|
||
|
|
1.7.2.3
|
||
|
|
|