You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mynewt.apache.org by ma...@apache.org on 2016/11/30 16:58:04 UTC
[16/16] incubator-mynewt-core git commit: Merge branch 'coap' into
develop
Merge branch 'coap' 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/5f7ad8cb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/5f7ad8cb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/5f7ad8cb
Branch: refs/heads/develop
Commit: 5f7ad8cb0d189dac73b45e1cf928b92be3056cdd
Parents: 84997a9 6979f45
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Wed Nov 30 08:56:36 2016 -0800
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Wed Nov 30 08:56:36 2016 -0800
----------------------------------------------------------------------
hw/drivers/lwip/stm32f4_eth/src/stm32f4_eth.c | 16 +-
net/oic/include/oic/oc_client_state.h | 4 +-
net/oic/include/oic/oc_helpers.h | 91 +--
net/oic/include/oic/oc_rep.h | 1 +
net/oic/include/oic/oc_ri.h | 11 +-
net/oic/src/api/oc_core_res.c | 359 ++++++-----
net/oic/src/api/oc_discovery.c | 32 +-
net/oic/src/api/oc_helpers.c | 180 +++---
net/oic/src/api/oc_rep.c | 8 +-
net/oic/src/api/oc_ri.c | 107 ++--
net/oic/src/api/oc_server_api.c | 73 +--
net/oic/src/messaging/coap/coap.c | 698 ++++++++++-----------
net/oic/src/messaging/coap/coap.h | 108 ++--
net/oic/src/messaging/coap/observe.c | 50 +-
net/oic/src/messaging/coap/observe.h | 7 +-
net/oic/src/messaging/coap/oc_coap.h | 23 +-
net/oic/src/messaging/coap/separate.c | 24 +-
net/oic/src/messaging/coap/separate.h | 29 +-
net/oic/src/messaging/coap/transactions.c | 23 +-
net/oic/src/messaging/coap/transactions.h | 2 +-
net/oic/src/port/mynewt/config.h | 5 -
net/oic/src/util/oc_list.c | 317 ----------
net/oic/src/util/oc_list.h | 152 -----
net/oic/src/util/oc_mmem.c | 154 -----
net/oic/src/util/oc_mmem.h | 61 --
net/oic/syscfg.yml | 2 +-
26 files changed, 900 insertions(+), 1637 deletions(-)
----------------------------------------------------------------------