From 8c45ca3f2e94712498fedc438c8116dd0363f6a2 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Sat, 25 Jan 2014 20:08:59 -0800 Subject: [PATCH] profiles: Use full include path for header files --- profiles/alert/server.c | 20 ++++++++++---------- profiles/audio/a2dp.c | 4 ++-- profiles/audio/avctp.c | 7 ++++--- profiles/audio/avdtp.c | 2 +- profiles/audio/avrcp.c | 9 +++++---- profiles/audio/control.c | 11 ++++++----- profiles/audio/media.c | 7 ++++--- profiles/audio/player.c | 7 ++++--- profiles/audio/sink.c | 6 +++--- profiles/audio/source.c | 6 +++--- profiles/audio/transport.c | 5 +++-- profiles/cyclingspeed/cyclingspeed.c | 18 +++++++++--------- profiles/deviceinfo/deviceinfo.c | 14 +++++++------- profiles/gatt/gas.c | 16 ++++++++-------- profiles/health/hdp.c | 13 +++++++------ profiles/health/hdp_main.c | 4 ++-- profiles/health/hdp_manager.c | 15 +++++++-------- profiles/health/hdp_util.c | 19 +++++++++++-------- profiles/health/mcap.c | 4 ++-- profiles/health/mcap_sync.c | 4 ++-- profiles/heartrate/heartrate.c | 18 +++++++++--------- profiles/input/device.c | 20 ++++++++++---------- profiles/input/hog.c | 7 ++++--- profiles/input/manager.c | 12 ++++++------ profiles/input/server.c | 10 +++++----- profiles/input/suspend-dummy.c | 2 +- profiles/network/bnep.c | 5 +++-- profiles/network/connection.c | 16 ++++++++-------- profiles/network/manager.c | 13 +++++++------ profiles/network/server.c | 11 +++++------ profiles/proximity/immalert.c | 15 ++++++++------- profiles/proximity/linkloss.c | 16 +++++++++------- profiles/proximity/main.c | 6 +++--- profiles/proximity/manager.c | 8 ++++---- profiles/proximity/monitor.c | 15 ++++++++------- profiles/proximity/reporter.c | 19 ++++++++++--------- profiles/sap/main.c | 2 +- profiles/sap/manager.c | 10 +++++----- profiles/sap/sap-dummy.c | 6 +++--- profiles/sap/sap-u8500.c | 2 +- profiles/sap/server.c | 10 +++++----- profiles/scanparam/scan.c | 14 +++++++------- profiles/thermometer/thermometer.c | 18 +++++++++--------- profiles/time/server.c | 12 ++++++------ 44 files changed, 237 insertions(+), 221 deletions(-) diff --git a/profiles/alert/server.c b/profiles/alert/server.c index 4565470ac..94e986523 100644 --- a/profiles/alert/server.c +++ b/profiles/alert/server.c @@ -33,21 +33,21 @@ #include #include "lib/uuid.h" -#include "plugin.h" -#include "dbus-common.h" +#include "src/plugin.h" +#include "src/dbus-common.h" #include "attrib/att.h" -#include "adapter.h" -#include "device.h" +#include "src/adapter.h" +#include "src/device.h" #include "attrib/att-database.h" -#include "log.h" +#include "src/log.h" #include "attrib/gatt-service.h" #include "attrib/gattrib.h" -#include "attrib-server.h" +#include "src/attrib-server.h" #include "attrib/gatt.h" -#include "profile.h" -#include "error.h" -#include "textfile.h" -#include "attio.h" +#include "src/profile.h" +#include "src/error.h" +#include "src/textfile.h" +#include "src/attio.h" #define PHONE_ALERT_STATUS_SVC_UUID 0x180E #define ALERT_NOTIF_SVC_UUID 0x1811 diff --git a/profiles/audio/a2dp.c b/profiles/audio/a2dp.c index 29a15939d..cabdd666e 100644 --- a/profiles/audio/a2dp.c +++ b/profiles/audio/a2dp.c @@ -43,14 +43,14 @@ #include "src/device.h" #include "src/profile.h" #include "src/service.h" +#include "src/log.h" +#include "src/sdpd.h" -#include "log.h" #include "avdtp.h" #include "sink.h" #include "source.h" #include "a2dp.h" #include "a2dp-codecs.h" -#include "sdpd.h" #include "media.h" /* The duration that streams without users are allowed to stay in diff --git a/profiles/audio/avctp.c b/profiles/audio/avctp.c index 6669ddc0a..1b55f7b7b 100644 --- a/profiles/audio/avctp.c +++ b/profiles/audio/avctp.c @@ -50,9 +50,10 @@ #include "src/adapter.h" #include "src/device.h" -#include "log.h" -#include "error.h" -#include "uinput.h" +#include "src/log.h" +#include "src/error.h" +#include "src/uinput.h" + #include "avctp.h" #include "avrcp.h" diff --git a/profiles/audio/avdtp.c b/profiles/audio/avdtp.c index f866b3929..b3d8351db 100644 --- a/profiles/audio/avdtp.c +++ b/profiles/audio/avdtp.c @@ -41,7 +41,7 @@ #include #include -#include "log.h" +#include "src/log.h" #include "lib/uuid.h" #include "src/adapter.h" diff --git a/profiles/audio/avrcp.c b/profiles/audio/avrcp.c index dbeaf3853..b673c5e86 100644 --- a/profiles/audio/avrcp.c +++ b/profiles/audio/avrcp.c @@ -53,12 +53,13 @@ #include "src/profile.h" #include "src/service.h" -#include "log.h" -#include "error.h" +#include "src/log.h" +#include "src/error.h" +#include "src/sdpd.h" +#include "src/dbus-common.h" + #include "avctp.h" #include "avrcp.h" -#include "sdpd.h" -#include "dbus-common.h" #include "control.h" #include "player.h" #include "transport.h" diff --git a/profiles/audio/control.c b/profiles/audio/control.c index 4692ef053..ab94a5719 100644 --- a/profiles/audio/control.c +++ b/profiles/audio/control.c @@ -51,13 +51,14 @@ #include "src/profile.h" #include "src/service.h" -#include "log.h" -#include "error.h" +#include "src/log.h" +#include "src/error.h" +#include "src/sdpd.h" +#include "src/uuid-helper.h" +#include "src/dbus-common.h" + #include "avctp.h" #include "control.h" -#include "sdpd.h" -#include "uuid-helper.h" -#include "dbus-common.h" static GSList *devices = NULL; diff --git a/profiles/audio/media.c b/profiles/audio/media.c index 12e23a541..b71196a1a 100644 --- a/profiles/audio/media.c +++ b/profiles/audio/media.c @@ -40,9 +40,10 @@ #include "src/dbus-common.h" #include "src/profile.h" -#include "uuid-helper.h" -#include "log.h" -#include "error.h" +#include "src/uuid-helper.h" +#include "src/log.h" +#include "src/error.h" + #include "avdtp.h" #include "media.h" #include "transport.h" diff --git a/profiles/audio/player.c b/profiles/audio/player.c index 6150c8a70..e6d24eb57 100644 --- a/profiles/audio/player.c +++ b/profiles/audio/player.c @@ -38,10 +38,11 @@ #include #include -#include "log.h" +#include "src/log.h" +#include "src/dbus-common.h" +#include "src/error.h" + #include "player.h" -#include "dbus-common.h" -#include "error.h" #define MEDIA_PLAYER_INTERFACE "org.bluez.MediaPlayer1" #define MEDIA_FOLDER_INTERFACE "org.bluez.MediaFolder1" diff --git a/profiles/audio/sink.c b/profiles/audio/sink.c index 4f39622ec..d16af23e9 100644 --- a/profiles/audio/sink.c +++ b/profiles/audio/sink.c @@ -37,18 +37,18 @@ #include #include -#include "log.h" +#include "src/log.h" #include "src/adapter.h" #include "src/device.h" #include "src/service.h" +#include "src/error.h" +#include "src/dbus-common.h" #include "avdtp.h" #include "media.h" #include "a2dp.h" -#include "error.h" #include "sink.h" -#include "dbus-common.h" #define STREAM_SETUP_RETRY_TIMER 2 diff --git a/profiles/audio/source.c b/profiles/audio/source.c index 7b129b76e..843b3e8cb 100644 --- a/profiles/audio/source.c +++ b/profiles/audio/source.c @@ -38,18 +38,18 @@ #include #include -#include "log.h" +#include "src/log.h" #include "src/adapter.h" #include "src/device.h" #include "src/service.h" +#include "src/error.h" +#include "src/dbus-common.h" #include "avdtp.h" #include "media.h" #include "a2dp.h" -#include "error.h" #include "source.h" -#include "dbus-common.h" struct source { struct btd_service *service; diff --git a/profiles/audio/transport.c b/profiles/audio/transport.c index 087c0ee57..c82fbb575 100644 --- a/profiles/audio/transport.c +++ b/profiles/audio/transport.c @@ -36,8 +36,9 @@ #include "src/device.h" #include "src/dbus-common.h" -#include "log.h" -#include "error.h" +#include "src/log.h" +#include "src/error.h" + #include "avdtp.h" #include "media.h" #include "transport.h" diff --git a/profiles/cyclingspeed/cyclingspeed.c b/profiles/cyclingspeed/cyclingspeed.c index b6d881a3d..f78c2242e 100644 --- a/profiles/cyclingspeed/cyclingspeed.c +++ b/profiles/cyclingspeed/cyclingspeed.c @@ -30,18 +30,18 @@ #include #include "lib/uuid.h" -#include "plugin.h" -#include "adapter.h" -#include "device.h" -#include "profile.h" -#include "service.h" -#include "dbus-common.h" -#include "error.h" +#include "src/plugin.h" +#include "src/adapter.h" +#include "src/device.h" +#include "src/profile.h" +#include "src/service.h" +#include "src/dbus-common.h" +#include "src/error.h" #include "attrib/gattrib.h" #include "attrib/att.h" #include "attrib/gatt.h" -#include "attio.h" -#include "log.h" +#include "src/attio.h" +#include "src/log.h" /* min length for ATT indication or notification: opcode (1b) + handle (2b) */ #define ATT_HDR_LEN 3 diff --git a/profiles/deviceinfo/deviceinfo.c b/profiles/deviceinfo/deviceinfo.c index bfecfc2b1..661a5dc0f 100644 --- a/profiles/deviceinfo/deviceinfo.c +++ b/profiles/deviceinfo/deviceinfo.c @@ -30,16 +30,16 @@ #include #include "lib/uuid.h" -#include "plugin.h" -#include "adapter.h" -#include "device.h" -#include "profile.h" -#include "service.h" +#include "src/plugin.h" +#include "src/adapter.h" +#include "src/device.h" +#include "src/profile.h" +#include "src/service.h" #include "attrib/gattrib.h" -#include "attio.h" +#include "src/attio.h" #include "attrib/att.h" #include "attrib/gatt.h" -#include "log.h" +#include "src/log.h" #define PNP_ID_SIZE 7 diff --git a/profiles/gatt/gas.c b/profiles/gatt/gas.c index de074644a..f10db99c1 100644 --- a/profiles/gatt/gas.c +++ b/profiles/gatt/gas.c @@ -35,17 +35,17 @@ #include #include "lib/uuid.h" -#include "plugin.h" -#include "adapter.h" -#include "device.h" -#include "profile.h" -#include "service.h" +#include "src/plugin.h" +#include "src/adapter.h" +#include "src/device.h" +#include "src/profile.h" +#include "src/service.h" #include "attrib/att.h" #include "attrib/gattrib.h" -#include "attio.h" +#include "src/attio.h" #include "attrib/gatt.h" -#include "log.h" -#include "textfile.h" +#include "src/log.h" +#include "src/textfile.h" /* Generic Attribute/Access Service */ struct gas { diff --git a/profiles/health/hdp.c b/profiles/health/hdp.c index 6203fa8ab..ccaa1b1c9 100644 --- a/profiles/health/hdp.c +++ b/profiles/health/hdp.c @@ -27,18 +27,19 @@ #include #include #include -#include #include #include +#include #include #include -#include -#include -#include -#include -#include +#include "src/dbus-common.h" +#include "src/log.h" +#include "src/error.h" +#include "src/adapter.h" +#include "src/device.h" +#include "src/sdpd.h" #include #include "mcap_lib.h" diff --git a/profiles/health/hdp_main.c b/profiles/health/hdp_main.c index e705ee926..6dc9acf52 100644 --- a/profiles/health/hdp_main.c +++ b/profiles/health/hdp_main.c @@ -25,10 +25,10 @@ #endif #include - #include -#include "plugin.h" +#include "src/plugin.h" + #include "hdp_manager.h" static int hdp_init(void) diff --git a/profiles/health/hdp_manager.c b/profiles/health/hdp_manager.c index 168281f2c..c6d2149a1 100644 --- a/profiles/health/hdp_manager.c +++ b/profiles/health/hdp_manager.c @@ -29,17 +29,16 @@ #include #include -#include "lib/uuid.h" #include -#include -#include -#include -#include -#include -#include +#include "lib/uuid.h" +#include "src/adapter.h" +#include "src/device.h" +#include "src/profile.h" +#include "src/service.h" +#include "src/uuid-helper.h" +#include "src/log.h" #include "hdp_types.h" - #include "hdp_manager.h" #include "hdp.h" diff --git a/profiles/health/hdp_util.c b/profiles/health/hdp_util.c index 433593001..58770b51c 100644 --- a/profiles/health/hdp_util.c +++ b/profiles/health/hdp_util.c @@ -31,20 +31,23 @@ #include -#include -#include - -#include +#include +#include #include -#include -#include + +#include "src/adapter.h" +#include "src/device.h" + +#include "src/sdpd.h" +#include "src/sdp-client.h" +#include "src/uuid-helper.h" #include "lib/uuid.h" #include "btio/btio.h" -#include "log.h" +#include "src/log.h" +#include "src/dbus-common.h" -#include "dbus-common.h" #include "mcap.h" #include "mcap_lib.h" #include "hdp_types.h" diff --git a/profiles/health/mcap.c b/profiles/health/mcap.c index 6d821f3f8..1463a2568 100644 --- a/profiles/health/mcap.c +++ b/profiles/health/mcap.c @@ -35,8 +35,8 @@ #include #include -#include -#include +#include "src/log.h" +#include "src/error.h" #include "mcap.h" #include "mcap_lib.h" diff --git a/profiles/health/mcap_sync.c b/profiles/health/mcap_sync.c index cba7a2aa6..dc990d1c6 100644 --- a/profiles/health/mcap_sync.c +++ b/profiles/health/mcap_sync.c @@ -33,9 +33,9 @@ #include #include -#include #include -#include +#include "src/adapter.h" +#include "src/log.h" #include "mcap.h" #include "mcap_lib.h" diff --git a/profiles/heartrate/heartrate.c b/profiles/heartrate/heartrate.c index 3be8f9e5f..97af02e84 100644 --- a/profiles/heartrate/heartrate.c +++ b/profiles/heartrate/heartrate.c @@ -30,18 +30,18 @@ #include #include "lib/uuid.h" -#include "plugin.h" -#include "adapter.h" -#include "dbus-common.h" -#include "device.h" -#include "profile.h" -#include "service.h" -#include "error.h" +#include "src/plugin.h" +#include "src/adapter.h" +#include "src/dbus-common.h" +#include "src/device.h" +#include "src/profile.h" +#include "src/service.h" +#include "src/error.h" #include "attrib/gattrib.h" #include "attrib/att.h" #include "attrib/gatt.h" -#include "attio.h" -#include "log.h" +#include "src/attio.h" +#include "src/log.h" #define HEART_RATE_INTERFACE "org.bluez.HeartRate1" #define HEART_RATE_MANAGER_INTERFACE "org.bluez.HeartRateManager1" diff --git a/profiles/input/device.c b/profiles/input/device.c index 62f6dbb27..835114796 100644 --- a/profiles/input/device.c +++ b/profiles/input/device.c @@ -39,21 +39,21 @@ #include -#include "log.h" +#include "src/log.h" #include "lib/uuid.h" -#include "../src/adapter.h" -#include "../src/device.h" -#include "../src/profile.h" -#include "../src/service.h" -#include "../src/storage.h" -#include "../src/dbus-common.h" +#include "src/adapter.h" +#include "src/device.h" +#include "src/profile.h" +#include "src/service.h" +#include "src/storage.h" +#include "src/dbus-common.h" +#include "src/error.h" +#include "src/sdp-client.h" #include "device.h" -#include "error.h" -#include -#include "sdp-client.h" +#include #define INPUT_INTERFACE "org.bluez.Input1" diff --git a/profiles/input/hog.c b/profiles/input/hog.c index e357aa045..ded63034b 100644 --- a/profiles/input/hog.c +++ b/profiles/input/hog.c @@ -40,7 +40,7 @@ #include -#include "log.h" +#include "src/log.h" #include "lib/uuid.h" #include "src/adapter.h" @@ -48,11 +48,12 @@ #include "src/profile.h" #include "src/service.h" -#include "plugin.h" +#include "src/plugin.h" + #include "suspend.h" #include "attrib/att.h" #include "attrib/gattrib.h" -#include "attio.h" +#include "src/attio.h" #include "attrib/gatt.h" #define HOG_UUID "00001812-0000-1000-8000-00805f9b34fb" diff --git a/profiles/input/manager.c b/profiles/input/manager.c index 660043eec..6ef83f417 100644 --- a/profiles/input/manager.c +++ b/profiles/input/manager.c @@ -32,14 +32,14 @@ #include #include -#include "log.h" -#include "plugin.h" +#include "src/log.h" +#include "src/plugin.h" #include "lib/uuid.h" -#include "../src/adapter.h" -#include "../src/device.h" -#include "../src/profile.h" -#include "../src/service.h" +#include "src/adapter.h" +#include "src/device.h" +#include "src/profile.h" +#include "src/service.h" #include "device.h" #include "server.h" diff --git a/profiles/input/server.c b/profiles/input/server.c index 7a07d0818..650ece163 100644 --- a/profiles/input/server.c +++ b/profiles/input/server.c @@ -35,14 +35,14 @@ #include #include -#include "log.h" +#include "src/log.h" -#include "uuid-helper.h" +#include "src/uuid-helper.h" #include "btio/btio.h" #include "lib/uuid.h" -#include "../src/adapter.h" -#include "../src/device.h" -#include "../src/profile.h" +#include "src/adapter.h" +#include "src/device.h" +#include "src/profile.h" #include "device.h" #include "server.h" diff --git a/profiles/input/suspend-dummy.c b/profiles/input/suspend-dummy.c index 75dd536de..542ae2592 100644 --- a/profiles/input/suspend-dummy.c +++ b/profiles/input/suspend-dummy.c @@ -37,7 +37,7 @@ #include -#include "log.h" +#include "src/log.h" #include "suspend.h" #define HOG_SUSPEND_FIFO "/tmp/hogsuspend" diff --git a/profiles/network/bnep.c b/profiles/network/bnep.c index 2a7401645..303489d11 100644 --- a/profiles/network/bnep.c +++ b/profiles/network/bnep.c @@ -43,10 +43,11 @@ #include -#include "log.h" -#include "bnep.h" +#include "src/log.h" #include "lib/uuid.h" +#include "bnep.h" + #define CON_SETUP_RETRIES 3 #define CON_SETUP_TO 9 diff --git a/profiles/network/connection.c b/profiles/network/connection.c index c66987dc6..d4697c5a1 100644 --- a/profiles/network/connection.c +++ b/profiles/network/connection.c @@ -39,14 +39,14 @@ #include #include -#include "log.h" -#include "dbus-common.h" -#include "adapter.h" -#include "device.h" -#include "profile.h" -#include "service.h" - -#include "error.h" +#include "src/log.h" +#include "src/dbus-common.h" +#include "src/adapter.h" +#include "src/device.h" +#include "src/profile.h" +#include "src/service.h" +#include "src/error.h" + #include "bnep.h" #include "connection.h" diff --git a/profiles/network/manager.c b/profiles/network/manager.c index 47aebcb28..0fe98a04a 100644 --- a/profiles/network/manager.c +++ b/profiles/network/manager.c @@ -35,14 +35,15 @@ #include #include -#include "log.h" -#include "plugin.h" +#include "src/log.h" +#include "src/plugin.h" #include "lib/uuid.h" -#include "adapter.h" -#include "device.h" -#include "profile.h" -#include "service.h" +#include "src/adapter.h" +#include "src/device.h" +#include "src/profile.h" +#include "src/service.h" + #include "bnep.h" #include "connection.h" #include "server.h" diff --git a/profiles/network/server.c b/profiles/network/server.c index 7cb5a1e85..5f42b85bb 100644 --- a/profiles/network/server.c +++ b/profiles/network/server.c @@ -41,12 +41,11 @@ #include #include "lib/uuid.h" -#include "../src/dbus-common.h" -#include "../src/adapter.h" - -#include "log.h" -#include "error.h" -#include "sdpd.h" +#include "src/dbus-common.h" +#include "src/adapter.h" +#include "src/log.h" +#include "src/error.h" +#include "src/sdpd.h" #include "bnep.h" #include "server.h" diff --git a/profiles/proximity/immalert.c b/profiles/proximity/immalert.c index 2f8d4e7ac..1638cf9cb 100644 --- a/profiles/proximity/immalert.c +++ b/profiles/proximity/immalert.c @@ -27,23 +27,24 @@ #include #include -#include #include #include #include "lib/uuid.h" -#include "log.h" +#include "src/log.h" +#include "src/adapter.h" #include "attrib/gattrib.h" #include "attrib/att.h" #include "attrib/gatt.h" #include "attrib/att-database.h" #include "attrib/gatt-service.h" -#include "attrib-server.h" -#include "device.h" -#include "profile.h" -#include "attio.h" -#include "dbus-common.h" +#include "src/attrib-server.h" +#include "src/device.h" +#include "src/profile.h" +#include "src/attio.h" +#include "src/dbus-common.h" + #include "reporter.h" #include "immalert.h" diff --git a/profiles/proximity/linkloss.c b/profiles/proximity/linkloss.c index a7ed96c4e..db168203a 100644 --- a/profiles/proximity/linkloss.c +++ b/profiles/proximity/linkloss.c @@ -27,23 +27,25 @@ #include #include -#include #include #include #include "lib/uuid.h" -#include "log.h" +#include "src/log.h" +#include "src/adapter.h" +#include "src/device.h" #include "attrib/att-database.h" #include "attrib/gattrib.h" #include "attrib/att.h" #include "attrib/gatt.h" #include "attrib/gatt-service.h" -#include "attrib-server.h" -#include "device.h" -#include "profile.h" -#include "attio.h" -#include "dbus-common.h" +#include "src/attrib-server.h" +#include "src/service.h" +#include "src/profile.h" +#include "src/attio.h" +#include "src/dbus-common.h" + #include "reporter.h" #include "linkloss.h" diff --git a/profiles/proximity/main.c b/profiles/proximity/main.c index 46468d221..d4fe41912 100644 --- a/profiles/proximity/main.c +++ b/profiles/proximity/main.c @@ -31,10 +31,10 @@ #include #include -#include "log.h" -#include "plugin.h" +#include "src/log.h" +#include "src/plugin.h" +#include "src/hcid.h" #include "manager.h" -#include "hcid.h" static GKeyFile *config = NULL; diff --git a/profiles/proximity/manager.c b/profiles/proximity/manager.c index 7dab23f85..3f0f63c0a 100644 --- a/profiles/proximity/manager.c +++ b/profiles/proximity/manager.c @@ -32,10 +32,10 @@ #include #include "lib/uuid.h" -#include "adapter.h" -#include "device.h" -#include "profile.h" -#include "service.h" +#include "src/adapter.h" +#include "src/device.h" +#include "src/profile.h" +#include "src/service.h" #include "attrib/att.h" #include "attrib/gattrib.h" #include "attrib/gatt.h" diff --git a/profiles/proximity/monitor.c b/profiles/proximity/monitor.c index e78bfc3f3..f2e073969 100644 --- a/profiles/proximity/monitor.c +++ b/profiles/proximity/monitor.c @@ -39,17 +39,18 @@ #include #include "lib/uuid.h" -#include "dbus-common.h" -#include "adapter.h" -#include "device.h" -#include "error.h" -#include "log.h" +#include "src/dbus-common.h" +#include "src/adapter.h" +#include "src/device.h" +#include "src/error.h" +#include "src/log.h" #include "attrib/att.h" #include "attrib/gattrib.h" #include "attrib/gatt.h" -#include "attio.h" +#include "src/attio.h" +#include "src/textfile.h" + #include "monitor.h" -#include "textfile.h" #define PROXIMITY_INTERFACE "org.bluez.ProximityMonitor1" diff --git a/profiles/proximity/reporter.c b/profiles/proximity/reporter.c index dbb593a0d..bda993d0c 100644 --- a/profiles/proximity/reporter.c +++ b/profiles/proximity/reporter.c @@ -30,25 +30,26 @@ #include #include -#include #include #include -#include "log.h" +#include "src/log.h" #include "lib/uuid.h" -#include "dbus-common.h" -#include "error.h" -#include "device.h" -#include "profile.h" -#include "service.h" -#include "hcid.h" +#include "src/dbus-common.h" +#include "src/error.h" +#include "src/adapter.h" +#include "src/device.h" +#include "src/profile.h" +#include "src/service.h" +#include "src/hcid.h" #include "attrib/gattrib.h" #include "attrib/att.h" #include "attrib/gatt.h" #include "attrib/att-database.h" -#include "attrib-server.h" +#include "src/attrib-server.h" + #include "reporter.h" #include "linkloss.h" #include "immalert.h" diff --git a/profiles/sap/main.c b/profiles/sap/main.c index 8cc953382..ad55cd2e9 100644 --- a/profiles/sap/main.c +++ b/profiles/sap/main.c @@ -24,7 +24,7 @@ #include #include -#include "plugin.h" +#include "src/plugin.h" #include "manager.h" static int sap_init(void) diff --git a/profiles/sap/manager.c b/profiles/sap/manager.c index bfb81a5cd..5c2a0f106 100644 --- a/profiles/sap/manager.c +++ b/profiles/sap/manager.c @@ -24,11 +24,11 @@ #include -#include "log.h" -#include "adapter.h" -#include "device.h" -#include "profile.h" -#include "service.h" +#include "src/log.h" +#include "src/adapter.h" +#include "src/device.h" +#include "src/profile.h" +#include "src/service.h" #include "manager.h" #include "server.h" diff --git a/profiles/sap/sap-dummy.c b/profiles/sap/sap-dummy.c index 47dedf7a2..854105e29 100644 --- a/profiles/sap/sap-dummy.c +++ b/profiles/sap/sap-dummy.c @@ -30,9 +30,9 @@ #include #include -#include "dbus-common.h" -#include "error.h" -#include "log.h" +#include "src/dbus-common.h" +#include "src/error.h" +#include "src/log.h" #include "sap.h" #define SAP_DUMMY_IFACE "org.bluez.SimAccessTest1" diff --git a/profiles/sap/sap-u8500.c b/profiles/sap/sap-u8500.c index 39169a0a5..d0430294f 100644 --- a/profiles/sap/sap-u8500.c +++ b/profiles/sap/sap-u8500.c @@ -36,7 +36,7 @@ #include #include -#include "log.h" +#include "src/log.h" #include "sap.h" #define STE_SIMD_SOCK "/dev/socket/catd_a" diff --git a/profiles/sap/server.c b/profiles/sap/server.c index 119862dff..711853f4e 100644 --- a/profiles/sap/server.c +++ b/profiles/sap/server.c @@ -35,11 +35,11 @@ #include "lib/uuid.h" #include "btio/btio.h" -#include "adapter.h" -#include "sdpd.h" -#include "log.h" -#include "error.h" -#include "dbus-common.h" +#include "src/adapter.h" +#include "src/sdpd.h" +#include "src/log.h" +#include "src/error.h" +#include "src/dbus-common.h" #include "sap.h" #include "server.h" diff --git a/profiles/scanparam/scan.c b/profiles/scanparam/scan.c index d3f3aa5f4..4fd8f53ab 100644 --- a/profiles/scanparam/scan.c +++ b/profiles/scanparam/scan.c @@ -30,16 +30,16 @@ #include #include "lib/uuid.h" -#include "log.h" -#include "plugin.h" -#include "adapter.h" -#include "device.h" -#include "profile.h" -#include "service.h" +#include "src/log.h" +#include "src/plugin.h" +#include "src/adapter.h" +#include "src/device.h" +#include "src/profile.h" +#include "src/service.h" #include "attrib/att.h" #include "attrib/gattrib.h" #include "attrib/gatt.h" -#include "attio.h" +#include "src/attio.h" #define SCAN_PARAMETERS_UUID "00001813-0000-1000-8000-00805f9b34fb" diff --git a/profiles/thermometer/thermometer.c b/profiles/thermometer/thermometer.c index 85cca03c3..c9ab759a2 100644 --- a/profiles/thermometer/thermometer.c +++ b/profiles/thermometer/thermometer.c @@ -30,16 +30,16 @@ #include #include "lib/uuid.h" -#include "plugin.h" -#include "dbus-common.h" -#include "adapter.h" -#include "device.h" -#include "profile.h" -#include "service.h" -#include "error.h" -#include "log.h" +#include "src/plugin.h" +#include "src/dbus-common.h" +#include "src/adapter.h" +#include "src/device.h" +#include "src/profile.h" +#include "src/service.h" +#include "src/error.h" +#include "src/log.h" #include "attrib/gattrib.h" -#include "attio.h" +#include "src/attio.h" #include "attrib/att.h" #include "attrib/gatt.h" diff --git a/profiles/time/server.c b/profiles/time/server.c index 178d4d26e..142d15ca3 100644 --- a/profiles/time/server.c +++ b/profiles/time/server.c @@ -31,19 +31,19 @@ #include #include -#include -#include -#include -#include +#include "src/adapter.h" +#include "src/device.h" +#include "src/profile.h" +#include "src/plugin.h" #include "lib/uuid.h" #include "attrib/gattrib.h" #include "attrib/att.h" #include "attrib/gatt.h" #include "attrib/att-database.h" -#include "attrib-server.h" +#include "src/attrib-server.h" #include "attrib/gatt-service.h" -#include "log.h" +#include "src/log.h" #define CURRENT_TIME_SVC_UUID 0x1805 #define REF_TIME_UPDATE_SVC_UUID 0x1806 -- 2.47.3