From 2200feec94bbbf4691c65317bcaabffca45d0f4f Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Wed, 28 Oct 2020 14:53:36 -0700 Subject: [PATCH] core: Rename hcid.h to btd.h Since we use btd term for daemon APIs it makes sense to use it also for the header name instead of hcid. Change-Id: Ib2c8e730fa5fd4bf4119fb245c958fa0450e3e11 Signed-off-by: Anuj Jain Signed-off-by: Ayush Garg --- Makefile.am | 2 +- plugins/dbusoob.c | 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 +- 16 files changed, 15 insertions(+), 15 deletions(-) rename src/{hcid.h => btd.h} (100%) diff --git a/Makefile.am b/Makefile.am index d975439..2bd5aac 100755 --- a/Makefile.am +++ b/Makefile.am @@ -274,7 +274,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/dbusoob.c b/plugins/dbusoob.c index bb37d99..c04b4b3 100755 --- a/plugins/dbusoob.c +++ b/plugins/dbusoob.c @@ -42,7 +42,7 @@ #include "src/device.h" #include "src/eir.h" #include "src/agent.h" -#include "src/hcid.h" +#include "src/btd.h" #include "src/error.h" #define OOB_INTERFACE "org.bluez.OutOfBand" diff --git a/plugins/neard.c b/plugins/neard.c index f3b58b6..8427761 100755 --- a/plugins/neard.c +++ b/plugins/neard.c @@ -28,7 +28,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 98fedcf..5e17c39 100755 --- 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" #ifdef TIZEN_FEATURE_BLUEZ_MODIFY #define CONTROL_CONNECT_TIMEOUT 4 diff --git a/profiles/audio/a2dp.c b/profiles/audio/a2dp.c index f5cae4b..618e22b 100644 --- a/profiles/audio/a2dp.c +++ b/profiles/audio/a2dp.c @@ -28,7 +28,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 7eddeb8..3cc6884 100644 --- a/profiles/audio/avdtp.c +++ b/profiles/audio/avdtp.c @@ -34,7 +34,7 @@ #endif /* TIZEN_FEATURE_BLUEZ_MODIFY */ #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 41350c9..739a9a4 100755 --- 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 8da4293..eddfeb2 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -47,7 +47,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 770a638..7d66cf5 100755 --- 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 adfd656..f85f5a3 100644 --- a/src/device.c +++ b/src/device.c @@ -43,7 +43,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 e38e1ed..e34c944 100644 --- a/src/gatt-client.c +++ b/src/gatt-client.c @@ -29,7 +29,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 73785c9..30c09b2 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 d3e0a80..969091d 100755 --- a/src/main.c +++ b/src/main.c @@ -41,7 +41,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 6fe394f..dd7b406 100755 --- 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 bbbb070..c57b776 100755 --- a/src/rfkill.c +++ b/src/rfkill.c @@ -27,7 +27,7 @@ #include "log.h" #include "adapter.h" -#include "hcid.h" +#include "btd.h" enum rfkill_type { RFKILL_TYPE_ALL = 0, -- 2.7.4