2013-10-17 07:11:37

by Andrei Emeltchenko

Subject: [PATCH 1/2] android: Make toool compile on Android 4.2.2

From: Andrei Emeltchenko <[email protected]>

On our current target the tools cannot be compiled.
---
android/client/if-bt.c | 4 ++++
android/client/if-main.h | 3 +++
android/client/textconv.c | 2 ++
3 files changed, 9 insertions(+)

diff --git a/android/client/if-bt.c b/android/client/if-bt.c
index a0a4bd9..7b4e71e 100644
--- a/android/client/if-bt.c
+++ b/android/client/if-bt.c
@@ -277,7 +277,9 @@ static bt_callbacks_t bt_callbacks = {
.acl_state_changed_cb = acl_state_changed_cb,
.thread_evt_cb = thread_evt_cb,
.dut_mode_recv_cb = dut_mode_recv_cb,
+#if PLATFORM_SDK_VERSION > 17
.le_test_mode_cb = le_test_mode_cb
+#endif
};

static void init_p(int argc, const char **argv)
@@ -577,8 +579,10 @@ static void get_profile_interface_p(int argc, const char **argv)
pif = &dummy; /* TODO: chenge when if_hh is there */
else if (strcmp(BT_PROFILE_PAN_ID, id) == 0)
pif = &dummy; /* TODO: chenge when if_pan is there */
+#if PLATFORM_SDK_VERSION > 17
else if (strcmp(BT_PROFILE_AV_RC_ID, id) == 0)
pif = &dummy; /* TODO: chenge when if_rc is there */
+#endif
else
haltest_error("%s is not correct for get_profile_interface\n",
id);
diff --git a/android/client/if-main.h b/android/client/if-main.h
index 9cac7ef..1cebb72 100644
--- a/android/client/if-main.h
+++ b/android/client/if-main.h
@@ -35,7 +35,10 @@
#include <hardware/bt_sock.h>
#include <hardware/bt_hf.h>
#include <hardware/bt_hl.h>
+
+#if PLATFORM_SDK_VERSION > 17
#include <hardware/bt_rc.h>
+#endif

#include "textconv.h"

diff --git a/android/client/textconv.c b/android/client/textconv.c
index eebad70..f38e368 100644
--- a/android/client/textconv.c
+++ b/android/client/textconv.c
@@ -94,7 +94,9 @@ INTMAP(bt_property_type_t, -1, "(unknown)")
DELEMENT(BT_PROPERTY_ADAPTER_DISCOVERY_TIMEOUT),
DELEMENT(BT_PROPERTY_REMOTE_FRIENDLY_NAME),
DELEMENT(BT_PROPERTY_REMOTE_RSSI),
+#if PLATFORM_SDK_VERSION > 17
DELEMENT(BT_PROPERTY_REMOTE_VERSION_INFO),
+#endif
DELEMENT(BT_PROPERTY_REMOTE_DEVICE_TIMESTAMP),
ENDMAP

--
1.7.10.4

2013-10-18 08:09:25

by Szymon Janc

Subject: Re: [PATCHv2 2/2] android: Make toool compile on Android 4.2.2

Hi Andrei,

> From: Andrei Emeltchenko <[email protected]>
>
> On our current target the tools cannot be compiled.
> ---
> android/Android.mk | 2 ++
> android/client/if-bt.c | 4 ++++
> android/client/if-main.h | 3 +++
> android/client/textconv.c | 2 ++
> 4 files changed, 11 insertions(+)
>
> diff --git a/android/Android.mk b/android/Android.mk
> index f59afc6..e63add9 100644
> --- a/android/Android.mk
> +++ b/android/Android.mk
> @@ -92,6 +92,8 @@ LOCAL_SRC_FILES := \
> client/textconv.c \
> client/if-bt.c \
>
> +LOCAL_CFLAGS := -DPLATFORM_SDK_VERSION=$(PLATFORM_SDK_VERSION)

I suppose we should also define this for autotools build. Otherwise this
will not be build on Linux.

