* [PATCH 1/2] mcap: Rename mcap-lib to mcap
@ 2014-10-02 12:25 Ravi kumar Veeramally
2014-10-02 12:25 ` [PATCH 2/2] mcaptest: Move it from android to tools Ravi kumar Veeramally
2014-10-02 13:12 ` [PATCH 1/2] mcap: Rename mcap-lib to mcap Johan Hedberg
0 siblings, 2 replies; 3+ messages in thread
From: Ravi kumar Veeramally @ 2014-10-02 12:25 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Ravi kumar Veeramally
---
Makefile.plugins | 2 +-
android/Android.mk | 4 ++--
android/Makefile.am | 4 ++--
android/health.c | 2 +-
android/mcaptest.c | 2 +-
profiles/health/hdp.c | 2 +-
profiles/health/hdp_util.c | 2 +-
profiles/health/{mcap-lib.c => mcap.c} | 2 +-
profiles/health/{mcap-lib.h => mcap.h} | 0
9 files changed, 10 insertions(+), 10 deletions(-)
rename profiles/health/{mcap-lib.c => mcap.c} (99%)
rename profiles/health/{mcap-lib.h => mcap.h} (100%)
diff --git a/Makefile.plugins b/Makefile.plugins
index 7fd0e50..0448b91 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 3ace786..eb67690 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 4953531..75802dd 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 5d161e0..75811aa 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 638220b..5ef030c 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 d2e634a..c1ce1b8 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 c524054..af50b01 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
similarity index 99%
rename from profiles/health/mcap-lib.c
rename to profiles/health/mcap.c
index 1706d9f..a20a7ad 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
similarity index 100%
rename from profiles/health/mcap-lib.h
rename to profiles/health/mcap.h
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] mcaptest: Move it from android to tools
2014-10-02 12:25 [PATCH 1/2] mcap: Rename mcap-lib to mcap Ravi kumar Veeramally
@ 2014-10-02 12:25 ` Ravi kumar Veeramally
2014-10-02 13:12 ` [PATCH 1/2] mcap: Rename mcap-lib to mcap Johan Hedberg
1 sibling, 0 replies; 3+ messages in thread
From: Ravi kumar Veeramally @ 2014-10-02 12:25 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Ravi kumar Veeramally
---
.gitignore | 2 +-
Makefile.tools | 8 +++++++-
android/Android.mk | 2 +-
android/Makefile.am | 9 ---------
{android => tools}/mcaptest.c | 0
5 files changed, 9 insertions(+), 12 deletions(-)
rename {android => tools}/mcaptest.c (100%)
diff --git a/.gitignore b/.gitignore
index e22274f..65d77a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -75,6 +75,7 @@ tools/3dsp
tools/obexctl
tools/gatt-service
tools/btgatt-client
+tools/mcaptest
test/sap_client.pyc
test/bluezutils.pyc
unit/test-ringbuf
@@ -127,7 +128,6 @@ doc/btmon.1
android/system-emulator
android/bluetoothd
android/avdtptest
-android/mcaptest
android/haltest
android/android-tester
android/ipc-tester
diff --git a/Makefile.tools b/Makefile.tools
index d901284..42cccc6 100644
--- a/Makefile.tools
+++ b/Makefile.tools
@@ -119,7 +119,7 @@ if TOOLS
bin_PROGRAMS += tools/hciattach tools/hciconfig tools/hcitool tools/hcidump \
tools/rfcomm tools/rctest tools/l2test tools/l2ping \
tools/sdptool tools/ciptool tools/bccmd \
- tools/bluemoon tools/mpris-proxy
+ tools/bluemoon tools/mpris-proxy tools/mcaptest
tools_hciattach_SOURCES = tools/hciattach.c tools/hciattach.h \
tools/hciattach_st.c \
@@ -189,6 +189,12 @@ tools_bluemoon_LDADD = src/libshared-mainloop.la
tools_mpris_proxy_SOURCES = tools/mpris-proxy.c
tools_mpris_proxy_LDADD = gdbus/libgdbus-internal.la @GLIB_LIBS@ @DBUS_LIBS@
+tools_mcaptest_SOURCES = tools/mcaptest.c \
+ btio/btio.h btio/btio.c \
+ src/log.c src/log.h \
+ profiles/health/mcap.h profiles/health/mcap.c
+tools_mcaptest_LDADD = lib/libbluetooth-internal.la @GLIB_LIBS@
+
dist_man_MANS += tools/hciattach.1 tools/hciconfig.1 \
tools/hcitool.1 tools/hcidump.1 \
tools/rfcomm.1 tools/rctest.1 tools/l2ping.1 \
diff --git a/android/Android.mk b/android/Android.mk
index eb67690..3daa260 100644
--- a/android/Android.mk
+++ b/android/Android.mk
@@ -212,7 +212,7 @@ LOCAL_SRC_FILES := \
bluez/lib/bluetooth.c \
bluez/lib/hci.c \
bluez/profiles/health/mcap.c \
- bluez/android/mcaptest.c \
+ bluez/tools/mcaptest.c \
LOCAL_C_INCLUDES := \
$(call include-path-for, glib) \
diff --git a/android/Makefile.am b/android/Makefile.am
index 75802dd..7ae2c76 100644
--- a/android/Makefile.am
+++ b/android/Makefile.am
@@ -90,15 +90,6 @@ android_bluetooth_default_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/android
android_bluetooth_default_la_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version \
-no-undefined
-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.h profiles/health/mcap.c
-android_mcaptest_CFLAGS = $(AM_CFLAGS)
-android_mcaptest_LDADD = lib/libbluetooth-internal.la @GLIB_LIBS@
-
noinst_PROGRAMS += android/avdtptest
android_avdtptest_SOURCES = android/avdtptest.c \
diff --git a/android/mcaptest.c b/tools/mcaptest.c
similarity index 100%
rename from android/mcaptest.c
rename to tools/mcaptest.c
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/2] mcap: Rename mcap-lib to mcap
2014-10-02 12:25 [PATCH 1/2] mcap: Rename mcap-lib to mcap Ravi kumar Veeramally
2014-10-02 12:25 ` [PATCH 2/2] mcaptest: Move it from android to tools Ravi kumar Veeramally
@ 2014-10-02 13:12 ` Johan Hedberg
1 sibling, 0 replies; 3+ messages in thread
From: Johan Hedberg @ 2014-10-02 13:12 UTC (permalink / raw)
To: Ravi kumar Veeramally; +Cc: linux-bluetooth
Hi Ravi,
On Thu, Oct 02, 2014, Ravi kumar Veeramally wrote:
> ---
> Makefile.plugins | 2 +-
> android/Android.mk | 4 ++--
> android/Makefile.am | 4 ++--
> android/health.c | 2 +-
> android/mcaptest.c | 2 +-
> profiles/health/hdp.c | 2 +-
> profiles/health/hdp_util.c | 2 +-
> profiles/health/{mcap-lib.c => mcap.c} | 2 +-
> profiles/health/{mcap-lib.h => mcap.h} | 0
> 9 files changed, 10 insertions(+), 10 deletions(-)
> rename profiles/health/{mcap-lib.c => mcap.c} (99%)
> rename profiles/health/{mcap-lib.h => mcap.h} (100%)
Both of these patches have been applied. Thanks.
Johan
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-10-02 13:12 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-10-02 12:25 [PATCH 1/2] mcap: Rename mcap-lib to mcap Ravi kumar Veeramally
2014-10-02 12:25 ` [PATCH 2/2] mcaptest: Move it from android to tools Ravi kumar Veeramally
2014-10-02 13:12 ` [PATCH 1/2] mcap: Rename mcap-lib to mcap Johan Hedberg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).