OpenSDE Packages Database (without history before r20070)
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.

57 lines
1.7 KiB

  1. # --- SDE-COPYRIGHT-NOTE-BEGIN ---
  2. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  3. #
  4. # Filename: package/.../bluez-hcidump/0005-Fix-compilation-against-latest-BlueZ.patch
  5. # Copyright (C) 2011 The OpenSDE Project
  6. #
  7. # More information can be found in the files COPYING and README.
  8. #
  9. # This patch file is dual-licensed. It is available under the license the
  10. # patched project is licensed under, as long as it is an OpenSource license
  11. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12. # of the GNU General Public License as published by the Free Software
  13. # Foundation; either version 2 of the License, or (at your option) any later
  14. # version.
  15. # --- SDE-COPYRIGHT-NOTE-END ---
  16. From 79a379cf1d576f7dd02c3c9cc25d418d856bf9ad Mon Sep 17 00:00:00 2001
  17. From: Anderson Lizardo <anderson.lizardo@openbossa.org>
  18. Date: Fri, 18 Mar 2011 15:10:19 -0400
  19. Subject: [PATCH 5/6] Fix compilation against latest BlueZ
  20. BlueZ now has ntoh64()/hton64() functions in bluetooth.h, therefore the
  21. hcidump local copy is not necessary.
  22. ---
  23. src/hcidump.c | 16 ----------------
  24. 1 files changed, 0 insertions(+), 16 deletions(-)
  25. diff --git a/src/hcidump.c b/src/hcidump.c
  26. index b344489..2f406db 100644
  27. --- a/src/hcidump.c
  28. +++ b/src/hcidump.c
  29. @@ -50,22 +50,6 @@
  30. #include "parser/parser.h"
  31. #include "parser/sdp.h"
  32. -#if __BYTE_ORDER == __LITTLE_ENDIAN
  33. -static inline uint64_t ntoh64(uint64_t n)
  34. -{
  35. - uint64_t h;
  36. - uint64_t tmp = ntohl(n & 0x00000000ffffffff);
  37. - h = ntohl(n >> 32);
  38. - h |= tmp << 32;
  39. - return h;
  40. -}
  41. -#elif __BYTE_ORDER == __BIG_ENDIAN
  42. -#define ntoh64(x) (x)
  43. -#else
  44. -#error "Unknown byte order"
  45. -#endif
  46. -#define hton64(x) ntoh64(x)
  47. -
  48. #define SNAP_LEN HCI_MAX_FRAME_SIZE
  49. #define DEFAULT_PORT "10839";
  50. --
  51. 1.7.2.3