From: Andrei Emeltchenko <Andrei.Emeltchenko.news@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH 3/9] android/health: Fix wrong callback return type
Date: Thu, 26 Jun 2014 15:04:19 +0300 [thread overview]
Message-ID: <1403784265-1455-3-git-send-email-Andrei.Emeltchenko.news@gmail.com> (raw)
In-Reply-To: <1403784265-1455-1-git-send-email-Andrei.Emeltchenko.news@gmail.com>
From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
---
android/health.c | 8 ++++++--
android/health.h | 8 ++++++++
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/android/health.c b/android/health.c
index dd2e5af..3cb2016 100644
--- a/android/health.c
+++ b/android/health.c
@@ -1098,7 +1098,7 @@ static void mcap_mdl_aborted_cb(struct mcap_mdl *mdl, void *data)
DBG("Not Implemeneted");
}
-static void mcap_mdl_conn_req_cb(struct mcap_mcl *mcl, uint8_t mdepid,
+static uint8_t mcap_mdl_conn_req_cb(struct mcap_mcl *mcl, uint8_t mdepid,
uint16_t mdlid, uint8_t *conf, void *data)
{
GError *gerr = NULL;
@@ -1133,11 +1133,15 @@ static void mcap_mdl_conn_req_cb(struct mcap_mcl *mcl, uint8_t mdepid,
return MCAP_SUCCESS;
}
+
+ return MCAP_SUCCESS;
}
-static void mcap_mdl_reconn_req_cb(struct mcap_mdl *mdl, void *data)
+static uint8_t mcap_mdl_reconn_req_cb(struct mcap_mdl *mdl, void *data)
{
DBG("Not Implemeneted");
+
+ return MCAP_SUCCESS;
}
static void connect_mdl_cb(struct mcap_mdl *mdl, GError *gerr, gpointer data)
diff --git a/android/health.h b/android/health.h
index 0b32fd3..ab7d478 100644
--- a/android/health.h
+++ b/android/health.h
@@ -21,5 +21,13 @@
*
*/
+#define HDP_MDEP_ECHO 0x00
+#define HDP_MDEP_INITIAL 0x01
+#define HDP_MDEP_FINAL 0x7F
+
+#define HDP_NO_PREFERENCE_DC 0x00
+#define HDP_RELIABLE_DC 0x01
+#define HDP_STREAMING_DC 0x02
+
bool bt_health_register(struct ipc *ipc, const bdaddr_t *addr, uint8_t mode);
void bt_health_unregister(void);
--
1.8.3.2
next prev parent reply other threads:[~2014-06-26 12:04 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-26 12:04 [PATCH 1/9] android/health: Add error check when creating app Andrei Emeltchenko
2014-06-26 12:04 ` [PATCH 2/9] android/health: Add handling MDL connection request Andrei Emeltchenko
2014-06-26 14:13 ` Szymon Janc
2014-06-26 12:04 ` Andrei Emeltchenko [this message]
2014-06-26 14:35 ` [PATCH 3/9] android/health: Fix wrong callback return type Szymon Janc
2014-06-26 12:04 ` [PATCH 4/9] android/health: Refactor channel creation Andrei Emeltchenko
2014-06-26 12:04 ` [PATCH 5/9] android/health: Add channel connect Andrei Emeltchenko
2014-06-26 12:04 ` [PATCH 6/9] android/health: Assign channel to user_data Andrei Emeltchenko
2014-06-26 12:04 ` [PATCH 7/9] android/health: Create mdep for ECHO channel Andrei Emeltchenko
2014-06-26 12:04 ` [PATCH 8/9] android/health: Add handling for ECHO service Andrei Emeltchenko
2014-06-26 12:04 ` [PATCH 9/9] android/health: Improve debug Andrei Emeltchenko
2014-06-27 7:39 ` [PATCHv2 1/9] android/health: Add error check when creating app Andrei Emeltchenko
2014-06-27 7:39 ` [PATCHv2 2/9] android/health: Fix wrong callback return type Andrei Emeltchenko
2014-06-27 7:39 ` [PATCHv2 3/9] android/health: Add handling MDL connection request Andrei Emeltchenko
2014-06-27 7:39 ` [PATCHv2 4/9] android/health: Refactor channel creation Andrei Emeltchenko
2014-06-27 7:39 ` [PATCHv2 5/9] android/health: Add channel connect Andrei Emeltchenko
2014-06-27 7:40 ` [PATCHv2 6/9] android/health: Assign channel to user_data Andrei Emeltchenko
2014-06-27 7:40 ` [PATCHv2 7/9] android/health: Create mdep for ECHO channel Andrei Emeltchenko
2014-06-27 7:40 ` [PATCHv2 8/9] android/health: Add handling for ECHO service Andrei Emeltchenko
2014-06-27 7:40 ` [PATCHv2 9/9] android/health: Improve debug Andrei Emeltchenko
2014-06-27 7:59 ` [PATCH] android/pts: Update HDP test results Andrei Emeltchenko
2014-06-27 11:24 ` [PATCHv3 01/12] android/health: Add error check when creating app Andrei Emeltchenko
2014-06-27 11:24 ` [PATCHv3 02/12] android/health: Fix wrong callback return type Andrei Emeltchenko
2014-06-27 14:11 ` Szymon Janc
2014-06-27 11:24 ` [PATCHv3 03/12] android/health: Add HDP definitions Andrei Emeltchenko
2014-06-27 13:41 ` Szymon Janc
2014-06-27 11:24 ` [PATCHv3 04/12] android/health: Add handling MDL connection request Andrei Emeltchenko
2014-06-27 11:24 ` [PATCHv3 05/12] android/health: Refactor channel creation Andrei Emeltchenko
2014-06-27 13:54 ` Szymon Janc
2014-06-27 14:10 ` Andrei Emeltchenko
2014-06-27 14:36 ` Szymon Janc
2014-06-27 11:24 ` [PATCHv3 06/12] android/health: Add channel connect Andrei Emeltchenko
2014-06-27 11:24 ` [PATCHv3 07/12] android/health: Assign channel to user_data Andrei Emeltchenko
2014-06-27 11:24 ` [PATCHv3 08/12] android/health: Create mdep for ECHO channel Andrei Emeltchenko
2014-06-27 11:25 ` [PATCHv3 09/12] android/health: Add handling for ECHO service Andrei Emeltchenko
2014-06-27 14:09 ` Szymon Janc
2014-06-27 14:26 ` Andrei Emeltchenko
2014-06-27 11:25 ` [PATCHv3 10/12] android/health: Improve debug Andrei Emeltchenko
2014-06-27 11:25 ` [PATCHv3 11/12] android/mcap: Fix using uninitialised value Andrei Emeltchenko
2014-06-27 14:11 ` Szymon Janc
2014-06-27 11:25 ` [PATCHv3 12/12] android/pts: Update HDP test results Andrei Emeltchenko
2014-06-27 13:38 ` [PATCHv3 01/12] android/health: Add error check when creating app Szymon Janc
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1403784265-1455-3-git-send-email-Andrei.Emeltchenko.news@gmail.com \
--to=andrei.emeltchenko.news@gmail.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).