Hi Fred,
> Define local mapping to glib path, otherwise this has to be inside central
> place in the build repository.
>
> Retrieve Bluetooth version from configure.ac.
> ---
> .gitignore | 2 +
> Android.mk | 9 ++++
> Makefile.am | 1 +
> Makefile.android | 7 ++++
> android/Android.mk | 24 +++++++++++
> android/main.c | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++++
> configure.ac | 5 +++
> 7 files changed, 167 insertions(+)
> create mode 100644 Android.mk
> create mode 100644 Makefile.android
> create mode 100644 android/Android.mk
> create mode 100644 android/main.c
lets split this out a little bit. Code additions should not be intermixed with additions to the build system and especially configure options.
I rather not have a top-level Android.mk. It should be enough to provide an android/Android.mk.
> diff --git a/.gitignore b/.gitignore
> index 8a25a3e..331a18b 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -98,3 +98,5 @@ unit/test-gobex-packet
> unit/test-gobex-transfer
> unit/test-*.log
> unit/test-*.trs
> +
> +android/bluezd
If we keep using prefix btd_ for certain set of functions, then it might be better if the daemon is build as android/bluetoothd or android/btd.
<snip>
> +
> +#ifdef HAVE_CONFIG_H
> +#include <config.h>
> +#endif
> +
> +#include <signal.h>
> +#include <stdint.h>
> +#include <stdio.h>
> +#include <stdlib.h>
> +#include <string.h>
> +
> +#include <glib.h>
> +
> +#include "hcid.h"
I do not think we need to include hcid.h here. If we for some reason still do, then please try to cleanup that first.
> +
> +#define SHUTDOWN_GRACE_SECONDS 10
> +
> +static GMainLoop *event_loop;
> +
> +void btd_exit(void)
> +{
> + g_main_loop_quit(event_loop);
> +}
> +
> +static gboolean quit_eventloop(gpointer user_data)
> +{
> + btd_exit();
> + return FALSE;
> +}
> +
> +static void signal_handler(int sig)
> +{
> + static unsigned int __terminated = 0;
Make this static volatile bool __terminated = false instead. Remember that you are actually using signals here and not signalfd.
> +
> + switch (sig) {
> + case SIGINT:
> + case SIGTERM:
> + if (__terminated == 0) {
> + g_timeout_add_seconds(SHUTDOWN_GRACE_SECONDS,
> + quit_eventloop, NULL);
> + }
> +
> + __terminated = 1;
> + break;
> + }
> +}
> +
> +static gboolean option_detach = TRUE;
> +static gboolean option_version = FALSE;
> +
> +static GOptionEntry options[] = {
> + { "nodetach", 'n', G_OPTION_FLAG_REVERSE,
> + G_OPTION_ARG_NONE, &option_detach,
> + "Run with logging in foreground", NULL },
Do we need this option at all. I think we should always run in foreground and the system manager need to make sure we are spawned.
> + { "version", 'v', 0, G_OPTION_ARG_NONE, &option_version,
> + "Show version information and exit", NULL },
> + { NULL }
> +};
> +
> +int main(int argc, char *argv[])
> +{
> + GOptionContext *context;
> + GError *err = NULL;
> + struct sigaction sa;
> +
> + context = g_option_context_new(NULL);
> + g_option_context_add_main_entries(context, options, NULL);
> +
> + if (g_option_context_parse(context, &argc, &argv, &err) == FALSE) {
> + if (err != NULL) {
> + g_printerr("%s\n", err->message);
> + g_error_free(err);
> + } else
> + g_printerr("An unknown error occurred\n");
> + exit(1);
> + }
> +
> + g_option_context_free(context);
> +
> + if (option_version == TRUE) {
> + printf("%s\n", VERSION);
> + exit(0);
I prefer if we start using return EXIT_SUCCESS and in error case EXIT_FAILURE.
> + }
> +
> + event_loop = g_main_loop_new(NULL, FALSE);
> +
> + memset(&sa, 0, sizeof(sa));
> + sa.sa_handler = signal_handler;
> + sigaction(SIGINT, &sa, NULL);
> + sigaction(SIGTERM, &sa, NULL);
> +
> + g_main_loop_run(event_loop);
> +
> + g_main_loop_unref(event_loop);
> +
> + return 0;
> +}
> diff --git a/configure.ac b/configure.ac
> index 41c2935..3b7a5d9 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -242,4 +242,9 @@ AC_DEFINE_UNQUOTED(CONFIGDIR, "${configdir}",
> [Directory for the configuration files])
> AC_SUBST(CONFIGDIR, "${configdir}")
>
> +AC_ARG_ENABLE(android-daemon, AC_HELP_STRING([--enable-android-daemon],
> + [enable BlueZ Android daemon]),
> + [android_daemon=${enableval}])
> +AM_CONDITIONAL(ANDROID_DAEMON, test "${android_daemon}" = "yes")
> +
This needs to be a separate patch. And it should just say --enable-android.
In addition it needs to be added to bootstrap-configure and distcheck handling.
Regards
Marcel
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
