* [PATCH BlueZ 2/4] android/a2dp: Add initial code for handling commands
2013-11-04 10:56 [PATCH BlueZ 1/4] android: Add initial skeleton for a2dp in the daemon Luiz Augusto von Dentz
@ 2013-11-04 10:56 ` Luiz Augusto von Dentz
2013-11-04 10:56 ` [PATCH BlueZ 3/4] android: Add initial skeleton for pan in the daemon Luiz Augusto von Dentz
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Luiz Augusto von Dentz @ 2013-11-04 10:56 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
---
android/a2dp.c | 36 ++++++++++++++++++++++++++++++++++++
android/a2dp.h | 3 +++
android/main.c | 4 ++++
3 files changed, 43 insertions(+)
diff --git a/android/a2dp.c b/android/a2dp.c
index 64e5278..28ab4b1 100644
--- a/android/a2dp.c
+++ b/android/a2dp.c
@@ -35,9 +35,45 @@
#include "lib/bluetooth.h"
#include "log.h"
#include "a2dp.h"
+#include "hal-msg.h"
+#include "ipc.h"
static GIOChannel *notification_io = NULL;
+static uint8_t bt_a2dp_connect(struct hal_cmd_av_connect *cmd, uint16_t len)
+{
+ DBG("Not Implemented");
+
+ return HAL_STATUS_FAILED;
+}
+
+static uint8_t bt_a2dp_disconnect(struct hal_cmd_av_connect *cmd, uint16_t len)
+{
+ DBG("Not Implemented");
+
+ return HAL_STATUS_FAILED;
+}
+
+void bt_a2dp_handle_cmd(GIOChannel *io, uint8_t opcode, void *buf,
+ uint16_t len)
+{
+ uint8_t status = HAL_STATUS_FAILED;
+
+ switch (opcode) {
+ case HAL_OP_AV_CONNECT:
+ status = bt_a2dp_connect(buf, len);
+ break;
+ case HAL_OP_AV_DISCONNECT:
+ status = bt_a2dp_disconnect(buf, len);
+ break;
+ default:
+ DBG("Unhandled command, opcode 0x%x", opcode);
+ break;
+ }
+
+ ipc_send_rsp(io, HAL_SERVICE_ID_A2DP, status);
+}
+
bool bt_a2dp_register(GIOChannel *io, const bdaddr_t *addr)
{
DBG("");
diff --git a/android/a2dp.h b/android/a2dp.h
index b8b14bb..a5ac53e 100644
--- a/android/a2dp.h
+++ b/android/a2dp.h
@@ -21,5 +21,8 @@
*
*/
+void bt_a2dp_handle_cmd(GIOChannel *io, uint8_t opcode, void *buf,
+ uint16_t len);
+
bool bt_a2dp_register(GIOChannel *io, const bdaddr_t *addr);
void bt_a2dp_unregister(void);
diff --git a/android/main.c b/android/main.c
index efa8c37..75ed4bb 100644
--- a/android/main.c
+++ b/android/main.c
@@ -259,6 +259,10 @@ static gboolean cmd_watch_cb(GIOChannel *io, GIOCondition cond,
bt_sock_handle_cmd(hal_cmd_io, msg->opcode, msg->payload,
msg->len);
break;
+ case HAL_SERVICE_ID_A2DP:
+ bt_a2dp_handle_cmd(hal_cmd_io, msg->opcode, msg->payload,
+ msg->len);
+ break;
default:
ipc_send_rsp(hal_cmd_io, msg->service_id, HAL_STATUS_FAILED);
break;
--
1.8.3.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH BlueZ 3/4] android: Add initial skeleton for pan in the daemon
2013-11-04 10:56 [PATCH BlueZ 1/4] android: Add initial skeleton for a2dp in the daemon Luiz Augusto von Dentz
2013-11-04 10:56 ` [PATCH BlueZ 2/4] android/a2dp: Add initial code for handling commands Luiz Augusto von Dentz
@ 2013-11-04 10:56 ` Luiz Augusto von Dentz
2013-11-04 10:56 ` [PATCH BlueZ 4/4] android/pan: Add initial code for handling commands Luiz Augusto von Dentz
2013-11-04 19:13 ` [PATCH BlueZ 1/4] android: Add initial skeleton for a2dp in the daemon Johan Hedberg
3 siblings, 0 replies; 5+ messages in thread
From: Luiz Augusto von Dentz @ 2013-11-04 10:56 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
---
android/Android.mk | 1 +
android/Makefile.am | 1 +
android/main.c | 9 +++++++++
android/pan.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
android/pan.h | 25 +++++++++++++++++++++++++
5 files changed, 89 insertions(+)
create mode 100644 android/pan.c
create mode 100644 android/pan.h
diff --git a/android/Android.mk b/android/Android.mk
index 6f537ea..77fd5a0 100644
--- a/android/Android.mk
+++ b/android/Android.mk
@@ -26,6 +26,7 @@ LOCAL_SRC_FILES := \
socket.c \
ipc.c ipc.h \
a2dp.c \
+ pan.c \
../src/log.c \
../src/shared/mgmt.c \
../src/shared/util.c \
diff --git a/android/Makefile.am b/android/Makefile.am
index df7f8ec..3c51390 100644
--- a/android/Makefile.am
+++ b/android/Makefile.am
@@ -21,6 +21,7 @@ android_bluetoothd_SOURCES = android/main.c \
android/ipc.h android/ipc.c \
android/a2dp.h android/a2dp.c \
android/socket.h android/socket.c \
+ android/pan.h android/pan.c \
btio/btio.h btio/btio.c \
src/sdp-client.h src/sdp-client.c
diff --git a/android/main.c b/android/main.c
index 75ed4bb..29b3882 100644
--- a/android/main.c
+++ b/android/main.c
@@ -54,6 +54,7 @@
#include "hal-msg.h"
#include "ipc.h"
#include "a2dp.h"
+#include "pan.h"
/* TODO: Consider to remove PLATFORM_SDKVERSION check if requirement
* for minimal Android platform version increases. */
@@ -107,6 +108,11 @@ static void service_register(void *buf, uint16_t len)
goto error;
break;
+ case HAL_SERVICE_ID_PAN:
+ if (!bt_a2dp_register(hal_notif_io, adapter_bdaddr))
+ goto error;
+
+ break;
default:
DBG("service %u not supported", m->service_id);
goto error;
@@ -143,6 +149,9 @@ static void service_unregister(void *buf, uint16_t len)
case HAL_SERVICE_ID_A2DP:
bt_a2dp_unregister();
break;
+ case HAL_SERVICE_ID_PAN:
+ bt_pan_unregister();
+ break;
default:
/* This would indicate bug in HAL, as unregister should not be
* called in init failed */
diff --git a/android/pan.c b/android/pan.c
new file mode 100644
index 0000000..4b988ac
--- /dev/null
+++ b/android/pan.c
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2013 Intel Corporation. All rights reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <stdint.h>
+#include <stdbool.h>
+#include <errno.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <glib.h>
+
+#include "lib/bluetooth.h"
+#include "log.h"
+#include "pan.h"
+
+static GIOChannel *notification_io = NULL;
+
+bool bt_pan_register(GIOChannel *io, const bdaddr_t *addr)
+{
+ DBG("");
+
+ notification_io = g_io_channel_ref(io);
+
+ return true;
+}
+
+void bt_pan_unregister(void)
+{
+ DBG("");
+
+ g_io_channel_unref(notification_io);
+ notification_io = NULL;
+}
diff --git a/android/pan.h b/android/pan.h
new file mode 100644
index 0000000..318f318
--- /dev/null
+++ b/android/pan.h
@@ -0,0 +1,25 @@
+/*
+ *
+ * BlueZ - Bluetooth protocol stack for Linux
+ *
+ * Copyright (C) 2013 Intel Corporation. All rights reserved.
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+bool bt_pan_register(GIOChannel *io, const bdaddr_t *addr);
+void bt_pan_unregister(void);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH BlueZ 4/4] android/pan: Add initial code for handling commands
2013-11-04 10:56 [PATCH BlueZ 1/4] android: Add initial skeleton for a2dp in the daemon Luiz Augusto von Dentz
2013-11-04 10:56 ` [PATCH BlueZ 2/4] android/a2dp: Add initial code for handling commands Luiz Augusto von Dentz
2013-11-04 10:56 ` [PATCH BlueZ 3/4] android: Add initial skeleton for pan in the daemon Luiz Augusto von Dentz
@ 2013-11-04 10:56 ` Luiz Augusto von Dentz
2013-11-04 19:13 ` [PATCH BlueZ 1/4] android: Add initial skeleton for a2dp in the daemon Johan Hedberg
3 siblings, 0 replies; 5+ messages in thread
From: Luiz Augusto von Dentz @ 2013-11-04 10:56 UTC (permalink / raw)
To: linux-bluetooth
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
---
android/main.c | 4 ++++
android/pan.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
android/pan.h | 2 ++
3 files changed, 62 insertions(+)
diff --git a/android/main.c b/android/main.c
index 29b3882..7d36976 100644
--- a/android/main.c
+++ b/android/main.c
@@ -272,6 +272,10 @@ static gboolean cmd_watch_cb(GIOChannel *io, GIOCondition cond,
bt_a2dp_handle_cmd(hal_cmd_io, msg->opcode, msg->payload,
msg->len);
break;
+ case HAL_SERVICE_ID_PAN:
+ bt_pan_handle_cmd(hal_cmd_io, msg->opcode, msg->payload,
+ msg->len);
+ break;
default:
ipc_send_rsp(hal_cmd_io, msg->service_id, HAL_STATUS_FAILED);
break;
diff --git a/android/pan.c b/android/pan.c
index 4b988ac..0cc3590 100644
--- a/android/pan.c
+++ b/android/pan.c
@@ -32,9 +32,65 @@
#include "lib/bluetooth.h"
#include "log.h"
#include "pan.h"
+#include "hal-msg.h"
+#include "ipc.h"
static GIOChannel *notification_io = NULL;
+static uint8_t bt_pan_enable(struct hal_cmd_pan_enable *cmd, uint16_t len)
+{
+ DBG("Not Implemented");
+
+ return HAL_STATUS_FAILED;
+}
+
+static uint8_t bt_pan_get_role(void *cmd, uint16_t len)
+{
+ DBG("Not Implemented");
+
+ return HAL_STATUS_FAILED;
+}
+
+static uint8_t bt_pan_connect(struct hal_cmd_pan_connect *cmd, uint16_t len)
+{
+ DBG("Not Implemented");
+
+ return HAL_STATUS_FAILED;
+}
+
+static uint8_t bt_pan_disconnect(struct hal_cmd_pan_connect *cmd, uint16_t len)
+{
+ DBG("Not Implemented");
+
+ return HAL_STATUS_FAILED;
+}
+
+void bt_pan_handle_cmd(GIOChannel *io, uint8_t opcode, void *buf,
+ uint16_t len)
+{
+ uint8_t status = HAL_STATUS_FAILED;
+
+ switch (opcode) {
+ case HAL_OP_PAN_ENABLE:
+ status = bt_pan_enable(buf, len);
+ break;
+ case HAL_OP_PAN_GET_ROLE:
+ status = bt_pan_get_role(buf, len);
+ break;
+ case HAL_OP_PAN_CONNECT:
+ status = bt_pan_connect(buf, len);
+ break;
+ case HAL_OP_PAN_DISCONNECT:
+ status = bt_pan_disconnect(buf, len);
+ break;
+ default:
+ DBG("Unhandled command, opcode 0x%x", opcode);
+ break;
+ }
+
+ ipc_send_rsp(io, HAL_SERVICE_ID_A2DP, status);
+}
+
bool bt_pan_register(GIOChannel *io, const bdaddr_t *addr)
{
DBG("");
diff --git a/android/pan.h b/android/pan.h
index 318f318..1ffba9d 100644
--- a/android/pan.h
+++ b/android/pan.h
@@ -21,5 +21,7 @@
*
*/
+void bt_pan_handle_cmd(GIOChannel *io, uint8_t opcode, void *buf, uint16_t len);
+
bool bt_pan_register(GIOChannel *io, const bdaddr_t *addr);
void bt_pan_unregister(void);
--
1.8.3.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH BlueZ 1/4] android: Add initial skeleton for a2dp in the daemon
2013-11-04 10:56 [PATCH BlueZ 1/4] android: Add initial skeleton for a2dp in the daemon Luiz Augusto von Dentz
` (2 preceding siblings ...)
2013-11-04 10:56 ` [PATCH BlueZ 4/4] android/pan: Add initial code for handling commands Luiz Augusto von Dentz
@ 2013-11-04 19:13 ` Johan Hedberg
3 siblings, 0 replies; 5+ messages in thread
From: Johan Hedberg @ 2013-11-04 19:13 UTC (permalink / raw)
To: Luiz Augusto von Dentz; +Cc: linux-bluetooth
Hi Luiz,
On Mon, Nov 04, 2013, Luiz Augusto von Dentz wrote:
> From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
>
> ---
> android/Android.mk | 1 +
> android/Makefile.am | 1 +
> android/a2dp.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++
> android/a2dp.h | 25 ++++++++++++++++++++++++
> android/main.c | 9 +++++++++
> 5 files changed, 92 insertions(+)
> create mode 100644 android/a2dp.c
> create mode 100644 android/a2dp.h
All four patches have been applied. Thanks.
Johan
^ permalink raw reply [flat|nested] 5+ messages in thread