You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by cc...@apache.org on 2015/11/05 21:20:18 UTC
incubator-mynewt-larva git commit: Oops - fix broken build.
Repository: incubator-mynewt-larva
Updated Branches:
refs/heads/master 7fe4d2255 -> 5efca3c9d
Oops - fix broken build.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/commit/5efca3c9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/tree/5efca3c9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/diff/5efca3c9
Branch: refs/heads/master
Commit: 5efca3c9d3f060aee9fe17b4a53cfbf540c2f4c4
Parents: 7fe4d22
Author: Christopher Collins <cc...@gmail.com>
Authored: Thu Nov 5 12:20:02 2015 -0800
Committer: Christopher Collins <cc...@gmail.com>
Committed: Thu Nov 5 12:20:02 2015 -0800
----------------------------------------------------------------------
net/nimble/host/src/ble_l2cap.c | 4 +++-
net/nimble/host/src/ble_l2cap.h | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/5efca3c9/net/nimble/host/src/ble_l2cap.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/ble_l2cap.c b/net/nimble/host/src/ble_l2cap.c
index afcc2ac..7ee3cf0 100644
--- a/net/nimble/host/src/ble_l2cap.c
+++ b/net/nimble/host/src/ble_l2cap.c
@@ -89,7 +89,7 @@ ble_l2cap_parse_hdr(void *pkt, uint16_t len, struct ble_l2cap_hdr *l2cap_hdr)
return 0;
}
-void
+int
ble_l2cap_write_hdr(void *dst, uint16_t len,
const struct ble_l2cap_hdr *l2cap_hdr)
{
@@ -108,6 +108,8 @@ ble_l2cap_write_hdr(void *dst, uint16_t len,
htole16(u8ptr + off, l2cap_hdr->blh_cid);
off += 2;
+
+ return 0;
}
static struct ble_l2cap_chan *
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/blob/5efca3c9/net/nimble/host/src/ble_l2cap.h
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/ble_l2cap.h b/net/nimble/host/src/ble_l2cap.h
index 5fd950d..7365ce7 100644
--- a/net/nimble/host/src/ble_l2cap.h
+++ b/net/nimble/host/src/ble_l2cap.h
@@ -61,8 +61,8 @@ void ble_l2cap_chan_free(struct ble_l2cap_chan *chan);
int ble_l2cap_parse_hdr(void *pkt, uint16_t len,
struct ble_l2cap_hdr *l2cap_hdr);
-void ble_l2cap_write_hdr(void *dst, uint16_t len,
- const struct ble_l2cap_hdr *l2cap_hdr);
+int ble_l2cap_write_hdr(void *dst, uint16_t len,
+ const struct ble_l2cap_hdr *l2cap_hdr);
int ble_l2cap_rx(struct ble_hs_conn *connection,
struct hci_data_hdr *hci_hdr,