From 9711f979470a33724fbefff8195708218938c581 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Fri, 10 Jan 2014 13:04:02 -0800 Subject: [PATCH] shared: Add general macro for handling endian conversion --- src/shared/hci.c | 5 ----- src/shared/pcap.c | 7 ++----- src/shared/util.h | 5 +++++ 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/shared/hci.c b/src/shared/hci.c index 9114c7b4c..d33320b37 100644 --- a/src/shared/hci.c +++ b/src/shared/hci.c @@ -37,11 +37,6 @@ #include "hci.h" -#define le16_to_cpu(val) (val) -#define le32_to_cpu(val) (val) -#define cpu_to_le16(val) (val) -#define cpu_to_le32(val) (val) - #define BTPROTO_HCI 1 struct sockaddr_hci { sa_family_t hci_family; diff --git a/src/shared/pcap.c b/src/shared/pcap.c index c722db2a8..b38a952ee 100644 --- a/src/shared/pcap.c +++ b/src/shared/pcap.c @@ -29,12 +29,9 @@ #include #include -#include "pcap.h" +#include "src/shared/util.h" -#define le16_to_cpu(val) (val) -#define le32_to_cpu(val) (val) -#define cpu_to_le16(val) (val) -#define cpu_to_le32(val) (val) +#include "pcap.h" struct pcap_hdr { uint32_t magic_number; /* magic number */ diff --git a/src/shared/util.h b/src/shared/util.h index cc03547b5..ac07fb74f 100644 --- a/src/shared/util.h +++ b/src/shared/util.h @@ -24,6 +24,11 @@ #include #include +#define le16_to_cpu(val) (val) +#define le32_to_cpu(val) (val) +#define cpu_to_le16(val) (val) +#define cpu_to_le32(val) (val) + #define PTR_TO_UINT(p) ((unsigned int) ((uintptr_t) (p))) #define UINT_TO_PTR(u) ((void *) ((uintptr_t) (u))) -- 2.47.3