summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRavi kumar Veeramally <ravikumar.veeramally@linux.intel.com>2014-10-02 15:25:16 +0300
committerJohan Hedberg <johan.hedberg@intel.com>2014-10-02 16:09:50 +0300
commit9164e6d2c553d843baa3773908280129766d8dc6 (patch)
treee286807f21b50ea22d7d294b461ea3a41a57c6dc
parentc2a70e6b9d0c2257a3ae579d62faa1d60e4962bd (diff)
downloadbluez-9164e6d2c553d843baa3773908280129766d8dc6.tar.gz
mcap: Rename mcap-lib to mcap
-rw-r--r--Makefile.plugins2
-rw-r--r--android/Android.mk4
-rw-r--r--android/Makefile.am4
-rw-r--r--android/health.c2
-rw-r--r--android/mcaptest.c2
-rw-r--r--profiles/health/hdp.c2
-rw-r--r--profiles/health/hdp_util.c2
-rw-r--r--profiles/health/mcap.c (renamed from profiles/health/mcap-lib.c)2
-rw-r--r--profiles/health/mcap.h (renamed from profiles/health/mcap-lib.h)0
9 files changed, 10 insertions, 10 deletions
diff --git a/Makefile.plugins b/Makefile.plugins
index 7fd0e50d1..0448b9143 100644
--- a/Makefile.plugins
+++ b/Makefile.plugins
@@ -64,7 +64,7 @@ builtin_sources += profiles/input/hog.c profiles/input/uhid_copy.h \
if EXPERIMENTAL
builtin_modules += health
-builtin_sources += profiles/health/mcap-lib.h profiles/health/mcap-lib.c \
+builtin_sources += profiles/health/mcap.h profiles/health/mcap.c \
profiles/health/hdp_main.c profiles/health/hdp_types.h \
profiles/health/hdp_manager.h \
profiles/health/hdp_manager.c \
diff --git a/android/Android.mk b/android/Android.mk
index 3ace7861e..eb67690e3 100644
--- a/android/Android.mk
+++ b/android/Android.mk
@@ -56,7 +56,7 @@ LOCAL_SRC_FILES := \
bluez/android/handsfree-client.c \
bluez/android/gatt.c \
bluez/android/health.c \
- bluez/profiles/health/mcap-lib.c \
+ bluez/profiles/health/mcap.c \
bluez/src/log.c \
bluez/src/shared/mgmt.c \
bluez/src/shared/util.c \
@@ -211,7 +211,7 @@ LOCAL_SRC_FILES := \
bluez/btio/btio.c \
bluez/lib/bluetooth.c \
bluez/lib/hci.c \
- bluez/profiles/health/mcap-lib.c \
+ bluez/profiles/health/mcap.c \
bluez/android/mcaptest.c \
LOCAL_C_INCLUDES := \
diff --git a/android/Makefile.am b/android/Makefile.am
index 495353199..75802dd14 100644
--- a/android/Makefile.am
+++ b/android/Makefile.am
@@ -45,7 +45,7 @@ android_bluetoothd_SOURCES = android/main.c \
android/handsfree-client.c android/handsfree-client.h \
android/gatt.h android/gatt.c \
android/health.h android/health.c \
- profiles/health/mcap-lib.h profiles/health/mcap-lib.c \
+ profiles/health/mcap.h profiles/health/mcap.c \
attrib/att.c attrib/att.h \
attrib/gatt.c attrib/gatt.h \
attrib/gattrib.c attrib/gattrib.h \
@@ -95,7 +95,7 @@ noinst_PROGRAMS += android/mcaptest
android_mcaptest_SOURCES = android/mcaptest.c \
src/log.h src/log.c \
btio/btio.h btio/btio.c \
- profiles/health/mcap-lib.h profiles/health/mcap-lib.c
+ profiles/health/mcap.h profiles/health/mcap.c
android_mcaptest_CFLAGS = $(AM_CFLAGS)
android_mcaptest_LDADD = lib/libbluetooth-internal.la @GLIB_LIBS@
diff --git a/android/health.c b/android/health.c
index 5d161e06b..75811aa25 100644
--- a/android/health.c
+++ b/android/health.c
@@ -43,7 +43,7 @@
#include "src/shared/queue.h"
#include "src/uuid-helper.h"
#include "src/sdp-client.h"
-#include "profiles/health/mcap-lib.h"
+#include "profiles/health/mcap.h"
#include "hal-msg.h"
#include "ipc-common.h"
diff --git a/android/mcaptest.c b/android/mcaptest.c
index 638220b55..5ef030cb9 100644
--- a/android/mcaptest.c
+++ b/android/mcaptest.c
@@ -38,7 +38,7 @@
#include "btio/btio.h"
#include "lib/l2cap.h"
-#include "profiles/health/mcap-lib.h"
+#include "profiles/health/mcap.h"
enum {
MODE_NONE,
diff --git a/profiles/health/hdp.c b/profiles/health/hdp.c
index d2e634ae7..c1ce1b8c7 100644
--- a/profiles/health/hdp.c
+++ b/profiles/health/hdp.c
@@ -45,7 +45,7 @@
#include "hdp_types.h"
#include "hdp_util.h"
#include "hdp.h"
-#include "mcap-lib.h"
+#include "mcap.h"
#define ECHO_TIMEOUT 1 /* second */
#define HDP_ECHO_LEN 15
diff --git a/profiles/health/hdp_util.c b/profiles/health/hdp_util.c
index c524054ad..af50b0191 100644
--- a/profiles/health/hdp_util.c
+++ b/profiles/health/hdp_util.c
@@ -48,7 +48,7 @@
#include "src/log.h"
#include "src/dbus-common.h"
-#include "mcap-lib.h"
+#include "mcap.h"
#include "hdp_types.h"
#include "hdp.h"
#include "hdp_util.h"
diff --git a/profiles/health/mcap-lib.c b/profiles/health/mcap.c
index 1706d9f6c..a20a7ad78 100644
--- a/profiles/health/mcap-lib.c
+++ b/profiles/health/mcap.c
@@ -38,7 +38,7 @@
#include "btio/btio.h"
#include "src/log.h"
-#include "mcap-lib.h"
+#include "mcap.h"
#define MCAP_BTCLOCK_HALF (MCAP_BTCLOCK_FIELD / 2)
#define CLK CLOCK_MONOTONIC
diff --git a/profiles/health/mcap-lib.h b/profiles/health/mcap.h
index 548d67259..548d67259 100644
--- a/profiles/health/mcap-lib.h
+++ b/profiles/health/mcap.h