> +
> LOCAL_SHARED_LIBRARIES := libhardware
>
> LOCAL_MODULE_TAGS := optional
> diff --git a/android/client/if-bt.c b/android/client/if-bt.c
> index 90ef732..6aadeef 100644
> --- a/android/client/if-bt.c
> +++ b/android/client/if-bt.c
> @@ -277,7 +277,9 @@ static bt_callbacks_t bt_callbacks = {
> .acl_state_changed_cb = acl_state_changed_cb,
> .thread_evt_cb = thread_evt_cb,
> .dut_mode_recv_cb = dut_mode_recv_cb,
> +#if PLATFORM_SDK_VERSION > 17
> .le_test_mode_cb = le_test_mode_cb
> +#endif
> };
>
> static void init_p(int argc, const char **argv)
> @@ -577,8 +579,10 @@ static void get_profile_interface_p(int argc, const char **argv)
> pif = &dummy; /* TODO: change when if_hh is there */
> else if (strcmp(BT_PROFILE_PAN_ID, id) == 0)
> pif = &dummy; /* TODO: change when if_pan is there */
> +#if PLATFORM_SDK_VERSION > 17
> else if (strcmp(BT_PROFILE_AV_RC_ID, id) == 0)
> pif = &dummy; /* TODO: change when if_rc is there */
> +#endif
> else
> haltest_error("%s is not correct for get_profile_interface\n",
> id);
> diff --git a/android/client/if-main.h b/android/client/if-main.h
> index 9cac7ef..1cebb72 100644
> --- a/android/client/if-main.h
> +++ b/android/client/if-main.h
> @@ -35,7 +35,10 @@
> #include <hardware/bt_sock.h>
> #include <hardware/bt_hf.h>
> #include <hardware/bt_hl.h>
> +
> +#if PLATFORM_SDK_VERSION > 17
> #include <hardware/bt_rc.h>
> +#endif
>
> #include "textconv.h"
>
> diff --git a/android/client/textconv.c b/android/client/textconv.c
> index eebad70..f38e368 100644
> --- a/android/client/textconv.c
> +++ b/android/client/textconv.c
> @@ -94,7 +94,9 @@ INTMAP(bt_property_type_t, -1, "(unknown)")
> DELEMENT(BT_PROPERTY_ADAPTER_DISCOVERY_TIMEOUT),
> DELEMENT(BT_PROPERTY_REMOTE_FRIENDLY_NAME),
> DELEMENT(BT_PROPERTY_REMOTE_RSSI),
> +#if PLATFORM_SDK_VERSION > 17
> DELEMENT(BT_PROPERTY_REMOTE_VERSION_INFO),
> +#endif
> DELEMENT(BT_PROPERTY_REMOTE_DEVICE_TIMESTAMP),
> ENDMAP
>
>

--
BR
Szymon Janc

2013-10-17 11:59:26

by Johan Hedberg

Subject: Re: [PATCHv2 1/2] android: trivial typo fix

Hi Andrei,

On Thu, Oct 17, 2013, Andrei Emeltchenko wrote:
> ---
> android/client/if-bt.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)

This patch has been applied. Thanks.

Johan

2013-10-17 08:50:26

by Andrei Emeltchenko

Subject: [PATCHv2 0/2] Fxies for Android client tool

From: Andrei Emeltchenko <[email protected]>

Make tool buildable on android-ia and trivial typo fix.

Changes:
* v2: Fixed issue not including files for 4.3 reported by Jerzy.

Andrei Emeltchenko (2):
android: trivial typo fix
android: Make toool compile on Android 4.2.2

android/Android.mk | 2 ++
android/client/if-bt.c | 18 +++++++++++-------
android/client/if-main.h | 3 +++
android/client/textconv.c | 2 ++
4 files changed, 18 insertions(+), 7 deletions(-)

--
1.7.10.4

2013-10-17 08:50:28

by Andrei Emeltchenko

Subject: [PATCHv2 2/2] android: Make toool compile on Android 4.2.2

From: Andrei Emeltchenko <[email protected]>

On our current target the tools cannot be compiled.
---
android/Android.mk | 2 ++
android/client/if-bt.c | 4 ++++
android/client/if-main.h | 3 +++
android/client/textconv.c | 2 ++
4 files changed, 11 insertions(+)

