From: Luiz Augusto von Dentz <luiz.von.dentz@xxxxxxxxx>
Since we use btd term for daemon APIs it makes sense to use it also
for the header name instead of hcid.
---
Makefile.am | 2 +-
plugins/neard.c | 2 +-
plugins/policy.c | 2 +-
profiles/audio/a2dp.c | 2 +-
profiles/audio/avdtp.c | 2 +-
profiles/scanparam/scan.c | 2 +-
src/adapter.c | 2 +-
src/agent.c | 2 +-
src/{hcid.h => btd.h} | 0
src/device.c | 2 +-
src/gatt-client.c | 2 +-
src/gatt-database.c | 2 +-
src/main.c | 2 +-
src/plugin.c | 2 +-
src/rfkill.c | 2 +-
15 files changed, 14 insertions(+), 14 deletions(-)
rename src/{hcid.h => btd.h} (100%)
diff --git a/Makefile.am b/Makefile.am
index 56279c4ba..69b95828f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -272,7 +272,7 @@ src_bluetoothd_SOURCES = $(builtin_sources) \
src/bluetooth.ver \
src/main.c src/log.h src/log.c \
src/backtrace.h src/backtrace.c \
- src/rfkill.c src/hcid.h src/sdpd.h \
+ src/rfkill.c src/btd.h src/sdpd.h \
src/sdpd-server.c src/sdpd-request.c \
src/sdpd-service.c src/sdpd-database.c \
src/attrib-server.h src/attrib-server.c \
diff --git a/plugins/neard.c b/plugins/neard.c
index 091b39333..e07b51106 100644
--- a/plugins/neard.c
+++ b/plugins/neard.c
@@ -29,7 +29,7 @@
#include "src/device.h"
#include "src/eir.h"
#include "src/agent.h"
-#include "src/hcid.h"
+#include "src/btd.h"
#define NEARD_NAME "org.neard"
#define NEARD_PATH "/"
diff --git a/plugins/policy.c b/plugins/policy.c
index dac1b7a24..ba9e1be02 100644
--- a/plugins/policy.c
+++ b/plugins/policy.c
@@ -30,7 +30,7 @@
#include "src/device.h"
#include "src/service.h"
#include "src/profile.h"
-#include "src/hcid.h"
+#include "src/btd.h"
#define CONTROL_CONNECT_TIMEOUT 2
#define SOURCE_RETRY_TIMEOUT 2
diff --git a/profiles/audio/a2dp.c b/profiles/audio/a2dp.c
index 6e05db103..626f61d34 100644
--- a/profiles/audio/a2dp.c
+++ b/profiles/audio/a2dp.c
@@ -30,7 +30,7 @@
#include "gdbus/gdbus.h"
-#include "src/hcid.h"
+#include "src/btd.h"
#include "src/plugin.h"
#include "src/adapter.h"
#include "src/device.h"
diff --git a/profiles/audio/avdtp.c b/profiles/audio/avdtp.c
index bcb0c71da..4c39088b8 100644
--- a/profiles/audio/avdtp.c
+++ b/profiles/audio/avdtp.c
@@ -29,7 +29,7 @@
#include "lib/uuid.h"
#include "btio/btio.h"
-#include "src/hcid.h"
+#include "src/btd.h"
#include "src/log.h"
#include "src/shared/util.h"
#include "src/shared/queue.h"
diff --git a/profiles/scanparam/scan.c b/profiles/scanparam/scan.c
index 41350c988..739a9a46d 100644
--- a/profiles/scanparam/scan.c
+++ b/profiles/scanparam/scan.c
@@ -32,7 +32,7 @@
#include "src/shared/gatt-db.h"
#include "src/shared/gatt-client.h"
#include "attrib/att.h"
-#include "src/hcid.h"
+#include "src/btd.h"
#define SCAN_INTERVAL_WIN_UUID 0x2A4F
#define SCAN_REFRESH_UUID 0x2A31
diff --git a/src/adapter.c b/src/adapter.c
index 676cf97ce..1f075ef5f 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -48,7 +48,7 @@
#include "src/shared/gatt-db.h"
#include "btio/btio.h"
-#include "hcid.h"
+#include "btd.h"
#include "sdpd.h"
#include "adapter.h"
#include "device.h"
diff --git a/src/agent.c b/src/agent.c
index 770a63838..7d66cf50d 100644
--- a/src/agent.c
+++ b/src/agent.c
@@ -30,7 +30,7 @@
#include "log.h"
#include "error.h"
-#include "hcid.h"
+#include "btd.h"
#include "dbus-common.h"
#include "adapter.h"
#include "device.h"
diff --git a/src/hcid.h b/src/btd.h
similarity index 100%
rename from src/hcid.h
rename to src/btd.h
diff --git a/src/device.c b/src/device.c
index de7f1c57d..7ddd3da64 100644
--- a/src/device.c
+++ b/src/device.c
@@ -44,7 +44,7 @@
#include "btio/btio.h"
#include "lib/mgmt.h"
#include "attrib/att.h"
-#include "hcid.h"
+#include "btd.h"
#include "adapter.h"
#include "gatt-database.h"
#include "attrib/gattrib.h"
diff --git a/src/gatt-client.c b/src/gatt-client.c
index 7fbf0093b..0cf5324ff 100644
--- a/src/gatt-client.c
+++ b/src/gatt-client.c
@@ -30,7 +30,7 @@
#include "log.h"
#include "error.h"
-#include "hcid.h"
+#include "btd.h"
#include "adapter.h"
#include "device.h"
#include "src/shared/io.h"
diff --git a/src/gatt-database.c b/src/gatt-database.c
index d8b7d261a..6694a0174 100644
--- a/src/gatt-database.c
+++ b/src/gatt-database.c
@@ -31,7 +31,7 @@
#include "src/shared/gatt-server.h"
#include "log.h"
#include "error.h"
-#include "hcid.h"
+#include "btd.h"
#include "adapter.h"
#include "device.h"
#include "gatt-database.h"
diff --git a/src/main.c b/src/main.c
index 6e18d5ef1..0ae45015f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -42,7 +42,7 @@
#include "shared/mainloop.h"
#include "lib/uuid.h"
#include "shared/util.h"
-#include "hcid.h"
+#include "btd.h"
#include "sdpd.h"
#include "adapter.h"
#include "device.h"
diff --git a/src/plugin.c b/src/plugin.c
index 6fe394f5f..dd7b406c8 100644
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -24,7 +24,7 @@
#include "btio/btio.h"
#include "src/plugin.h"
#include "src/log.h"
-#include "src/hcid.h"
+#include "src/btd.h"
static GSList *plugins = NULL;
diff --git a/src/rfkill.c b/src/rfkill.c
index 6309a7768..ec9fcdfdd 100644
--- a/src/rfkill.c
+++ b/src/rfkill.c
@@ -28,7 +28,7 @@
#include "log.h"
#include "adapter.h"
-#include "hcid.h"
+#include "btd.h"
enum rfkill_type {
RFKILL_TYPE_ALL = 0,
--
2.26.2
