You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by we...@apache.org on 2016/12/13 19:46:46 UTC
incubator-mynewt-core git commit: MYNEWT-508: The ocf at the host
needs to be a uint16_t.
Repository: incubator-mynewt-core
Updated Branches:
refs/heads/develop f1924c558 -> 5e0f1bce5
MYNEWT-508: The ocf at the host needs to be a uint16_t.
This is due to the vendor specific ocf added for multi-advertising.
Project: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/commit/5e0f1bce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/5e0f1bce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/5e0f1bce
Branch: refs/heads/develop
Commit: 5e0f1bce52c53756a2e4547be3ed1f9e4a84b3ed
Parents: f1924c5
Author: William San Filippo <wi...@runtime.io>
Authored: Tue Dec 13 11:45:56 2016 -0800
Committer: William San Filippo <wi...@runtime.io>
Committed: Tue Dec 13 11:45:56 2016 -0800
----------------------------------------------------------------------
net/nimble/host/src/ble_hs_hci_cmd.c | 6 +++---
net/nimble/host/src/ble_hs_hci_priv.h | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/5e0f1bce/net/nimble/host/src/ble_hs_hci_cmd.c
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/ble_hs_hci_cmd.c b/net/nimble/host/src/ble_hs_hci_cmd.c
index 0f2d981..f8e7dde 100644
--- a/net/nimble/host/src/ble_hs_hci_cmd.c
+++ b/net/nimble/host/src/ble_hs_hci_cmd.c
@@ -47,7 +47,7 @@ ble_hs_hci_cmd_transport(uint8_t *cmdbuf)
}
void
-ble_hs_hci_cmd_write_hdr(uint8_t ogf, uint8_t ocf, uint8_t len, void *buf)
+ble_hs_hci_cmd_write_hdr(uint8_t ogf, uint16_t ocf, uint8_t len, void *buf)
{
uint16_t opcode;
uint8_t *u8ptr;
@@ -60,7 +60,7 @@ ble_hs_hci_cmd_write_hdr(uint8_t ogf, uint8_t ocf, uint8_t len, void *buf)
}
int
-ble_hs_hci_cmd_send(uint8_t ogf, uint8_t ocf, uint8_t len, const void *cmddata)
+ble_hs_hci_cmd_send(uint8_t ogf, uint16_t ocf, uint8_t len, const void *cmddata)
{
uint8_t *buf;
int rc;
@@ -74,7 +74,7 @@ ble_hs_hci_cmd_send(uint8_t ogf, uint8_t ocf, uint8_t len, const void *cmddata)
memcpy(buf + BLE_HCI_CMD_HDR_LEN, cmddata, len);
}
- BLE_HS_LOG(DEBUG, "ble_hs_hci_cmd_send: ogf=0x%02x ocf=0x%02x len=%d\n",
+ BLE_HS_LOG(DEBUG, "ble_hs_hci_cmd_send: ogf=0x%02x ocf=0x%04x len=%d\n",
ogf, ocf, len);
ble_hs_log_flat_buf(buf, len + BLE_HCI_CMD_HDR_LEN);
BLE_HS_LOG(DEBUG, "\n");
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/5e0f1bce/net/nimble/host/src/ble_hs_hci_priv.h
----------------------------------------------------------------------
diff --git a/net/nimble/host/src/ble_hs_hci_priv.h b/net/nimble/host/src/ble_hs_hci_priv.h
index a379730..bdc5457 100644
--- a/net/nimble/host/src/ble_hs_hci_priv.h
+++ b/net/nimble/host/src/ble_hs_hci_priv.h
@@ -58,9 +58,9 @@ int ble_hs_hci_util_data_hdr_strip(struct os_mbuf *om,
int ble_hs_hci_evt_process(uint8_t *data);
uint16_t ble_hs_hci_util_opcode_join(uint8_t ogf, uint16_t ocf);
-void ble_hs_hci_cmd_write_hdr(uint8_t ogf, uint8_t ocf, uint8_t len,
+void ble_hs_hci_cmd_write_hdr(uint8_t ogf, uint16_t ocf, uint8_t len,
void *buf);
-int ble_hs_hci_cmd_send(uint8_t ogf, uint8_t ocf, uint8_t len,
+int ble_hs_hci_cmd_send(uint8_t ogf, uint16_t ocf, uint8_t len,
const void *cmddata);
int ble_hs_hci_cmd_send_buf(void *cmddata);
void ble_hs_hci_cmd_build_read_bd_addr(uint8_t *dst, int dst_len);