diff --git a/android/Android.mk b/android/Android.mk
index f59afc6..e63add9 100644
--- a/android/Android.mk
+++ b/android/Android.mk
@@ -92,6 +92,8 @@ LOCAL_SRC_FILES := \
client/textconv.c \
client/if-bt.c \

+LOCAL_CFLAGS := -DPLATFORM_SDK_VERSION=$(PLATFORM_SDK_VERSION)
+
LOCAL_SHARED_LIBRARIES := libhardware

LOCAL_MODULE_TAGS := optional
diff --git a/android/client/if-bt.c b/android/client/if-bt.c
index 90ef732..6aadeef 100644
--- a/android/client/if-bt.c
+++ b/android/client/if-bt.c
@@ -277,7 +277,9 @@ static bt_callbacks_t bt_callbacks = {
.acl_state_changed_cb = acl_state_changed_cb,
.thread_evt_cb = thread_evt_cb,
.dut_mode_recv_cb = dut_mode_recv_cb,
+#if PLATFORM_SDK_VERSION > 17
.le_test_mode_cb = le_test_mode_cb
+#endif
};

static void init_p(int argc, const char **argv)
@@ -577,8 +579,10 @@ static void get_profile_interface_p(int argc, const char **argv)
pif = &dummy; /* TODO: change when if_hh is there */
else if (strcmp(BT_PROFILE_PAN_ID, id) == 0)
pif = &dummy; /* TODO: change when if_pan is there */
+#if PLATFORM_SDK_VERSION > 17
else if (strcmp(BT_PROFILE_AV_RC_ID, id) == 0)
pif = &dummy; /* TODO: change when if_rc is there */
+#endif
else
haltest_error("%s is not correct for get_profile_interface\n",
id);
diff --git a/android/client/if-main.h b/android/client/if-main.h
index 9cac7ef..1cebb72 100644
--- a/android/client/if-main.h
+++ b/android/client/if-main.h
@@ -35,7 +35,10 @@
#include <hardware/bt_sock.h>
#include <hardware/bt_hf.h>
#include <hardware/bt_hl.h>
+
+#if PLATFORM_SDK_VERSION > 17
#include <hardware/bt_rc.h>
+#endif

#include "textconv.h"

diff --git a/android/client/textconv.c b/android/client/textconv.c
index eebad70..f38e368 100644
--- a/android/client/textconv.c
+++ b/android/client/textconv.c
@@ -94,7 +94,9 @@ INTMAP(bt_property_type_t, -1, "(unknown)")
DELEMENT(BT_PROPERTY_ADAPTER_DISCOVERY_TIMEOUT),
DELEMENT(BT_PROPERTY_REMOTE_FRIENDLY_NAME),
DELEMENT(BT_PROPERTY_REMOTE_RSSI),
+#if PLATFORM_SDK_VERSION > 17
DELEMENT(BT_PROPERTY_REMOTE_VERSION_INFO),
+#endif
DELEMENT(BT_PROPERTY_REMOTE_DEVICE_TIMESTAMP),
ENDMAP

--
1.7.10.4

2013-10-17 08:50:27

by Andrei Emeltchenko

Subject: [PATCHv2 1/2] android: trivial typo fix

From: Andrei Emeltchenko <[email protected]>

---
android/client/if-bt.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/android/client/if-bt.c b/android/client/if-bt.c
index a0a4bd9..90ef732 100644
--- a/android/client/if-bt.c
+++ b/android/client/if-bt.c
@@ -566,19 +566,19 @@ static void get_profile_interface_p(int argc, const char **argv)
RETURN_IF_NULL(if_bluetooth);

