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 2016/09/16 21:51:36 UTC

[2/2] incubator-mynewt-core git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-mynewt-core into develop

Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-mynewt-core into develop


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/b71c9eaa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/b71c9eaa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/b71c9eaa

Branch: refs/heads/develop
Commit: b71c9eaaa5b332112a0dcca8a0e1f874fdcaedd6
Parents: d998235 7541bde
Author: Sterling Hughes <st...@apache.org>
Authored: Fri Sep 16 14:51:25 2016 -0700
Committer: Sterling Hughes <st...@apache.org>
Committed: Fri Sep 16 14:51:25 2016 -0700

----------------------------------------------------------------------
 apps/ocf_sample/pkg.yml                         |  36 +++
 apps/ocf_sample/src/main.c                      | 198 +++++++++++++++
 libs/iotivity/include/iotivity/oc_api.h         |   6 +-
 libs/iotivity/include/iotivity/oc_buffer.h      |   4 +-
 .../iotivity/include/iotivity/oc_client_state.h |   2 +-
 libs/iotivity/include/iotivity/oc_helpers.h     |   4 +-
 .../include/iotivity/oc_network_events.h        |   4 +-
 libs/iotivity/include/iotivity/oc_rep.h         |   2 +-
 libs/iotivity/include/iotivity/oc_ri.h          |   6 +-
 libs/iotivity/pkg.yml                           |   3 +-
 libs/iotivity/src/messaging/coap/coap.h         |  10 +-
 libs/iotivity/src/messaging/coap/conf.h         |   2 +-
 libs/iotivity/src/messaging/coap/observe.h      |   4 +-
 libs/iotivity/src/messaging/coap/oc_coap.h      |   2 +-
 libs/iotivity/src/messaging/coap/separate.h     |   2 +-
 libs/iotivity/src/messaging/coap/transactions.h |   2 +-
 libs/iotivity/src/port/mynewt/ip_adaptor.c      | 123 ++++++----
 libs/iotivity/src/port/oc_assert.h              |   2 +-
 libs/iotivity/src/port/oc_clock.h               |   2 +-
 libs/iotivity/src/port/oc_connectivity.h        |   8 +-
 libs/iotivity/src/util/oc_process.h             |   2 +-
 libs/iotivity/src/util/oc_timer.h               |   2 +-
 sys/mn_socket/include/mn_socket/mn_socket.h     |  24 +-
 sys/mn_socket/src/arch/sim/native_itf.c         |  30 +++
 sys/mn_socket/src/arch/sim/native_sock.c        |  94 ++++++-
 sys/mn_socket/src/arch/sim/native_sock_priv.h   |   1 +
 sys/mn_socket/src/test/mn_sock_test.c           | 245 +++++++++++++++++++
 27 files changed, 738 insertions(+), 82 deletions(-)
----------------------------------------------------------------------