Add HDP profile support at HAL side

---
 android/hal-msg.h | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

android/hal-msg.h +9 -0

index 0abbbe6..b1942de 100644
@@ -383,6 +383,27 @@ struct hal_cmd_pan_disconnect {
        uint8_t bdaddr[6];
 } __attribute__((packed));
 
+#define HAL_OP_HEALTH_REG_APP          0x01
+struct hal_cmd_health_reg_app {
+       uint8_t app_name[255];
+       uint8_t provider_name[255];
+       uint8_t service_name[255];
+       uint8_t service_descr[200];
+       uint8_t num_of_mdep;
+
+       struct {

Hi Ravi,

Quoted 21 lines · Ravi kumar Veeramally

---
  android/hal-msg.h | 21 +++++++++++++++++++++
  1 file changed, 21 insertions(+)

android/hal-msg.h +9 -0

index 0abbbe6..b1942de 100644
@@ -383,6 +383,27 @@ struct hal_cmd_pan_disconnect {
         uint8_t bdaddr[6];
  } __attribute__((packed));
 
+#define HAL_OP_HEALTH_REG_APP          0x01
+struct hal_cmd_health_reg_app {
+       uint8_t app_name[255];
+       uint8_t provider_name[255];
+       uint8_t service_name[255];
+       uint8_t service_descr[200];
+       uint8_t num_of_mdep;
+
+       struct {

android/hal-msg.h struct hal_cmd_pan_disconnect { · line 404

Quoted 10 lines

android/hal-msg.h +10 -0

+               uint8_t role;
+               uint8_t data_type;
+               uint8_t channel_type;
+               uint8_t descr[255];
+       } mdep_cfg[20];
+} __attribute__((packed));
+
+struct hal_rsp_health_reg_app {
+       uint16_t app_id;
+} __attribute__((packed));

This most likely will not fit in our MTU which currently is 1024 bytes and given that you have 20 cfgs this is going to be huge. We should probably define a hal_string e.g:

struct hal_string {
     uint8_t len;
     uint8_t data[0];
};

Also we do not need to send the 20 cfgs every time so that should probably be set to 0 and we write only num_of_mdep, if that still doesn't fit in our MTU perhaps we should consider a bigger size.

---
 android/hal-msg.h | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

android/hal-msg.h +3 -0

index 694529f..0139543 100644
@@ -1001,12 +1001,28 @@ struct hal_ev_pan_conn_state {
 #define HAL_HEALTH_APP_DEREG_SUCCESS           0x02
 #define HAL_HEALTH_APP_DEREG_FAILED            0x03
 
+#define HAL_HEALTH_CHANL_STATE_CONNECTING      0x00
+#define HAL_HEALTH_CHANL_STATE_CONNECTED       0x01
+#define HAL_HEALTH_CHANL_STATE_DISCONNECTING   0x02

Hi Ravi,

Quoted 24 lines · Ravi kumar Veeramally

---
  android/hal-msg.h | 16 ++++++++++++++++
  1 file changed, 16 insertions(+)

android/hal-msg.h +6 -0

index 694529f..0139543 100644
@@ -1001,12 +1001,28 @@ struct hal_ev_pan_conn_state {
  #define HAL_HEALTH_APP_DEREG_SUCCESS           0x02
  #define HAL_HEALTH_APP_DEREG_FAILED            0x03
 
+#define HAL_HEALTH_CHANL_STATE_CONNECTING      0x00
+#define HAL_HEALTH_CHANL_STATE_CONNECTED       0x01
+#define HAL_HEALTH_CHANL_STATE_DISCONNECTING   0x02
+#define HAL_HEALTH_CHANL_STATE_DISCONNECTED    0x03
+#define HAL_HEALTH_CHANL_STATE_DESTROYED       0x04
+
  #define HAL_EV_HEALTH_APP_REG_STATE            0x81
  struct hal_ev_health_app_reg_state {
         uint16_t id;
         uint8_t  state;
  } __attribute__((packed));
 

android/hal-msg.h struct hal_ev_pan_conn_state { · line 1016

Quoted 1 line

android/hal-msg.h +1 -0

+#define HAL_EV_HEALTH_CHNL_STATE               0x82

You have CHNL here and CHANL in states definitions - better have them consistent. I guess either CHAN or CHANNEL would be actually better.

android/hal-msg.h struct hal_ev_pan_conn_state { · line 1022

Quoted 6 lines

android/hal-msg.h +6 -0

+struct hal_ev_health_chnl_state {
+       uint16_t app_id;
+       uint8_t  bdaddr[6];
+       uint8_t  mdep_index;
+       uint16_t chnl_id;
+       uint8_t  chnl_state;

Same here - chan or channel.

android/hal-msg.h struct hal_ev_pan_conn_state { · line 1023

Quoted 1 line

android/hal-msg.h +1 -0

+       uint32_t file_descr;

fd shall be passed as auxiliary data - there's parameter for this in IPC calls. Now you just pass plain int value which is useless as fd.

Add hal-health.c and initial get interface method.

---
 android/Android.mk   |  1 +
 android/Makefile.am  |  1 +
 android/hal-health.c | 42 ++++++++++++++++++++++++++++++++++++++++++
 android/hal.h        |  2 ++
 4 files changed, 46 insertions(+)
 create mode 100644 android/hal-health.c

android/Android.mk +1 -0

index 49bf108..0352beb 100644
@@ -121,6 +121,7 @@ LOCAL_SRC_FILES := \
 	bluez/android/hal-handsfree.c \
 	bluez/android/hal-gatt.c \
 	bluez/android/hal-utils.c \
+	bluez/android/hal-health.c \
 
 LOCAL_C_INCLUDES += \
 	$(call include-path-for, system-core) \

android/Makefile.am +1 -0

index bbd3d2f..d2cfed6 100644
@@ -52,6 +52,7 @@ plugin_LTLIBRARIES += android/bluetooth.default.la
 android_bluetooth_default_la_SOURCES = android/hal.h
 android/hal-bluetooth.c \ android/hal-socket.c \
 					android/hal-hidhost.c \
+					android/hal-health.c \
 					android/hal-pan.c \
 					android/hal-a2dp.c \
 					android/hal-avrcp.c \

android/hal-health.c new file +0 -0

new file mode 100644
index 0000000..55db7f6

android/hal-health.c new file +11 -0

+ *
+ * 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.
+ *
+ */

android/hal-health.c new file +26 -0

+
+#include <stdbool.h>
+#include <stddef.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "hal-log.h"
+#include "hal.h"
+#include "hal-msg.h"
+#include "ipc-common.h"
+#include "hal-ipc.h"
+
+static bthl_interface_t health_if = {
+	.size = sizeof(health_if),
+	.init = NULL,
+	.register_application = NULL,
+	.unregister_application = NULL,
+	.connect_channel = NULL,
+	.destroy_channel = NULL,
+	.cleanup = NULL
+};
+
+bthl_interface_t *bt_get_health_interface(void)
+{
+	return &health_if;
+}

android/hal.h +1 -0

index b1c0216..6998e9a 100644
@@ -25,6 +25,7 @@
 #include <hardware/bt_gatt.h>
 #include <hardware/bt_gatt_client.h>
 #include <hardware/bt_gatt_server.h>
+#include <hardware/bt_hl.h>
 
 btsock_interface_t *bt_get_socket_interface(void);
 bthh_interface_t *bt_get_hidhost_interface(void);

android/hal.h +0 -0

 void bt_thread_associate(void);
 void bt_thread_disassociate(void);

android/hal-health.c +41 -1

+
+static bool interface_ready(void)
+{
+	return cbacks != NULL;
+}
+
+/* handlers will be called from notification thread context,
+ * index in table equals to 'opcode - HAL_MINIMUM_EVENT' */
+static const struct hal_ipc_handler ev_handlers[] = {
+};
+
+static bt_status_t init(bthl_callbacks_t *callbacks)
+{
+	struct hal_cmd_register_module cmd;
+	int ret;
+
+	DBG("");
+
+	if (interface_ready())
+		return BT_STATUS_DONE;
+
+	/* store reference to user callbacks */
+	cbacks = callbacks;
+
+	hal_ipc_register(HAL_SERVICE_ID_HEALTH, ev_handlers,
+				sizeof(ev_handlers)/sizeof(ev_handlers[0]));
+
+	cmd.service_id = HAL_SERVICE_ID_HEALTH;
+
+	ret = hal_ipc_cmd(HAL_SERVICE_ID_CORE, HAL_OP_REGISTER_MODULE,
+					sizeof(cmd), &cmd, 0, NULL, NULL);
+
+	if (ret != BT_STATUS_SUCCESS) {
+		cbacks = NULL;
+		hal_ipc_unregister(HAL_SERVICE_ID_HEALTH);
+	}
+
+	return ret;
+}
+
 static bthl_interface_t health_if = {
 	.size = sizeof(health_if),
-	.init = NULL,
+	.init = init,
 	.register_application = NULL,
 	.unregister_application = NULL,
 	.connect_channel = NULL,

---
 android/hal-health.c | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

android/hal-health.c +5 -0

index 007a37a..0d10d98 100644
@@ -106,6 +106,35 @@ static bt_status_t unregister_application(int app_id)
 					sizeof(cmd), &cmd, 0, NULL, NULL);
 }
 
+static bt_status_t connect_channel(int app_id, bt_bdaddr_t *bd_addr,
+					int mdep_cfg_index, int *channel_id)
+{
+	struct hal_cmd_health_connect_channel cmd;
+	struct hal_rsp_health_connect_channel rsp;

android/hal-health.c +5 -1

+
+	return status;
+}
+
 static bt_status_t init(bthl_callbacks_t *callbacks)
 {
 	struct hal_cmd_register_module cmd;

@@ -159,7 +188,7 @@ static bthl_interface_t health_if = {
 	.init = init,
 	.register_application = register_application,
 	.unregister_application = unregister_application,
-	.connect_channel = NULL,
+	.connect_channel = connect_channel,
 	.destroy_channel = NULL,
 	.cleanup = cleanup
 };

Hi Ravi,

Quoted 17 lines · On Wednesday 12 March 2014 17:10:55 Ravi kumar Veeramally wrote:

---
  android/hal-health.c | 31 ++++++++++++++++++++++++++++++-
  1 file changed, 30 insertions(+), 1 deletion(-)

android/hal-health.c +5 -0

index 007a37a..0d10d98 100644
@@ -106,6 +106,35 @@ static bt_status_t unregister_application(int app_id)
  					sizeof(cmd), &cmd, 0, NULL, NULL);
  }
 
+static bt_status_t connect_channel(int app_id, bt_bdaddr_t *bd_addr,
+					int mdep_cfg_index, int *channel_id)
+{
+	struct hal_cmd_health_connect_channel cmd;
+	struct hal_rsp_health_connect_channel rsp;

android/hal-health.c static bt_status_t unregister_application(int app_id) · line 123

Quoted 10 lines

android/hal-health.c +10 -0

+	size_t len = sizeof(rsp);
+	bt_status_t status;
+
+	DBG("");
+
+	if (!interface_ready())
+		return BT_STATUS_NOT_READY;
+
+	if (!bd_addr)
+		return BT_STATUS_PARM_INVALID;

Verify channel_id pointer as well here.

android/hal-health.c static bt_status_t unregister_application(int app_id) · line 133

Quoted 10 lines

android/hal-health.c +10 -0

+
+	cmd.app_id = app_id;
+	cmd.mdep_index = mdep_cfg_index;
+	memcpy(cmd.bdaddr, bd_addr, sizeof(cmd.bdaddr));
+
+	status = hal_ipc_cmd(HAL_SERVICE_ID_HEALTH,
+					HAL_OP_HEALTH_CONNECT_CHANNEL,
+					sizeof(cmd), &cmd, &len, &rsp, NULL);
+
+	*channel_id = rsp.channel_id;

if (status == HAL_STATUS_SUCCESS)

     *channel_id = rsp.channel_id;

Otherwise you might assign garbage.

Quoted 8 lines

android/hal-health.c +4 -0

+
+	return status;
+}
+
  static bt_status_t init(bthl_callbacks_t *callbacks)
  {
  	struct hal_cmd_register_module cmd;

@@ -159,7 +188,7 @@ static bthl_interface_t health_if = {

android/hal-health.c static bthl_interface_t health_if = { · line 194

Quoted 8 lines

android/hal-health.c +1 -1

  	.init = init,
  	.register_application = register_application,
  	.unregister_application = unregister_application,
-	.connect_channel = NULL,
+	.connect_channel = connect_channel,
  	.destroy_channel = NULL,
  	.cleanup = cleanup
  };

Add health.c|h with basic calls for register and unregister profile.

---
 android/Android.mk  |   1 +
 android/Makefile.am |   1 +
 android/health.c    | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 android/health.h    |  25 ++++++++++++
 android/main.c      |  10 +++++
 5 files changed, 152 insertions(+)
 create mode 100644 android/health.c
 create mode 100644 android/health.h

android/Android.mk +1 -0

index 0352beb..34e21ea 100644
@@ -43,6 +43,7 @@ LOCAL_SRC_FILES := \
        bluez/android/pan.c \
        bluez/android/handsfree.c \
        bluez/android/gatt.c \
+       bluez/android/health.c \
        bluez/src/log.c \
        bluez/src/shared/mgmt.c \
        bluez/src/shared/util.c \

android/Makefile.am +1 -0

index d2cfed6..adfb14c 100644
@@ -41,6 +41,7 @@ android_bluetoothd_SOURCES = android/main.c \
                                android/pan.h android/pan.c \
                                android/handsfree.h android/handsfree.c \
                                android/gatt.h android/gatt.c \
+                               android/health.h android/health.c \
                                btio/btio.h btio/btio.c \
                                src/sdp-client.h src/sdp-client.c \
                                profiles/network/bnep.h profiles/network/bnep.c

android/health.c new file +115 -0

new file mode 100644
index 0000000..6359b11
@@ -0,0 +1,115 @@
+/*
+ *
+ *  BlueZ - Bluetooth protocol stack for Linux
+ *
+ *  Copyright (C) 2013-2014  Intel Corporation. All rights reserved.
+ *
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library 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
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; 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 <glib.h>
+
+#include "lib/bluetooth.h"
+#include "lib/sdp.h"
+#include "lib/sdp_lib.h"
+#include "src/log.h"
+
+#include "hal-msg.h"
+#include "ipc-common.h"
+#include "ipc.h"
+#include "utils.h"
+#include "bluetooth.h"
+#include "health.h"
+
+static bdaddr_t adapter_addr;
+static struct ipc *hal_ipc = NULL;
+
+static void bt_health_register_app(const void *buf, uint16_t len)
+{
+       DBG("Not implemented");
+
+       ipc_send_rsp(hal_ipc, HAL_SERVICE_ID_HEALTH, HAL_OP_HEALTH_REG_APP,
+                                                       HAL_STATUS_UNSUPPORTED);
+}
+
+static void bt_health_unregister_app(const void *buf, uint16_t len)
+{
+       DBG("Not implemented");
+
+       ipc_send_rsp(hal_ipc, HAL_SERVICE_ID_HEALTH, HAL_OP_HEALTH_UNREG_APP,
+                                                       HAL_STATUS_UNSUPPORTED);
+}
+
+static void bt_health_connect_channel(const void *buf, uint16_t len)
+{
+       DBG("Not implemented");
+
+       ipc_send_rsp(hal_ipc, HAL_SERVICE_ID_HEALTH,
+                       HAL_OP_HEALTH_CONNECT_CHANNEL, HAL_STATUS_UNSUPPORTED);
+}
+
+static void bt_health_destroy_channel(const void *buf, uint16_t len)
+{
+       DBG("Not implemented");
+
+       ipc_send_rsp(hal_ipc, HAL_SERVICE_ID_HEALTH,
+                       HAL_OP_HEALTH_DESTROY_CHANNEL, HAL_STATUS_UNSUPPORTED);
+}
+
+static const struct ipc_handler cmd_handlers[] = {
+       /* HAL_OP_HEALTH_REG_APP */
+       { bt_health_register_app, false,
+                               sizeof(struct hal_cmd_health_reg_app) },
+       /* HAL_OP_HEALTH_UNREG_APP */
+       { bt_health_unregister_app, false,
+                               sizeof(struct hal_cmd_health_unreg_app) },
+       /* HAL_OP_HEALTH_CONNECT_CHANNEL */
+       { bt_health_connect_channel, false,
+                               sizeof(struct hal_cmd_health_connect_channel) },
+       /* HAL_OP_HEALTH_DESTROY_CHANNEL */
+       { bt_health_destroy_channel, false,
+                               sizeof(struct hal_cmd_health_destroy_channel) },
+};
+
+bool bt_health_register(struct ipc *ipc, const bdaddr_t *addr, uint8_t mode)
+{
+       DBG("");
+
+       bacpy(&adapter_addr, addr);
+
+       hal_ipc = ipc;
+       ipc_register(hal_ipc, HAL_SERVICE_ID_HEALTH, cmd_handlers,
+                                               G_N_ELEMENTS(cmd_handlers));
+
+       return true;
+}
+
+void bt_health_unregister(void)
+{
+       DBG("");
+
+       ipc_unregister(hal_ipc, HAL_SERVICE_ID_HEALTH);
+       hal_ipc = NULL;
+}

android/health.h new file +25 -0

new file mode 100644
index 0000000..38a58c0
@@ -0,0 +1,25 @@
+/*
+ *
+ *  BlueZ - Bluetooth protocol stack for Linux
+ *
+ *  Copyright (C) 2013-2014  Intel Corporation. All rights reserved.
+ *
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library 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
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+bool bt_health_register(struct ipc *ipc, const bdaddr_t *addr, uint8_t mode);
+void bt_health_unregister(void);

android/main.c +1 -0

index a34f885..9423619 100644
@@ -59,6 +59,7 @@
 #include "avrcp.h"
 #include "handsfree.h"
 #include "gatt.h"
+#include "health.h"
 
 #define STARTUP_GRACE_SECONDS 5
 #define SHUTDOWN_GRACE_SECONDS 10

android/main.c +9 -1

+       case HAL_SERVICE_ID_HEALTH:
+               if (!bt_health_register(hal_ipc, &adapter_bdaddr, m->mode)) {
+                       status = HAL_STATUS_FAILED;
+                       goto failed;
+               }
+
                break;
        default:
                DBG("service %u not supported", m->service_id);

@@ -186,6 +193,9 @@ static void service_unregister(const void *buf, uint16_t len)
        case HAL_SERVICE_ID_GATT:
                bt_gatt_unregister();
                break;
+       case HAL_SERVICE_ID_HEALTH:
+               bt_health_unregister();
+               break;
        default:
                /* This would indicate bug in HAL, as unregister should not be
                 * called in init failed */
--

1.8.3.2

--
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

Add health.c|h with basic calls for register and unregister profile.

---
 android/Android.mk  |   1 +
 android/Makefile.am |   1 +
 android/health.c    | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 android/health.h    |  25 ++++++++++++
 android/main.c      |  10 +++++
 5 files changed, 152 insertions(+)
 create mode 100644 android/health.c
 create mode 100644 android/health.h

android/Android.mk +1 -0

index 0352beb..34e21ea 100644
@@ -43,6 +43,7 @@ LOCAL_SRC_FILES := \
        bluez/android/pan.c \
        bluez/android/handsfree.c \
        bluez/android/gatt.c \
+       bluez/android/health.c \
        bluez/src/log.c \
        bluez/src/shared/mgmt.c \
        bluez/src/shared/util.c \

android/Makefile.am +1 -0

index d2cfed6..adfb14c 100644
@@ -41,6 +41,7 @@ android_bluetoothd_SOURCES = android/main.c \
                                android/pan.h android/pan.c \
                                android/handsfree.h android/handsfree.c \
                                android/gatt.h android/gatt.c \
+                               android/health.h android/health.c \
                                btio/btio.h btio/btio.c \
                                src/sdp-client.h src/sdp-client.c \
                                profiles/network/bnep.h profiles/network/bnep.c

android/health.c new file +115 -0

new file mode 100644
index 0000000..6359b11
@@ -0,0 +1,115 @@
+/*
+ *
+ *  BlueZ - Bluetooth protocol stack for Linux
+ *
+ *  Copyright (C) 2013-2014  Intel Corporation. All rights reserved.
+ *
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library 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
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; 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 <glib.h>
+
+#include "lib/bluetooth.h"
+#include "lib/sdp.h"
+#include "lib/sdp_lib.h"
+#include "src/log.h"
+
+#include "hal-msg.h"
+#include "ipc-common.h"
+#include "ipc.h"
+#include "utils.h"
+#include "bluetooth.h"
+#include "health.h"
+
+static bdaddr_t adapter_addr;
+static struct ipc *hal_ipc = NULL;
+
+static void bt_health_register_app(const void *buf, uint16_t len)
+{
+       DBG("Not implemented");
+
+       ipc_send_rsp(hal_ipc, HAL_SERVICE_ID_HEALTH, HAL_OP_HEALTH_REG_APP,
+                                                       HAL_STATUS_UNSUPPORTED);
+}
+
+static void bt_health_unregister_app(const void *buf, uint16_t len)
+{
+       DBG("Not implemented");
+
+       ipc_send_rsp(hal_ipc, HAL_SERVICE_ID_HEALTH, HAL_OP_HEALTH_UNREG_APP,
+                                                       HAL_STATUS_UNSUPPORTED);
+}
+
+static void bt_health_connect_channel(const void *buf, uint16_t len)
+{
+       DBG("Not implemented");
+
+       ipc_send_rsp(hal_ipc, HAL_SERVICE_ID_HEALTH,
+                       HAL_OP_HEALTH_CONNECT_CHANNEL, HAL_STATUS_UNSUPPORTED);
+}
+
+static void bt_health_destroy_channel(const void *buf, uint16_t len)
+{
+       DBG("Not implemented");
+
+       ipc_send_rsp(hal_ipc, HAL_SERVICE_ID_HEALTH,
+                       HAL_OP_HEALTH_DESTROY_CHANNEL, HAL_STATUS_UNSUPPORTED);
+}
+
+static const struct ipc_handler cmd_handlers[] = {
+       /* HAL_OP_HEALTH_REG_APP */
+       { bt_health_register_app, false,
+                               sizeof(struct hal_cmd_health_reg_app) },
+       /* HAL_OP_HEALTH_UNREG_APP */
+       { bt_health_unregister_app, false,
+                               sizeof(struct hal_cmd_health_unreg_app) },
+       /* HAL_OP_HEALTH_CONNECT_CHANNEL */
+       { bt_health_connect_channel, false,
+                               sizeof(struct hal_cmd_health_connect_channel) },
+       /* HAL_OP_HEALTH_DESTROY_CHANNEL */
+       { bt_health_destroy_channel, false,
+                               sizeof(struct hal_cmd_health_destroy_channel) },
+};
+
+bool bt_health_register(struct ipc *ipc, const bdaddr_t *addr, uint8_t mode)
+{
+       DBG("");
+
+       bacpy(&adapter_addr, addr);
+
+       hal_ipc = ipc;
+       ipc_register(hal_ipc, HAL_SERVICE_ID_HEALTH, cmd_handlers,
+                                               G_N_ELEMENTS(cmd_handlers));
+
+       return true;
+}
+
+void bt_health_unregister(void)
+{
+       DBG("");
+
+       ipc_unregister(hal_ipc, HAL_SERVICE_ID_HEALTH);
+       hal_ipc = NULL;
+}

android/health.h new file +25 -0

new file mode 100644
index 0000000..38a58c0
@@ -0,0 +1,25 @@
+/*
+ *
+ *  BlueZ - Bluetooth protocol stack for Linux
+ *
+ *  Copyright (C) 2013-2014  Intel Corporation. All rights reserved.
+ *
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library 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
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+bool bt_health_register(struct ipc *ipc, const bdaddr_t *addr, uint8_t mode);
+void bt_health_unregister(void);

android/main.c +10 -1

index a34f885..9423619 100644
@@ -59,6 +59,7 @@
 #include "avrcp.h"
 #include "handsfree.h"
 #include "gatt.h"
+#include "health.h"
 
 #define STARTUP_GRACE_SECONDS 5
 #define SHUTDOWN_GRACE_SECONDS 10

@@ -133,6 +134,12 @@ static void service_register(const void *buf, uint16_t len)
                        goto failed;
                }
 
+       case HAL_SERVICE_ID_HEALTH:
+               if (!bt_health_register(hal_ipc, &adapter_bdaddr, m->mode)) {
+                       status = HAL_STATUS_FAILED;
+                       goto failed;
+               }
+
                break;
        default:
                DBG("service %u not supported", m->service_id);

@@ -186,6 +193,9 @@ static void service_unregister(const void *buf, uint16_t len)
        case HAL_SERVICE_ID_GATT:
                bt_gatt_unregister();
                break;
+       case HAL_SERVICE_ID_HEALTH:
+               bt_health_unregister();
+               break;
        default:
                /* This would indicate bug in HAL, as unregister should not be
                 * called in init failed */
--

1.8.3.2

--
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

Quoted 197 lines · Ravi kumar Veeramally

Add health.c|h with basic calls for register and unregister profile.

---
  android/Android.mk  |   1 +
  android/Makefile.am |   1 +
  android/health.c    | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++++
  android/health.h    |  25 ++++++++++++
  android/main.c      |  10 +++++
  5 files changed, 152 insertions(+)

create mode 100644 android/health.c
create mode 100644 android/health.h

android/Android.mk +1 -0

index 0352beb..34e21ea 100644
@@ -43,6 +43,7 @@ LOCAL_SRC_FILES := \
         bluez/android/pan.c \
         bluez/android/handsfree.c \
         bluez/android/gatt.c \
+       bluez/android/health.c \
         bluez/src/log.c \
         bluez/src/shared/mgmt.c \
         bluez/src/shared/util.c \

android/Makefile.am +1 -0

index d2cfed6..adfb14c 100644
@@ -41,6 +41,7 @@ android_bluetoothd_SOURCES = android/main.c \
                                 android/pan.h android/pan.c \
                                 android/handsfree.h android/handsfree.c \
                                 android/gatt.h android/gatt.c \
+                               android/health.h android/health.c \
                                 btio/btio.h btio/btio.c \
                                 src/sdp-client.h src/sdp-client.c \
                                 profiles/network/bnep.h profiles/network/bnep.c

android/health.c new file +115 -0

new file mode 100644
index 0000000..6359b11
@@ -0,0 +1,115 @@
+/*
+ *
+ *  BlueZ - Bluetooth protocol stack for Linux
+ *
+ *  Copyright (C) 2013-2014  Intel Corporation. All rights reserved.
+ *
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library 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
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; 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 <glib.h>
+
+#include "lib/bluetooth.h"
+#include "lib/sdp.h"
+#include "lib/sdp_lib.h"
+#include "src/log.h"
+
+#include "hal-msg.h"
+#include "ipc-common.h"
+#include "ipc.h"
+#include "utils.h"
+#include "bluetooth.h"
+#include "health.h"
+
+static bdaddr_t adapter_addr;
+static struct ipc *hal_ipc = NULL;
+
+static void bt_health_register_app(const void *buf, uint16_t len)
+{
+       DBG("Not implemented");
+
+       ipc_send_rsp(hal_ipc, HAL_SERVICE_ID_HEALTH, HAL_OP_HEALTH_REG_APP,
+                                                       HAL_STATUS_UNSUPPORTED);
+}
+
+static void bt_health_unregister_app(const void *buf, uint16_t len)
+{
+       DBG("Not implemented");
+
+       ipc_send_rsp(hal_ipc, HAL_SERVICE_ID_HEALTH, HAL_OP_HEALTH_UNREG_APP,
+                                                       HAL_STATUS_UNSUPPORTED);
+}
+
+static void bt_health_connect_channel(const void *buf, uint16_t len)
+{
+       DBG("Not implemented");
+
+       ipc_send_rsp(hal_ipc, HAL_SERVICE_ID_HEALTH,
+                       HAL_OP_HEALTH_CONNECT_CHANNEL, HAL_STATUS_UNSUPPORTED);
+}
+
+static void bt_health_destroy_channel(const void *buf, uint16_t len)
+{
+       DBG("Not implemented");
+
+       ipc_send_rsp(hal_ipc, HAL_SERVICE_ID_HEALTH,
+                       HAL_OP_HEALTH_DESTROY_CHANNEL, HAL_STATUS_UNSUPPORTED);
+}
+
+static const struct ipc_handler cmd_handlers[] = {
+       /* HAL_OP_HEALTH_REG_APP */
+       { bt_health_register_app, false,
+                               sizeof(struct hal_cmd_health_reg_app) },
+       /* HAL_OP_HEALTH_UNREG_APP */
+       { bt_health_unregister_app, false,
+                               sizeof(struct hal_cmd_health_unreg_app) },
+       /* HAL_OP_HEALTH_CONNECT_CHANNEL */
+       { bt_health_connect_channel, false,
+                               sizeof(struct hal_cmd_health_connect_channel) },
+       /* HAL_OP_HEALTH_DESTROY_CHANNEL */
+       { bt_health_destroy_channel, false,
+                               sizeof(struct hal_cmd_health_destroy_channel) },
+};
+
+bool bt_health_register(struct ipc *ipc, const bdaddr_t *addr, uint8_t mode)
+{
+       DBG("");
+
+       bacpy(&adapter_addr, addr);
+
+       hal_ipc = ipc;
+       ipc_register(hal_ipc, HAL_SERVICE_ID_HEALTH, cmd_handlers,
+                                               G_N_ELEMENTS(cmd_handlers));
+
+       return true;
+}
+
+void bt_health_unregister(void)
+{
+       DBG("");
+
+       ipc_unregister(hal_ipc, HAL_SERVICE_ID_HEALTH);
+       hal_ipc = NULL;
+}

android/health.h new file +25 -0

new file mode 100644
index 0000000..38a58c0
@@ -0,0 +1,25 @@
+/*
+ *
+ *  BlueZ - Bluetooth protocol stack for Linux
+ *
+ *  Copyright (C) 2013-2014  Intel Corporation. All rights reserved.
+ *
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library 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
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+bool bt_health_register(struct ipc *ipc, const bdaddr_t *addr, uint8_t mode);
+void bt_health_unregister(void);

android/main.c +1 -0

index a34f885..9423619 100644
@@ -59,6 +59,7 @@
  #include "avrcp.h"
  #include "handsfree.h"
  #include "gatt.h"
+#include "health.h"
 

android/main.c static void service_register(const void *buf, uint16_t len) · line 135

Quoted 5 lines

android/main.c +0 -0

  #define STARTUP_GRACE_SECONDS 5
  #define SHUTDOWN_GRACE_SECONDS 10

@@ -133,6 +134,12 @@ static void service_register(const void *buf, uint16_t len)
                         goto failed;
                 }

Missing brake here.

Quoted 22 lines

android/main.c +9 -1

+       case HAL_SERVICE_ID_HEALTH:
+               if (!bt_health_register(hal_ipc, &adapter_bdaddr, m->mode)) {
+                       status = HAL_STATUS_FAILED;
+                       goto failed;
+               }
+
                 break;
         default:
                 DBG("service %u not supported", m->service_id);

@@ -186,6 +193,9 @@ static void service_unregister(const void *buf, uint16_t len)
         case HAL_SERVICE_ID_GATT:
                 bt_gatt_unregister();
                 break;
+       case HAL_SERVICE_ID_HEALTH:
+               bt_health_unregister();
+               break;
         default:
                 /* This would indicate bug in HAL, as unregister should not be
                  * called in init failed */
--

1.8.3.2

Quoted 4 lines

--
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

Best regards,
Grzegorz Kolodziejczyk

Quoted 229 lines · Ravi kumar Veeramally

Add health.c|h with basic calls for register and unregister profile.

---
  android/Android.mk  |   1 +
  android/Makefile.am |   1 +
  android/health.c    | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++++
  android/health.h    |  25 ++++++++++++
  android/main.c      |  10 +++++
  5 files changed, 152 insertions(+)

create mode 100644 android/health.c
create mode 100644 android/health.h

android/Android.mk +1 -0

index 0352beb..34e21ea 100644
@@ -43,6 +43,7 @@ LOCAL_SRC_FILES := \
         bluez/android/pan.c \
         bluez/android/handsfree.c \
         bluez/android/gatt.c \
+       bluez/android/health.c \
         bluez/src/log.c \
         bluez/src/shared/mgmt.c \
         bluez/src/shared/util.c \

android/Makefile.am +1 -0

index d2cfed6..adfb14c 100644
@@ -41,6 +41,7 @@ android_bluetoothd_SOURCES = android/main.c \
                                 android/pan.h android/pan.c \
                                 android/handsfree.h android/handsfree.c \
                                 android/gatt.h android/gatt.c \
+                               android/health.h android/health.c \
                                 btio/btio.h btio/btio.c \
                                 src/sdp-client.h src/sdp-client.c \
                                 profiles/network/bnep.h profiles/network/bnep.c

android/health.c new file +115 -0

new file mode 100644
index 0000000..6359b11
@@ -0,0 +1,115 @@
+/*
+ *
+ *  BlueZ - Bluetooth protocol stack for Linux
+ *
+ *  Copyright (C) 2013-2014  Intel Corporation. All rights reserved.
+ *
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library 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
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; 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 <glib.h>
+
+#include "lib/bluetooth.h"
+#include "lib/sdp.h"
+#include "lib/sdp_lib.h"
+#include "src/log.h"
+
+#include "hal-msg.h"
+#include "ipc-common.h"
+#include "ipc.h"
+#include "utils.h"
+#include "bluetooth.h"
+#include "health.h"
+
+static bdaddr_t adapter_addr;
+static struct ipc *hal_ipc = NULL;
+
+static void bt_health_register_app(const void *buf, uint16_t len)
+{
+       DBG("Not implemented");
+
+       ipc_send_rsp(hal_ipc, HAL_SERVICE_ID_HEALTH, HAL_OP_HEALTH_REG_APP,
+                                                       HAL_STATUS_UNSUPPORTED);
+}
+
+static void bt_health_unregister_app(const void *buf, uint16_t len)
+{
+       DBG("Not implemented");
+
+       ipc_send_rsp(hal_ipc, HAL_SERVICE_ID_HEALTH, HAL_OP_HEALTH_UNREG_APP,
+                                                       HAL_STATUS_UNSUPPORTED);
+}
+
+static void bt_health_connect_channel(const void *buf, uint16_t len)
+{
+       DBG("Not implemented");
+
+       ipc_send_rsp(hal_ipc, HAL_SERVICE_ID_HEALTH,
+                       HAL_OP_HEALTH_CONNECT_CHANNEL, HAL_STATUS_UNSUPPORTED);
+}
+
+static void bt_health_destroy_channel(const void *buf, uint16_t len)
+{
+       DBG("Not implemented");
+
+       ipc_send_rsp(hal_ipc, HAL_SERVICE_ID_HEALTH,
+                       HAL_OP_HEALTH_DESTROY_CHANNEL, HAL_STATUS_UNSUPPORTED);
+}
+
+static const struct ipc_handler cmd_handlers[] = {
+       /* HAL_OP_HEALTH_REG_APP */
+       { bt_health_register_app, false,
+                               sizeof(struct hal_cmd_health_reg_app) },
+       /* HAL_OP_HEALTH_UNREG_APP */
+       { bt_health_unregister_app, false,
+                               sizeof(struct hal_cmd_health_unreg_app) },
+       /* HAL_OP_HEALTH_CONNECT_CHANNEL */
+       { bt_health_connect_channel, false,
+                               sizeof(struct hal_cmd_health_connect_channel) },
+       /* HAL_OP_HEALTH_DESTROY_CHANNEL */
+       { bt_health_destroy_channel, false,
+                               sizeof(struct hal_cmd_health_destroy_channel) },
+};
+
+bool bt_health_register(struct ipc *ipc, const bdaddr_t *addr, uint8_t mode)
+{
+       DBG("");
+
+       bacpy(&adapter_addr, addr);
+
+       hal_ipc = ipc;
+       ipc_register(hal_ipc, HAL_SERVICE_ID_HEALTH, cmd_handlers,
+                                               G_N_ELEMENTS(cmd_handlers));
+
+       return true;
+}
+
+void bt_health_unregister(void)
+{
+       DBG("");
+
+       ipc_unregister(hal_ipc, HAL_SERVICE_ID_HEALTH);
+       hal_ipc = NULL;
+}

android/health.h new file +25 -0

new file mode 100644
index 0000000..38a58c0
@@ -0,0 +1,25 @@
+/*
+ *
+ *  BlueZ - Bluetooth protocol stack for Linux
+ *
+ *  Copyright (C) 2013-2014  Intel Corporation. All rights reserved.
+ *
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library 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
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ */
+
+bool bt_health_register(struct ipc *ipc, const bdaddr_t *addr, uint8_t mode);
+void bt_health_unregister(void);

android/main.c +10 -1

index a34f885..9423619 100644
@@ -59,6 +59,7 @@
  #include "avrcp.h"
  #include "handsfree.h"
  #include "gatt.h"
+#include "health.h"
 
  #define STARTUP_GRACE_SECONDS 5
  #define SHUTDOWN_GRACE_SECONDS 10

@@ -133,6 +134,12 @@ static void service_register(const void *buf, uint16_t len)
                         goto failed;
                 }
 
+       case HAL_SERVICE_ID_HEALTH:
+               if (!bt_health_register(hal_ipc, &adapter_bdaddr, m->mode)) {
+                       status = HAL_STATUS_FAILED;
+                       goto failed;
+               }
+
                 break;
         default:
                 DBG("service %u not supported", m->service_id);

@@ -186,6 +193,9 @@ static void service_unregister(const void *buf, uint16_t len)
         case HAL_SERVICE_ID_GATT:
                 bt_gatt_unregister();
                 break;
+       case HAL_SERVICE_ID_HEALTH:
+               bt_health_unregister();
+               break;
         default:
                 /* This would indicate bug in HAL, as unregister should not be
                  * called in init failed */
--

1.8.3.2

--
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