if (strcmp(BT_PROFILE_HANDSFREE_ID, id) == 0)
- pif = &dummy; /* TODO: chenge when if_hf is there */
+ pif = &dummy; /* TODO: change when if_hf is there */
else if (strcmp(BT_PROFILE_ADVANCED_AUDIO_ID, id) == 0)
- pif = &dummy; /* TODO: chenge when if_av is there */
+ pif = &dummy; /* TODO: change when if_av is there */
else if (strcmp(BT_PROFILE_HEALTH_ID, id) == 0)
- pif = &dummy; /* TODO: chenge when if_hl is there */
+ pif = &dummy; /* TODO: change when if_hl is there */
else if (strcmp(BT_PROFILE_SOCKETS_ID, id) == 0)
- pif = &dummy; /* TODO: chenge when if_sock is there */
+ pif = &dummy; /* TODO: change when if_sock is there */
else if (strcmp(BT_PROFILE_HIDHOST_ID, id) == 0)
- pif = &dummy; /* TODO: chenge when if_hh is there */
+ pif = &dummy; /* TODO: change when if_hh is there */
else if (strcmp(BT_PROFILE_PAN_ID, id) == 0)
- pif = &dummy; /* TODO: chenge when if_pan is there */
+ pif = &dummy; /* TODO: change when if_pan is there */
else if (strcmp(BT_PROFILE_AV_RC_ID, id) == 0)
- pif = &dummy; /* TODO: chenge when if_rc is there */
+ pif = &dummy; /* TODO: change when if_rc is there */
else
haltest_error("%s is not correct for get_profile_interface\n",
id);
--
1.7.10.4

2013-10-17 08:28:08

by Andrei Emeltchenko

Subject: Re: [PATCH 1/2] android: Make toool compile on Android 4.2.2

On Thu, Oct 17, 2013 at 10:16:18AM +0200, Jerzy Kasenberg wrote:
> Hi Andrei,
>
> No error, but since it's not defined code is never included in version above 17
>

OK, got it. I thought those flags are added automatically to build by
Android.

Best regards
Andrei Emeltchenko
> --
> Best regards
> Jerzy Kasenberg
>
> On 17 October 2013 10:11, Andrei Emeltchenko
> <[email protected]> wrote:
> > Hi Jerzy,
> >
> > On Thu, Oct 17, 2013 at 10:06:52AM +0200, Jerzy Kasenberg wrote:
> >> Hi Andrei,
> >>
> >> Shouldn't PLATFORM_SDK_VERSION be defined in Android.mk?
> >
> > No, it works as is for me. Do you have errors?
> >
> > Best regards
> > Andrei Emeltchenko
> >
> >>
> >> LOCAL_CFLAGS := -DPLATFORM_SDK_VERSION=$(PLATFORM_SDK_VERSION)
> >>
> >> --
> >> Best regards
> >> Jerzy Kasenberg
> >>
> >> On 17 October 2013 09:11, Andrei Emeltchenko
> >> <[email protected]> wrote:
> >> > From: Andrei Emeltchenko <[email protected]>
> >> >
> >> > On our current target the tools cannot be compiled.
> >> > ---
> >> > android/client/if-bt.c | 4 ++++
> >> > android/client/if-main.h | 3 +++
> >> > android/client/textconv.c | 2 ++
> >> > 3 files changed, 9 insertions(+)
> >> >
> >> > diff --git a/android/client/if-bt.c b/android/client/if-bt.c
> >> > index a0a4bd9..7b4e71e 100644
> >> > --- a/android/client/if-bt.c
> >> > +++ b/android/client/if-bt.c
> >> > @@ -277,7 +277,9 @@ static bt_callbacks_t bt_callbacks = {
> >> > .acl_state_changed_cb = acl_state_changed_cb,
> >> > .thread_evt_cb = thread_evt_cb,
> >> > .dut_mode_recv_cb = dut_mode_recv_cb,
> >> > +#if PLATFORM_SDK_VERSION > 17
> >> > .le_test_mode_cb = le_test_mode_cb
> >> > +#endif
> >> > };
> >> >
> >> > static void init_p(int argc, const char **argv)
> >> > @@ -577,8 +579,10 @@ static void get_profile_interface_p(int argc, const char **argv)
> >> > pif = &dummy; /* TODO: chenge when if_hh is there */
> >> > else if (strcmp(BT_PROFILE_PAN_ID, id) == 0)
> >> > pif = &dummy; /* TODO: chenge when if_pan is there */
> >> > +#if PLATFORM_SDK_VERSION > 17
> >> > else if (strcmp(BT_PROFILE_AV_RC_ID, id) == 0)
> >> > pif = &dummy; /* TODO: chenge when if_rc is there */
> >> > +#endif
> >> > else
> >> > haltest_error("%s is not correct for get_profile_interface\n",
> >> > id);
> >> > diff --git a/android/client/if-main.h b/android/client/if-main.h
> >> > index 9cac7ef..1cebb72 100644
> >> > --- a/android/client/if-main.h
> >> > +++ b/android/client/if-main.h
> >> > @@ -35,7 +35,10 @@
> >> > #include <hardware/bt_sock.h>
> >> > #include <hardware/bt_hf.h>
> >> > #include <hardware/bt_hl.h>
> >> > +
> >> > +#if PLATFORM_SDK_VERSION > 17
> >> > #include <hardware/bt_rc.h>
> >> > +#endif
> >> >
> >> > #include "textconv.h"
> >> >
> >> > diff --git a/android/client/textconv.c b/android/client/textconv.c
> >> > index eebad70..f38e368 100644
> >> > --- a/android/client/textconv.c
> >> > +++ b/android/client/textconv.c
> >> > @@ -94,7 +94,9 @@ INTMAP(bt_property_type_t, -1, "(unknown)")
> >> > DELEMENT(BT_PROPERTY_ADAPTER_DISCOVERY_TIMEOUT),
> >> > DELEMENT(BT_PROPERTY_REMOTE_FRIENDLY_NAME),
> >> > DELEMENT(BT_PROPERTY_REMOTE_RSSI),
> >> > +#if PLATFORM_SDK_VERSION > 17
> >> > DELEMENT(BT_PROPERTY_REMOTE_VERSION_INFO),
> >> > +#endif
> >> > DELEMENT(BT_PROPERTY_REMOTE_DEVICE_TIMESTAMP),
> >> > ENDMAP
> >> >
> >> > --
> >> > 1.7.10.4
> >> >
> >> > --
> >> > To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
> >> > the body of a message to [email protected]
> >> > More majordomo info at http://vger.kernel.org/majordomo-info.html

