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 2016/06/06 14:30:20 UTC
[12/13] incubator-mynewt-core git commit: Merge remote-tracking
branch 'origin/develop' into upf54
Merge remote-tracking branch 'origin/develop' into upf54
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/c838b9f6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/c838b9f6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/c838b9f6
Branch: refs/heads/upf54
Commit: c838b9f6f6f638fee49e45bf4bb5f7bb600afa81
Parents: 3721446 a3e7ae6
Author: Christopher Collins <cc...@apache.org>
Authored: Mon Jun 6 22:29:31 2016 +0800
Committer: Christopher Collins <cc...@apache.org>
Committed: Mon Jun 6 22:29:31 2016 +0800
----------------------------------------------------------------------
apps/bletiny/src/bletiny.h | 2 +-
apps/bletiny/src/cmd.c | 14 +-
apps/bletiny/src/main.c | 18 +-
apps/bletiny/src/misc.c | 4 +-
net/nimble/host/include/host/ble_gatt.h | 8 +-
net/nimble/host/include/host/ble_sm.h | 20 +-
net/nimble/host/src/ble_att_clt.c | 63 +++-
net/nimble/host/src/ble_att_cmd.c | 94 +++++-
net/nimble/host/src/ble_att_cmd_priv.h | 30 +-
net/nimble/host/src/ble_att_priv.h | 23 +-
net/nimble/host/src/ble_att_svr.c | 46 ++-
net/nimble/host/src/ble_gattc.c | 22 +-
net/nimble/host/src/ble_hs_priv.h | 24 ++
net/nimble/host/src/ble_sm.c | 326 +++++++++----------
net/nimble/host/src/ble_sm_cmd.c | 193 ++++++-----
net/nimble/host/src/ble_sm_lgcy.c | 51 ++-
net/nimble/host/src/ble_sm_priv.h | 129 ++++----
net/nimble/host/src/ble_sm_sc.c | 126 ++++---
net/nimble/host/src/host_hci.c | 4 +-
net/nimble/host/src/test/ble_gatt_conn_test.c | 6 +-
net/nimble/host/src/test/ble_gatt_disc_c_test.c | 210 ++++++------
net/nimble/host/src/test/ble_gatt_disc_s_test.c | 4 +-
net/nimble/host/src/test/ble_gatt_find_s_test.c | 6 +-
net/nimble/host/src/test/ble_sm_test.c | 128 ++++----
24 files changed, 903 insertions(+), 648 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/c838b9f6/apps/bletiny/src/main.c
----------------------------------------------------------------------