From 508e129d75782f2dfe0edf05973c24af6b91f633 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Thu, 25 Sep 2014 14:39:10 +0200 Subject: [PATCH] build: Move hciemu.c and hciemu.h into emulator directory --- Makefile.am | 1 - Makefile.tools | 6 ++++++ android/Makefile.am | 6 ++++-- android/ipc-tester.c | 2 +- android/tester-main.h | 2 +- {src/shared => emulator}/hciemu.c | 2 +- {src/shared => emulator}/hciemu.h | 0 tools/gap-tester.c | 2 +- tools/l2cap-tester.c | 2 +- tools/mgmt-tester.c | 2 +- tools/rfcomm-tester.c | 2 +- tools/sco-tester.c | 2 +- tools/smp-tester.c | 2 +- 13 files changed, 19 insertions(+), 12 deletions(-) rename {src/shared => emulator}/hciemu.c (99%) rename {src/shared => emulator}/hciemu.h (100%) diff --git a/Makefile.am b/Makefile.am index a2e89c790..b2fcf4ca8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -104,7 +104,6 @@ shared_sources = src/shared/io.h src/shared/timeout.h \ src/shared/crypto.h src/shared/crypto.c \ src/shared/ringbuf.h src/shared/ringbuf.c \ src/shared/tester.h src/shared/tester.c \ - src/shared/hciemu.h src/shared/hciemu.c \ src/shared/hci.h src/shared/hci.c \ src/shared/hfp.h src/shared/hfp.c \ src/shared/uhid.h src/shared/uhid.c \ diff --git a/Makefile.tools b/Makefile.tools index 8f744fe19..d90128431 100644 --- a/Makefile.tools +++ b/Makefile.tools @@ -62,6 +62,7 @@ tools_3dsp_SOURCES = tools/3dsp.c monitor/bt.h tools_3dsp_LDADD = src/libshared-mainloop.la tools_mgmt_tester_SOURCES = tools/mgmt-tester.c monitor/bt.h \ + emulator/hciemu.h emulator/hciemu.c \ emulator/btdev.h emulator/btdev.c \ emulator/bthost.h emulator/bthost.c \ emulator/smp.c @@ -69,6 +70,7 @@ tools_mgmt_tester_LDADD = lib/libbluetooth-internal.la \ src/libshared-glib.la @GLIB_LIBS@ tools_l2cap_tester_SOURCES = tools/l2cap-tester.c monitor/bt.h \ + emulator/hciemu.h emulator/hciemu.c \ emulator/btdev.h emulator/btdev.c \ emulator/bthost.h emulator/bthost.c \ emulator/smp.c @@ -76,6 +78,7 @@ tools_l2cap_tester_LDADD = lib/libbluetooth-internal.la \ src/libshared-glib.la @GLIB_LIBS@ tools_rfcomm_tester_SOURCES = tools/rfcomm-tester.c monitor/bt.h \ + emulator/hciemu.h emulator/hciemu.c \ emulator/btdev.h emulator/btdev.c \ emulator/bthost.h emulator/bthost.c \ emulator/smp.c @@ -83,6 +86,7 @@ tools_rfcomm_tester_LDADD = lib/libbluetooth-internal.la \ src/libshared-glib.la @GLIB_LIBS@ tools_smp_tester_SOURCES = tools/smp-tester.c monitor/bt.h \ + emulator/hciemu.h emulator/hciemu.c \ emulator/btdev.h emulator/btdev.c \ emulator/bthost.h emulator/bthost.c \ emulator/smp.c @@ -90,6 +94,7 @@ tools_smp_tester_LDADD = lib/libbluetooth-internal.la \ src/libshared-glib.la @GLIB_LIBS@ tools_gap_tester_SOURCES = tools/gap-tester.c monitor/bt.h \ + emulator/hciemu.h emulator/hciemu.c \ emulator/btdev.h emulator/btdev.c \ emulator/bthost.h emulator/bthost.c \ emulator/smp.c @@ -99,6 +104,7 @@ tools_gap_tester_LDADD = lib/libbluetooth-internal.la \ @GLIB_LIBS@ @DBUS_LIBS@ tools_sco_tester_SOURCES = tools/sco-tester.c monitor/bt.h \ + emulator/hciemu.h emulator/hciemu.c \ emulator/btdev.h emulator/btdev.c \ emulator/bthost.h emulator/bthost.c \ emulator/smp.c diff --git a/android/Makefile.am b/android/Makefile.am index 214082c18..3e292cfd7 100644 --- a/android/Makefile.am +++ b/android/Makefile.am @@ -138,7 +138,8 @@ android_haltest_LDFLAGS = -pthread -ldl -lm noinst_PROGRAMS += android/android-tester -android_android_tester_SOURCES = emulator/btdev.h emulator/btdev.c \ +android_android_tester_SOURCES = emulator/hciemu.h emulator/hciemu.c \ + emulator/btdev.h emulator/btdev.c \ emulator/bthost.h emulator/bthost.c \ emulator/smp.c \ monitor/rfcomm.h \ @@ -160,7 +161,8 @@ android_android_tester_LDFLAGS = -pthread -ldl noinst_PROGRAMS += android/ipc-tester -android_ipc_tester_SOURCES = emulator/btdev.h emulator/btdev.c \ +android_ipc_tester_SOURCES = emulator/hciemu.h emulator/hciemu.c \ + emulator/btdev.h emulator/btdev.c \ emulator/bthost.h emulator/bthost.c \ emulator/smp.c \ android/hal-utils.h android/hal-utils.c \ diff --git a/android/ipc-tester.c b/android/ipc-tester.c index 5ca236a2f..bc30c861b 100644 --- a/android/ipc-tester.c +++ b/android/ipc-tester.c @@ -42,7 +42,7 @@ #include "src/shared/tester.h" #include "src/shared/mgmt.h" -#include "src/shared/hciemu.h" +#include "emulator/hciemu.h" #include "hal-msg.h" #include "ipc-common.h" diff --git a/android/tester-main.h b/android/tester-main.h index 8a816bae3..6afc553a4 100644 --- a/android/tester-main.h +++ b/android/tester-main.h @@ -38,9 +38,9 @@ #include "lib/mgmt.h" #include "src/shared/tester.h" -#include "src/shared/hciemu.h" #include "src/shared/mgmt.h" #include "src/shared/queue.h" +#include "emulator/hciemu.h" #include #include diff --git a/src/shared/hciemu.c b/emulator/hciemu.c similarity index 99% rename from src/shared/hciemu.c rename to emulator/hciemu.c index 3892fea34..50285e4f5 100644 --- a/src/shared/hciemu.c +++ b/emulator/hciemu.c @@ -44,7 +44,7 @@ #include "emulator/bthost.h" #include "src/shared/util.h" #include "src/shared/queue.h" -#include "src/shared/hciemu.h" +#include "emulator/hciemu.h" struct hciemu { int ref_count; diff --git a/src/shared/hciemu.h b/emulator/hciemu.h similarity index 100% rename from src/shared/hciemu.h rename to emulator/hciemu.h diff --git a/tools/gap-tester.c b/tools/gap-tester.c index d78862631..2a0be915c 100644 --- a/tools/gap-tester.c +++ b/tools/gap-tester.c @@ -28,7 +28,7 @@ #include #include "src/shared/tester.h" -#include "src/shared/hciemu.h" +#include "emulator/hciemu.h" static DBusConnection *dbus_conn = NULL; static GDBusClient *dbus_client = NULL; diff --git a/tools/l2cap-tester.c b/tools/l2cap-tester.c index b8b740c6a..cf0fa3811 100644 --- a/tools/l2cap-tester.c +++ b/tools/l2cap-tester.c @@ -38,10 +38,10 @@ #include "monitor/bt.h" #include "emulator/bthost.h" +#include "emulator/hciemu.h" #include "src/shared/tester.h" #include "src/shared/mgmt.h" -#include "src/shared/hciemu.h" struct test_data { const void *test_data; diff --git a/tools/mgmt-tester.c b/tools/mgmt-tester.c index 912ba6ebf..7d34ffbb3 100644 --- a/tools/mgmt-tester.c +++ b/tools/mgmt-tester.c @@ -35,11 +35,11 @@ #include "monitor/bt.h" #include "emulator/bthost.h" +#include "emulator/hciemu.h" #include "src/shared/util.h" #include "src/shared/tester.h" #include "src/shared/mgmt.h" -#include "src/shared/hciemu.h" struct test_data { tester_data_func_t test_setup; diff --git a/tools/rfcomm-tester.c b/tools/rfcomm-tester.c index 8be6e72bf..ba324bef3 100644 --- a/tools/rfcomm-tester.c +++ b/tools/rfcomm-tester.c @@ -39,10 +39,10 @@ #include "monitor/bt.h" #include "emulator/bthost.h" +#include "emulator/hciemu.h" #include "src/shared/tester.h" #include "src/shared/mgmt.h" -#include "src/shared/hciemu.h" struct test_data { struct mgmt *mgmt; diff --git a/tools/sco-tester.c b/tools/sco-tester.c index 1ad48db9b..d55d51a31 100644 --- a/tools/sco-tester.c +++ b/tools/sco-tester.c @@ -38,10 +38,10 @@ #include "monitor/bt.h" #include "emulator/bthost.h" +#include "emulator/hciemu.h" #include "src/shared/tester.h" #include "src/shared/mgmt.h" -#include "src/shared/hciemu.h" struct test_data { const void *test_data; diff --git a/tools/smp-tester.c b/tools/smp-tester.c index a53627efe..6ad4cf138 100644 --- a/tools/smp-tester.c +++ b/tools/smp-tester.c @@ -39,11 +39,11 @@ #include "monitor/bt.h" #include "emulator/bthost.h" +#include "emulator/hciemu.h" #include "src/shared/crypto.h" #include "src/shared/tester.h" #include "src/shared/mgmt.h" -#include "src/shared/hciemu.h" #define SMP_CID 0x0006 -- 2.47.3