2013-10-17 08:16:18

by Jerzy Kasenberg

Subject: Re: [PATCH 1/2] android: Make toool compile on Android 4.2.2

Hi Andrei,

No error, but since it's not defined code is never included in version above 17

--
Best regards
Jerzy Kasenberg

On 17 October 2013 10:11, Andrei Emeltchenko
<[email protected]> wrote:
> Hi Jerzy,
>
> On Thu, Oct 17, 2013 at 10:06:52AM +0200, Jerzy Kasenberg wrote:
>> Hi Andrei,
>>
>> Shouldn't PLATFORM_SDK_VERSION be defined in Android.mk?
>
> No, it works as is for me. Do you have errors?
>
> Best regards
> Andrei Emeltchenko
>
>>
>> LOCAL_CFLAGS := -DPLATFORM_SDK_VERSION=$(PLATFORM_SDK_VERSION)
>>
>> --
>> Best regards
>> Jerzy Kasenberg
>>
>> On 17 October 2013 09:11, Andrei Emeltchenko
>> <[email protected]> wrote:
>> > From: Andrei Emeltchenko <[email protected]>
>> >
>> > On our current target the tools cannot be compiled.
>> > ---
>> > android/client/if-bt.c | 4 ++++
>> > android/client/if-main.h | 3 +++
>> > android/client/textconv.c | 2 ++
>> > 3 files changed, 9 insertions(+)
>> >
>> > diff --git a/android/client/if-bt.c b/android/client/if-bt.c
>> > index a0a4bd9..7b4e71e 100644
>> > --- a/android/client/if-bt.c
>> > +++ b/android/client/if-bt.c
>> > @@ -277,7 +277,9 @@ static bt_callbacks_t bt_callbacks = {
>> > .acl_state_changed_cb = acl_state_changed_cb,
>> > .thread_evt_cb = thread_evt_cb,
>> > .dut_mode_recv_cb = dut_mode_recv_cb,
>> > +#if PLATFORM_SDK_VERSION > 17
>> > .le_test_mode_cb = le_test_mode_cb
>> > +#endif
>> > };
>> >
>> > static void init_p(int argc, const char **argv)
>> > @@ -577,8 +579,10 @@ static void get_profile_interface_p(int argc, const char **argv)
>> > pif = &dummy; /* TODO: chenge when if_hh is there */
>> > else if (strcmp(BT_PROFILE_PAN_ID, id) == 0)
>> > pif = &dummy; /* TODO: chenge when if_pan is there */
>> > +#if PLATFORM_SDK_VERSION > 17
>> > else if (strcmp(BT_PROFILE_AV_RC_ID, id) == 0)
>> > pif = &dummy; /* TODO: chenge when if_rc is there */
>> > +#endif
>> > else
>> > haltest_error("%s is not correct for get_profile_interface\n",
>> > id);
>> > diff --git a/android/client/if-main.h b/android/client/if-main.h
>> > index 9cac7ef..1cebb72 100644
>> > --- a/android/client/if-main.h
>> > +++ b/android/client/if-main.h
>> > @@ -35,7 +35,10 @@
>> > #include <hardware/bt_sock.h>
>> > #include <hardware/bt_hf.h>
>> > #include <hardware/bt_hl.h>
>> > +
>> > +#if PLATFORM_SDK_VERSION > 17
>> > #include <hardware/bt_rc.h>
>> > +#endif
>> >
>> > #include "textconv.h"
>> >
>> > diff --git a/android/client/textconv.c b/android/client/textconv.c
>> > index eebad70..f38e368 100644
>> > --- a/android/client/textconv.c
>> > +++ b/android/client/textconv.c
>> > @@ -94,7 +94,9 @@ INTMAP(bt_property_type_t, -1, "(unknown)")
>> > DELEMENT(BT_PROPERTY_ADAPTER_DISCOVERY_TIMEOUT),
>> > DELEMENT(BT_PROPERTY_REMOTE_FRIENDLY_NAME),
>> > DELEMENT(BT_PROPERTY_REMOTE_RSSI),
>> > +#if PLATFORM_SDK_VERSION > 17
>> > DELEMENT(BT_PROPERTY_REMOTE_VERSION_INFO),
>> > +#endif
>> > DELEMENT(BT_PROPERTY_REMOTE_DEVICE_TIMESTAMP),
>> > ENDMAP
>> >
>> > --
>> > 1.7.10.4
>> >
>> > --
>> > To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
>> > the body of a message to [email protected]
>> > More majordomo info at http://vger.kernel.org/majordomo-info.html

