* [PATCH 2/5] android: Fix haltest build on Linux
2013-10-17 20:28 [PATCH 1/5] build: Add haltest command line tester Szymon Janc
@ 2013-10-17 20:28 ` Szymon Janc
2013-10-17 20:28 ` [PATCH 3/5] android: Fix crash in property_get stub Szymon Janc
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Szymon Janc @ 2013-10-17 20:28 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Szymon Janc
From: Szymon Janc <szymon.janc@tieto.com>
On Linux HAL library is build into haltest binary and can be access
directly. Provide simple implementation of hw_get_module() that does
it.
---
Makefile.android | 3 ++-
android/client/hwmodule.c | 27 +++++++++++++++++++++++++++
2 files changed, 29 insertions(+), 1 deletion(-)
create mode 100644 android/client/hwmodule.c
diff --git a/Makefile.android b/Makefile.android
index 3bc95be..00d962d 100644
--- a/Makefile.android
+++ b/Makefile.android
@@ -39,7 +39,8 @@ android_haltest_SOURCES = android/client/haltest.c \
android/client/terminal.c \
android/client/history.c \
android/client/textconv.c \
- android/client/if-bt.c
+ android/client/if-bt.c \
+ android/client/hwmodule.c
android_haltest_LDADD = android/libhal-internal.la
diff --git a/android/client/hwmodule.c b/android/client/hwmodule.c
new file mode 100644
index 0000000..80e7475
--- /dev/null
+++ b/android/client/hwmodule.c
@@ -0,0 +1,27 @@
+/*
+ * Copyright (C) 2013 Intel Corporation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+*/
+
+#include "hardware/hardware.h"
+
+int hw_get_module(const char *id, const struct hw_module_t **module)
+{
+ extern struct hw_module_t HAL_MODULE_INFO_SYM;
+
+ *module = &HAL_MODULE_INFO_SYM;
+
+ return 0;
+}
--
1.8.4.rc3
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/5] android: Fix crash in property_get stub
2013-10-17 20:28 [PATCH 1/5] build: Add haltest command line tester Szymon Janc
2013-10-17 20:28 ` [PATCH 2/5] android: Fix haltest build on Linux Szymon Janc
@ 2013-10-17 20:28 ` Szymon Janc
2013-10-17 20:28 ` [PATCH 4/5] gitignore: Add android/haltest Szymon Janc
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Szymon Janc @ 2013-10-17 20:28 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Szymon Janc
From: Szymon Janc <szymon.janc@tieto.com>
If value was not found and default_value was not provided NULL pointer
was passed as argument to strncpy resulting in crash.
---
android/cutils/properties.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/android/cutils/properties.h b/android/cutils/properties.h
index a9f7554..44a712c 100644
--- a/android/cutils/properties.h
+++ b/android/cutils/properties.h
@@ -43,7 +43,7 @@ static inline int property_get(const char *key, char *value,
if (!env)
env = default_value;
- if (!value)
+ if (!value || !env)
return 0;
strncpy(value, env, PROPERTY_VALUE_MAX);
--
1.8.4.rc3
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 4/5] gitignore: Add android/haltest
2013-10-17 20:28 [PATCH 1/5] build: Add haltest command line tester Szymon Janc
2013-10-17 20:28 ` [PATCH 2/5] android: Fix haltest build on Linux Szymon Janc
2013-10-17 20:28 ` [PATCH 3/5] android: Fix crash in property_get stub Szymon Janc
@ 2013-10-17 20:28 ` Szymon Janc
2013-10-17 20:28 ` [PATCH 5/5] build: Add missing Android files to EXTRA_DIST Szymon Janc
2013-10-18 7:16 ` [PATCH 1/5] build: Add haltest command line tester Johan Hedberg
4 siblings, 0 replies; 6+ messages in thread
From: Szymon Janc @ 2013-10-17 20:28 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Szymon Janc
From: Szymon Janc <szymon.janc@tieto.com>
---
.gitignore | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitignore b/.gitignore
index 6b97247..520a3f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -103,3 +103,4 @@ unit/test-*.log
unit/test-*.trs
android/bluetoothd
+android/haltest
--
1.8.4.rc3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 5/5] build: Add missing Android files to EXTRA_DIST
2013-10-17 20:28 [PATCH 1/5] build: Add haltest command line tester Szymon Janc
` (2 preceding siblings ...)
2013-10-17 20:28 ` [PATCH 4/5] gitignore: Add android/haltest Szymon Janc
@ 2013-10-17 20:28 ` Szymon Janc
2013-10-18 7:16 ` [PATCH 1/5] build: Add haltest command line tester Johan Hedberg
4 siblings, 0 replies; 6+ messages in thread
From: Szymon Janc @ 2013-10-17 20:28 UTC (permalink / raw)
To: linux-bluetooth; +Cc: Szymon Janc
From: Szymon Janc <szymon.janc@tieto.com>
---
Makefile.android | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/Makefile.android b/Makefile.android
index 00d962d..8ae3ddc 100644
--- a/Makefile.android
+++ b/Makefile.android
@@ -48,7 +48,24 @@ android_haltest_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/android
endif
-EXTRA_DIST += android/Android.mk android/log.c
+EXTRA_DIST += android/Android.mk android/log.c android/device.c \
+ android/adapter.c android/main.c android/hal-msg.h \
+ android/hal.h
+
+EXTRA_DIST += android/hal_bt_sock.c android/hal_bluetooth.c
+
+EXTRA_DIST += android/client/terminal.c \
+ android/client/haltest.c \
+ android/client/hwmodule.c \
+ android/client/pollhandler.c \
+ android/client/history.c \
+ android/client/if-bt.c \
+ android/client/textconv.c \
+ android/client/textconv.h \
+ android/client/if-main.h \
+ android/client/pollhandler.h \
+ android/client/history.h \
+ android/client/terminal.h
EXTRA_DIST += android/hal-ipc-api.txt
--
1.8.4.rc3
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 1/5] build: Add haltest command line tester
2013-10-17 20:28 [PATCH 1/5] build: Add haltest command line tester Szymon Janc
` (3 preceding siblings ...)
2013-10-17 20:28 ` [PATCH 5/5] build: Add missing Android files to EXTRA_DIST Szymon Janc
@ 2013-10-18 7:16 ` Johan Hedberg
4 siblings, 0 replies; 6+ messages in thread
From: Johan Hedberg @ 2013-10-18 7:16 UTC (permalink / raw)
To: Szymon Janc; +Cc: linux-bluetooth, Szymon Janc
Hi Szymon,
On Thu, Oct 17, 2013, Szymon Janc wrote:
> This is intended for testing Android daemon and HAL library on Linux.
> ---
> Makefile.android | 14 ++++++++++++++
> 1 file changed, 14 insertions(+)
All five patches have been applied. Thanks.
Johan
^ permalink raw reply [flat|nested] 6+ messages in thread