You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by st...@apache.org on 2015/11/05 02:59:14 UTC
[2/2] incubator-mynewt-larva git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva
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/329fd8a1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/tree/329fd8a1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-larva/diff/329fd8a1
Branch: refs/heads/master
Commit: 329fd8a13f0929ba9d0e7a9526ede9afdd5710da
Parents: 3c7aef2 f10a7e7
Author: Sterling Hughes <st...@apache.org>
Authored: Wed Nov 4 17:59:06 2015 -0800
Committer: Sterling Hughes <st...@apache.org>
Committed: Wed Nov 4 17:59:06 2015 -0800
----------------------------------------------------------------------
hw/bsp/nrf52pdk/egg.yml | 2 +
hw/bsp/nrf52pdk/nrf52pdk_debug.sh | 26 ++
hw/bsp/nrf52pdk/nrf52pdk_download.sh | 48 +++
hw/mcu/nordic/nrf52xxx/src/hal_uart.c | 26 +-
libs/os/include/os/os_mbuf.h | 3 +
libs/os/src/os_mbuf.c | 37 +++
.../controller/include/controller/ble_hw.h | 2 +-
.../controller/include/controller/ble_ll.h | 2 +-
.../controller/include/controller/ble_ll_adv.h | 4 +-
.../controller/include/controller/ble_ll_hci.h | 4 +-
.../controller/include/controller/ble_ll_scan.h | 2 +-
.../include/controller/ble_ll_sched.h | 2 +-
.../include/controller/ble_ll_whitelist.h | 2 +-
.../controller/include/controller/ble_phy.h | 2 +-
net/nimble/controller/src/ble_hw.c | 3 +-
net/nimble/controller/src/ble_ll.c | 1 +
net/nimble/controller/src/ble_ll_scan.c | 1 +
net/nimble/controller/src/ble_phy.c | 3 +-
net/nimble/host/include/host/host_hci.h | 4 +-
net/nimble/host/include/host/host_task.h | 16 -
net/nimble/host/src/arch/sim/itf.c | 98 +++---
net/nimble/host/src/attr.c | 249 ---------------
net/nimble/host/src/ble_hs_att.c | 315 +++++++++++++++++++
net/nimble/host/src/ble_hs_att.h | 22 ++
net/nimble/host/src/ble_hs_conn.c | 128 ++++++++
net/nimble/host/src/ble_hs_conn.h | 39 +++
net/nimble/host/src/ble_l2cap.c | 155 +++++++++
net/nimble/host/src/ble_l2cap.h | 67 ++++
net/nimble/host/src/host_dbg.h | 4 +-
net/nimble/host/src/host_hci.c | 54 +---
net/nimble/host/src/host_task.c | 72 ++---
net/nimble/host/src/itf.h | 16 +
net/nimble/host/src/l2cap.c | 43 ---
net/nimble/host/src/l2cap.h | 25 --
net/nimble/include/nimble/ble.h | 2 +-
net/nimble/include/nimble/hci_common.h | 3 +-
net/nimble/include/nimble/hci_transport.h | 5 +-
project/bletest/src/main.c | 52 +++
38 files changed, 1058 insertions(+), 481 deletions(-)
----------------------------------------------------------------------