2013-10-17 08:11:06

by Andrei Emeltchenko

Subject: Re: [PATCH 1/2] android: Make toool compile on Android 4.2.2

Hi Jerzy,

On Thu, Oct 17, 2013 at 10:06:52AM +0200, Jerzy Kasenberg wrote:
> Hi Andrei,
>
> Shouldn't PLATFORM_SDK_VERSION be defined in Android.mk?

No, it works as is for me. Do you have errors?

Best regards
Andrei Emeltchenko

>
> LOCAL_CFLAGS := -DPLATFORM_SDK_VERSION=$(PLATFORM_SDK_VERSION)
>
> --
> Best regards
> Jerzy Kasenberg
>
> On 17 October 2013 09:11, Andrei Emeltchenko
> <[email protected]> wrote:
> > From: Andrei Emeltchenko <[email protected]>
> >
> > On our current target the tools cannot be compiled.
> > ---
> > android/client/if-bt.c | 4 ++++
> > android/client/if-main.h | 3 +++
> > android/client/textconv.c | 2 ++
> > 3 files changed, 9 insertions(+)
> >
> > diff --git a/android/client/if-bt.c b/android/client/if-bt.c
> > index a0a4bd9..7b4e71e 100644
> > --- a/android/client/if-bt.c
> > +++ b/android/client/if-bt.c
> > @@ -277,7 +277,9 @@ static bt_callbacks_t bt_callbacks = {
> > .acl_state_changed_cb = acl_state_changed_cb,
> > .thread_evt_cb = thread_evt_cb,
> > .dut_mode_recv_cb = dut_mode_recv_cb,
> > +#if PLATFORM_SDK_VERSION > 17
> > .le_test_mode_cb = le_test_mode_cb
> > +#endif
> > };
> >
> > static void init_p(int argc, const char **argv)
> > @@ -577,8 +579,10 @@ static void get_profile_interface_p(int argc, const char **argv)
> > pif = &dummy; /* TODO: chenge when if_hh is there */
> > else if (strcmp(BT_PROFILE_PAN_ID, id) == 0)
> > pif = &dummy; /* TODO: chenge when if_pan is there */
> > +#if PLATFORM_SDK_VERSION > 17
> > else if (strcmp(BT_PROFILE_AV_RC_ID, id) == 0)
> > pif = &dummy; /* TODO: chenge when if_rc is there */
> > +#endif
> > else
> > haltest_error("%s is not correct for get_profile_interface\n",
> > id);
> > diff --git a/android/client/if-main.h b/android/client/if-main.h
> > index 9cac7ef..1cebb72 100644
> > --- a/android/client/if-main.h
> > +++ b/android/client/if-main.h
> > @@ -35,7 +35,10 @@
> > #include <hardware/bt_sock.h>
> > #include <hardware/bt_hf.h>
> > #include <hardware/bt_hl.h>
> > +
> > +#if PLATFORM_SDK_VERSION > 17
> > #include <hardware/bt_rc.h>
> > +#endif
> >
> > #include "textconv.h"
> >
> > diff --git a/android/client/textconv.c b/android/client/textconv.c
> > index eebad70..f38e368 100644
> > --- a/android/client/textconv.c
> > +++ b/android/client/textconv.c
> > @@ -94,7 +94,9 @@ INTMAP(bt_property_type_t, -1, "(unknown)")
> > DELEMENT(BT_PROPERTY_ADAPTER_DISCOVERY_TIMEOUT),
> > DELEMENT(BT_PROPERTY_REMOTE_FRIENDLY_NAME),
> > DELEMENT(BT_PROPERTY_REMOTE_RSSI),
> > +#if PLATFORM_SDK_VERSION > 17
> > DELEMENT(BT_PROPERTY_REMOTE_VERSION_INFO),
> > +#endif
> > DELEMENT(BT_PROPERTY_REMOTE_DEVICE_TIMESTAMP),
> > ENDMAP
> >
> > --
> > 1.7.10.4
> >
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
> > the body of a message to [email protected]
> > More majordomo info at http://vger.kernel.org/majordomo-info.html

