From 649215b62f1aa40858784aff832b70ef17aa030c Mon Sep 17 00:00:00 2001 From: Johan Hedberg Date: Thu, 12 Feb 2015 12:32:07 +0200 Subject: [PATCH] shared: Move mainloop implementation from monitor to shared --- Makefile.am | 2 +- android/bluetoothd-snoop.c | 2 +- android/system-emulator.c | 2 +- emulator/amp.c | 2 +- emulator/b1ee.c | 2 +- emulator/hfp.c | 2 +- emulator/le.c | 2 +- emulator/main.c | 2 +- emulator/phy.c | 2 +- emulator/serial.c | 2 +- emulator/server.c | 2 +- emulator/vhci.c | 2 +- monitor/control.c | 3 ++- monitor/hcidump.c | 3 ++- monitor/main.c | 3 ++- src/shared/hci.c | 2 +- src/shared/io-mainloop.c | 2 +- {monitor => src/shared}/mainloop.c | 0 {monitor => src/shared}/mainloop.h | 0 src/shared/timeout-mainloop.c | 3 +-- tools/3dsp.c | 2 +- tools/bluemoon.c | 2 +- tools/btattach.c | 2 +- tools/btgatt-client.c | 2 +- tools/btgatt-server.c | 2 +- tools/btinfo.c | 2 +- tools/btmgmt.c | 2 +- tools/btproxy.c | 2 +- tools/cltest.c | 2 +- tools/ibeacon.c | 2 +- tools/oobtest.c | 2 +- 31 files changed, 32 insertions(+), 30 deletions(-) rename {monitor => src/shared}/mainloop.c (100%) rename {monitor => src/shared}/mainloop.h (100%) diff --git a/Makefile.am b/Makefile.am index 60811f184..6b811375b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -126,7 +126,7 @@ src_libshared_glib_la_SOURCES = $(shared_sources) \ src_libshared_mainloop_la_SOURCES = $(shared_sources) \ src/shared/io-mainloop.c \ src/shared/timeout-mainloop.c \ - monitor/mainloop.h monitor/mainloop.c + src/shared/mainloop.h src/shared/mainloop.c attrib_sources = attrib/att.h attrib/att-database.h attrib/att.c \ attrib/gatt.h attrib/gatt.c \ diff --git a/android/bluetoothd-snoop.c b/android/bluetoothd-snoop.c index 776dca752..035875a0d 100644 --- a/android/bluetoothd-snoop.c +++ b/android/bluetoothd-snoop.c @@ -36,7 +36,7 @@ #include "lib/hci.h" #include "lib/mgmt.h" -#include "monitor/mainloop.h" +#include "src/shared/mainloop.h" #include "src/shared/btsnoop.h" #include "src/log.h" diff --git a/android/system-emulator.c b/android/system-emulator.c index 4adc109e3..72dc5a070 100644 --- a/android/system-emulator.c +++ b/android/system-emulator.c @@ -40,7 +40,7 @@ #include #include -#include "monitor/mainloop.h" +#include "src/shared/mainloop.h" static char exec_dir[PATH_MAX]; diff --git a/emulator/amp.c b/emulator/amp.c index ab7f9debe..8e10c9912 100644 --- a/emulator/amp.c +++ b/emulator/amp.c @@ -37,7 +37,7 @@ #include #include "src/shared/util.h" -#include "monitor/mainloop.h" +#include "src/shared/mainloop.h" #include "monitor/bt.h" #include "amp.h" diff --git a/emulator/b1ee.c b/emulator/b1ee.c index 3fb867d86..1cb47d655 100644 --- a/emulator/b1ee.c +++ b/emulator/b1ee.c @@ -39,7 +39,7 @@ #include #include -#include "monitor/mainloop.h" +#include "src/shared/mainloop.h" #define DEFAULT_SERVER "b1ee.com" #define DEFAULT_HOST_PORT "45550" /* 0xb1ee */ diff --git a/emulator/hfp.c b/emulator/hfp.c index 928a72937..1edecb948 100644 --- a/emulator/hfp.c +++ b/emulator/hfp.c @@ -33,7 +33,7 @@ #include #include -#include "monitor/mainloop.h" +#include "src/shared/mainloop.h" #include "src/shared/hfp.h" static void hfp_debug(const char *str, void *user_data) diff --git a/emulator/le.c b/emulator/le.c index 30daa639f..2a8fe46ab 100644 --- a/emulator/le.c +++ b/emulator/le.c @@ -39,7 +39,7 @@ #include "src/shared/util.h" #include "src/shared/crypto.h" #include "src/shared/ecc.h" -#include "monitor/mainloop.h" +#include "src/shared/mainloop.h" #include "monitor/bt.h" #include "phy.h" diff --git a/emulator/main.c b/emulator/main.c index f9857d052..56246a3de 100644 --- a/emulator/main.c +++ b/emulator/main.c @@ -31,7 +31,7 @@ #include #include -#include "monitor/mainloop.h" +#include "src/shared/mainloop.h" #include "serial.h" #include "server.h" #include "vhci.h" diff --git a/emulator/phy.c b/emulator/phy.c index 685234713..c63dc3830 100644 --- a/emulator/phy.c +++ b/emulator/phy.c @@ -36,7 +36,7 @@ #include #include "src/shared/util.h" -#include "monitor/mainloop.h" +#include "src/shared/mainloop.h" #include "phy.h" diff --git a/emulator/serial.c b/emulator/serial.c index 8b49dc67c..844d85c19 100644 --- a/emulator/serial.c +++ b/emulator/serial.c @@ -40,7 +40,7 @@ #include #include -#include "monitor/mainloop.h" +#include "src/shared/mainloop.h" #include "btdev.h" #include "serial.h" diff --git a/emulator/server.c b/emulator/server.c index c185edf32..bdd481ca5 100644 --- a/emulator/server.c +++ b/emulator/server.c @@ -42,7 +42,7 @@ #include #include -#include "monitor/mainloop.h" +#include "src/shared/mainloop.h" #include "btdev.h" #include "server.h" diff --git a/emulator/vhci.c b/emulator/vhci.c index 2e3500061..b32b1e637 100644 --- a/emulator/vhci.c +++ b/emulator/vhci.c @@ -36,7 +36,7 @@ #include #include -#include "monitor/mainloop.h" +#include "src/shared/mainloop.h" #include "monitor/bt.h" #include "btdev.h" #include "vhci.h" diff --git a/monitor/control.c b/monitor/control.c index d9d6b4421..c6ed03c71 100644 --- a/monitor/control.c +++ b/monitor/control.c @@ -42,7 +42,8 @@ #include "src/shared/util.h" #include "src/shared/btsnoop.h" -#include "mainloop.h" +#include "src/shared/mainloop.h" + #include "display.h" #include "packet.h" #include "hcidump.h" diff --git a/monitor/hcidump.c b/monitor/hcidump.c index 1515f93f9..13dc20b32 100644 --- a/monitor/hcidump.c +++ b/monitor/hcidump.c @@ -38,7 +38,8 @@ #include #include -#include "mainloop.h" +#include "src/shared/mainloop.h" + #include "packet.h" #include "hcidump.h" diff --git a/monitor/main.c b/monitor/main.c index f0922ebbd..de48db57d 100644 --- a/monitor/main.c +++ b/monitor/main.c @@ -32,7 +32,8 @@ #include #include -#include "mainloop.h" +#include "src/shared/mainloop.h" + #include "packet.h" #include "lmp.h" #include "keys.h" diff --git a/src/shared/hci.c b/src/shared/hci.c index 9ab8c6ef0..0db0146bc 100644 --- a/src/shared/hci.c +++ b/src/shared/hci.c @@ -32,7 +32,7 @@ #include #include "monitor/bt.h" -#include "monitor/mainloop.h" +#include "src/shared/mainloop.h" #include "src/shared/io.h" #include "src/shared/util.h" #include "src/shared/queue.h" diff --git a/src/shared/io-mainloop.c b/src/shared/io-mainloop.c index 7f80d8f57..49237105a 100644 --- a/src/shared/io-mainloop.c +++ b/src/shared/io-mainloop.c @@ -29,7 +29,7 @@ #include #include -#include "monitor/mainloop.h" +#include "src/shared/mainloop.h" #include "src/shared/util.h" #include "src/shared/io.h" diff --git a/monitor/mainloop.c b/src/shared/mainloop.c similarity index 100% rename from monitor/mainloop.c rename to src/shared/mainloop.c diff --git a/monitor/mainloop.h b/src/shared/mainloop.h similarity index 100% rename from monitor/mainloop.h rename to src/shared/mainloop.h diff --git a/src/shared/timeout-mainloop.c b/src/shared/timeout-mainloop.c index 77aaa6353..f09931281 100644 --- a/src/shared/timeout-mainloop.c +++ b/src/shared/timeout-mainloop.c @@ -19,8 +19,7 @@ #include -#include "monitor/mainloop.h" - +#include "mainloop.h" #include "util.h" #include "timeout.h" diff --git a/tools/3dsp.c b/tools/3dsp.c index 9f23d4773..686fe139d 100644 --- a/tools/3dsp.c +++ b/tools/3dsp.c @@ -31,8 +31,8 @@ #include #include -#include "monitor/mainloop.h" #include "monitor/bt.h" +#include "src/shared/mainloop.h" #include "src/shared/timeout.h" #include "src/shared/util.h" #include "src/shared/hci.h" diff --git a/tools/bluemoon.c b/tools/bluemoon.c index 5e4310710..650ab0cac 100644 --- a/tools/bluemoon.c +++ b/tools/bluemoon.c @@ -35,8 +35,8 @@ #include #include -#include "monitor/mainloop.h" #include "monitor/bt.h" +#include "src/shared/mainloop.h" #include "src/shared/util.h" #include "src/shared/hci.h" diff --git a/tools/btattach.c b/tools/btattach.c index bdbbe1601..9957d36cc 100644 --- a/tools/btattach.c +++ b/tools/btattach.c @@ -42,8 +42,8 @@ #include #include "hciattach.h" -#include "monitor/mainloop.h" #include "monitor/bt.h" +#include "src/shared/mainloop.h" #include "src/shared/timeout.h" #include "src/shared/util.h" #include "src/shared/hci.h" diff --git a/tools/btgatt-client.c b/tools/btgatt-client.c index 8bda89b8b..75ea1ae6c 100644 --- a/tools/btgatt-client.c +++ b/tools/btgatt-client.c @@ -39,7 +39,7 @@ #include #include "lib/uuid.h" -#include "monitor/mainloop.h" +#include "src/shared/mainloop.h" #include "src/shared/util.h" #include "src/shared/att.h" #include "src/shared/queue.h" diff --git a/tools/btgatt-server.c b/tools/btgatt-server.c index d27cf109f..5eab548ef 100644 --- a/tools/btgatt-server.c +++ b/tools/btgatt-server.c @@ -35,7 +35,7 @@ #include #include "lib/uuid.h" -#include "monitor/mainloop.h" +#include "src/shared/mainloop.h" #include "src/shared/util.h" #include "src/shared/att.h" #include "src/shared/queue.h" diff --git a/tools/btinfo.c b/tools/btinfo.c index b838c2513..fd11ac428 100644 --- a/tools/btinfo.c +++ b/tools/btinfo.c @@ -35,8 +35,8 @@ #include #include -#include "monitor/mainloop.h" #include "monitor/bt.h" +#include "src/shared/mainloop.h" #include "src/shared/timeout.h" #include "src/shared/util.h" #include "src/shared/hci.h" diff --git a/tools/btmgmt.c b/tools/btmgmt.c index 2f73f461e..a1a1de771 100644 --- a/tools/btmgmt.c +++ b/tools/btmgmt.c @@ -51,8 +51,8 @@ #include "src/uuid-helper.h" #include "lib/mgmt.h" -#include "monitor/mainloop.h" #include "client/display.h" +#include "src/shared/mainloop.h" #include "src/shared/io.h" #include "src/shared/util.h" #include "src/shared/mgmt.h" diff --git a/tools/btproxy.c b/tools/btproxy.c index 350314827..6c8f29bbd 100644 --- a/tools/btproxy.c +++ b/tools/btproxy.c @@ -44,7 +44,7 @@ #include #include "src/shared/util.h" -#include "monitor/mainloop.h" +#include "src/shared/mainloop.h" #include "monitor/bt.h" #define BTPROTO_HCI 1 diff --git a/tools/cltest.c b/tools/cltest.c index 0231805b3..6a1927646 100644 --- a/tools/cltest.c +++ b/tools/cltest.c @@ -41,7 +41,7 @@ #include #include -#include "monitor/mainloop.h" +#include "src/shared/mainloop.h" static bool send_message(const bdaddr_t *src, const bdaddr_t *dst, uint16_t psm) diff --git a/tools/ibeacon.c b/tools/ibeacon.c index 28967de31..9d48e66b2 100644 --- a/tools/ibeacon.c +++ b/tools/ibeacon.c @@ -36,8 +36,8 @@ #include #include -#include "monitor/mainloop.h" #include "monitor/bt.h" +#include "src/shared/mainloop.h" #include "src/shared/timeout.h" #include "src/shared/util.h" #include "src/shared/hci.h" diff --git a/tools/oobtest.c b/tools/oobtest.c index 40f037646..7433690c6 100644 --- a/tools/oobtest.c +++ b/tools/oobtest.c @@ -31,7 +31,7 @@ #include "lib/bluetooth.h" #include "lib/mgmt.h" -#include "monitor/mainloop.h" +#include "src/shared/mainloop.h" #include "src/shared/util.h" #include "src/shared/mgmt.h" -- 2.47.3