From e90a074333c8c935841a63709e1465b214703400 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Fri, 10 Jan 2014 13:05:23 -0800 Subject: [PATCH] emulator: Make use of generic endian conversion macros --- emulator/amp.c | 6 +----- emulator/btdev.c | 6 +----- emulator/bthost.c | 6 +----- emulator/le.c | 6 +----- 4 files changed, 4 insertions(+), 20 deletions(-) diff --git a/emulator/amp.c b/emulator/amp.c index 714854b75..ab7f9debe 100644 --- a/emulator/amp.c +++ b/emulator/amp.c @@ -36,16 +36,12 @@ #include #include +#include "src/shared/util.h" #include "monitor/mainloop.h" #include "monitor/bt.h" #include "amp.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 PHY_MODE_IDLE 0x00 #define PHY_MODE_INITIATOR 0x01 #define PHY_MODE_ACCEPTOR 0x02 diff --git a/emulator/btdev.c b/emulator/btdev.c index 90df0f38f..0d0b36284 100644 --- a/emulator/btdev.c +++ b/emulator/btdev.c @@ -32,14 +32,10 @@ #include #include +#include "src/shared/util.h" #include "monitor/bt.h" #include "btdev.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 has_bredr(btdev) (!((btdev)->features[4] & 0x20)) #define has_le(btdev) (!!((btdev)->features[4] & 0x40)) diff --git a/emulator/bthost.c b/emulator/bthost.c index ba59431a9..96d375f23 100644 --- a/emulator/bthost.c +++ b/emulator/bthost.c @@ -35,6 +35,7 @@ #include "bluetooth/bluetooth.h" +#include "src/shared/util.h" #include "monitor/bt.h" #include "bthost.h" @@ -43,11 +44,6 @@ #define acl_handle(h) (h & 0x0fff) #define acl_flags(h) (h >> 12) -#define le16_to_cpu(val) (val) -#define le32_to_cpu(val) (val) -#define cpu_to_le16(val) (val) -#define cpu_to_le32(val) (val) - struct cmd { struct cmd *next; struct cmd *prev; diff --git a/emulator/le.c b/emulator/le.c index b3a4bc457..62b231da9 100644 --- a/emulator/le.c +++ b/emulator/le.c @@ -36,16 +36,12 @@ #include #include +#include "src/shared/util.h" #include "monitor/mainloop.h" #include "monitor/bt.h" #include "le.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 WHITE_LIST_SIZE 16 struct bt_le { -- 2.47.3