2013-10-17 08:06:52

by Jerzy Kasenberg

Subject: Re: [PATCH 1/2] android: Make toool compile on Android 4.2.2

Hi Andrei,

Shouldn't PLATFORM_SDK_VERSION be defined in Android.mk?

LOCAL_CFLAGS := -DPLATFORM_SDK_VERSION=$(PLATFORM_SDK_VERSION)

--
Best regards
Jerzy Kasenberg

On 17 October 2013 09:11, Andrei Emeltchenko
<[email protected]> wrote:
> From: Andrei Emeltchenko <[email protected]>
>
> On our current target the tools cannot be compiled.
> ---
> android/client/if-bt.c | 4 ++++
> android/client/if-main.h | 3 +++
> android/client/textconv.c | 2 ++
> 3 files changed, 9 insertions(+)
>
> diff --git a/android/client/if-bt.c b/android/client/if-bt.c
> index a0a4bd9..7b4e71e 100644
> --- a/android/client/if-bt.c
> +++ b/android/client/if-bt.c
> @@ -277,7 +277,9 @@ static bt_callbacks_t bt_callbacks = {
> .acl_state_changed_cb = acl_state_changed_cb,
> .thread_evt_cb = thread_evt_cb,
> .dut_mode_recv_cb = dut_mode_recv_cb,
> +#if PLATFORM_SDK_VERSION > 17
> .le_test_mode_cb = le_test_mode_cb
> +#endif
> };
>
> static void init_p(int argc, const char **argv)
> @@ -577,8 +579,10 @@ static void get_profile_interface_p(int argc, const char **argv)
> pif = &dummy; /* TODO: chenge when if_hh is there */
> else if (strcmp(BT_PROFILE_PAN_ID, id) == 0)
> pif = &dummy; /* TODO: chenge when if_pan is there */
> +#if PLATFORM_SDK_VERSION > 17
> else if (strcmp(BT_PROFILE_AV_RC_ID, id) == 0)
> pif = &dummy; /* TODO: chenge when if_rc is there */
> +#endif
> else
> haltest_error("%s is not correct for get_profile_interface\n",
> id);
> diff --git a/android/client/if-main.h b/android/client/if-main.h
> index 9cac7ef..1cebb72 100644
> --- a/android/client/if-main.h
> +++ b/android/client/if-main.h
> @@ -35,7 +35,10 @@
> #include <hardware/bt_sock.h>
> #include <hardware/bt_hf.h>
> #include <hardware/bt_hl.h>
> +
> +#if PLATFORM_SDK_VERSION > 17
> #include <hardware/bt_rc.h>
> +#endif
>
> #include "textconv.h"
>
> diff --git a/android/client/textconv.c b/android/client/textconv.c
> index eebad70..f38e368 100644
> --- a/android/client/textconv.c
> +++ b/android/client/textconv.c
> @@ -94,7 +94,9 @@ INTMAP(bt_property_type_t, -1, "(unknown)")
> DELEMENT(BT_PROPERTY_ADAPTER_DISCOVERY_TIMEOUT),
> DELEMENT(BT_PROPERTY_REMOTE_FRIENDLY_NAME),
> DELEMENT(BT_PROPERTY_REMOTE_RSSI),
> +#if PLATFORM_SDK_VERSION > 17
> DELEMENT(BT_PROPERTY_REMOTE_VERSION_INFO),
> +#endif
> DELEMENT(BT_PROPERTY_REMOTE_DEVICE_TIMESTAMP),
> ENDMAP
>
> --
> 1.7.10.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html

2013-10-17 07:11:38

by Andrei Emeltchenko

Subject: [PATCH 2/2] android: trivial typo fix

From: Andrei Emeltchenko <[email protected]>

---
android/client/if-bt.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/android/client/if-bt.c b/android/client/if-bt.c
index 7b4e71e..6aadeef 100644
--- a/android/client/if-bt.c
+++ b/android/client/if-bt.c
@@ -568,20 +568,20 @@ static void get_profile_interface_p(int argc, const char **argv)
RETURN_IF_NULL(if_bluetooth);

if (strcmp(BT_PROFILE_HANDSFREE_ID, id) == 0)
- pif = &dummy; /* TODO: chenge when if_hf is there */
+ pif = &dummy; /* TODO: change when if_hf is there */
else if (strcmp(BT_PROFILE_ADVANCED_AUDIO_ID, id) == 0)
- pif = &dummy; /* TODO: chenge when if_av is there */
+ pif = &dummy; /* TODO: change when if_av is there */
else if (strcmp(BT_PROFILE_HEALTH_ID, id) == 0)
- pif = &dummy; /* TODO: chenge when if_hl is there */
+ pif = &dummy; /* TODO: change when if_hl is there */
else if (strcmp(BT_PROFILE_SOCKETS_ID, id) == 0)
- pif = &dummy; /* TODO: chenge when if_sock is there */
+ pif = &dummy; /* TODO: change when if_sock is there */
else if (strcmp(BT_PROFILE_HIDHOST_ID, id) == 0)
- pif = &dummy; /* TODO: chenge when if_hh is there */
+ pif = &dummy; /* TODO: change when if_hh is there */
else if (strcmp(BT_PROFILE_PAN_ID, id) == 0)
- pif = &dummy; /* TODO: chenge when if_pan is there */
+ pif = &dummy; /* TODO: change when if_pan is there */
#if PLATFORM_SDK_VERSION > 17
else if (strcmp(BT_PROFILE_AV_RC_ID, id) == 0)
- pif = &dummy; /* TODO: chenge when if_rc is there */
+ pif = &dummy; /* TODO: change when if_rc is there */
#endif
else
haltest_error("%s is not correct for get_profile_interface\n",
--
1.7.10.4