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/10/28 03:44:35 UTC
[1/2] incubator-mynewt-core git commit: oicmgr;
change task name to oicmgr
Repository: incubator-mynewt-core
Updated Branches:
refs/heads/develop 5b0c58e49 -> 39a06ff58
oicmgr; change task name to oicmgr
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/12c56573
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/12c56573
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/12c56573
Branch: refs/heads/develop
Commit: 12c56573c48af4304b4f02de2eeeac7e9155adb9
Parents: 5b0c58e
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Thu Oct 27 20:43:47 2016 -0700
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Thu Oct 27 20:43:47 2016 -0700
----------------------------------------------------------------------
mgmt/oicmgr/src/oicmgr.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/12c56573/mgmt/oicmgr/src/oicmgr.c
----------------------------------------------------------------------
diff --git a/mgmt/oicmgr/src/oicmgr.c b/mgmt/oicmgr/src/oicmgr.c
index ba620b0..2cc14e1 100644
--- a/mgmt/oicmgr/src/oicmgr.c
+++ b/mgmt/oicmgr/src/oicmgr.c
@@ -252,7 +252,7 @@ oicmgr_init(void)
os_eventq_init(&o->os_evq);
- rc = os_task_init(&o->os_task, "newtmgr_oic", omgr_oic_task, NULL,
+ rc = os_task_init(&o->os_task, "oicmgr", omgr_oic_task, NULL,
MYNEWT_VAL(OICMGR_TASK_PRIO), OS_WAIT_FOREVER,
oicmgr_stack, OICMGR_STACK_SZ);
if (rc != 0) {
[2/2] incubator-mynewt-core git commit: oic;
make resource allocations configurable with syscfg.
Posted by ma...@apache.org.
oic; make resource allocations configurable with syscfg.
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/39a06ff5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/39a06ff5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/39a06ff5
Branch: refs/heads/develop
Commit: 39a06ff5895ba42a981dcb6a24b03e3b11336d8f
Parents: 12c5657
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Thu Oct 27 20:44:06 2016 -0700
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Thu Oct 27 20:44:06 2016 -0700
----------------------------------------------------------------------
net/oic/src/port/mynewt/config.h | 18 +++++++++---------
net/oic/syscfg.yml | 26 ++++++++++++++++++++++++++
2 files changed, 35 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/39a06ff5/net/oic/src/port/mynewt/config.h
----------------------------------------------------------------------
diff --git a/net/oic/src/port/mynewt/config.h b/net/oic/src/port/mynewt/config.h
index fa1a5a5..171625f 100644
--- a/net/oic/src/port/mynewt/config.h
+++ b/net/oic/src/port/mynewt/config.h
@@ -7,10 +7,10 @@ extern "C" {
#endif
/* Time resolution */
-#include <stdint.h>
+#include <inttypes.h>
+#include <syscfg/syscfg.h>
#include <os/os.h>
#include <log/log.h>
-#include <syscfg/syscfg.h>
/* rather than change all their source files, just translate the mynewt
* package defines into their defines here */
@@ -43,26 +43,26 @@ typedef os_time_t oc_clock_time_t;
/* Server-side parameters */
/* Maximum number of server resources */
-#define MAX_APP_RESOURCES (8)
+#define MAX_APP_RESOURCES MYNEWT_VAL(OC_APP_RESOURCES)
/* Common paramters */
/* Maximum number of concurrent requests */
-#define MAX_NUM_CONCURRENT_REQUESTS (2)
+#define MAX_NUM_CONCURRENT_REQUESTS MYNEWT_VAL(OC_CONCURRENT_REQUESTS)
/* Estimated number of nodes in payload tree structure */
-#define EST_NUM_REP_OBJECTS (100)
+#define EST_NUM_REP_OBJECTS MYNEWT_VAL(OC_NUM_REP_OBJECTS)
/* Maximum size of request/response PDUs */
-#define MAX_PAYLOAD_SIZE (1120)
+#define MAX_PAYLOAD_SIZE MYNEWT_VAL(OC_MAX_PAYLOAD_SIZE)
/* Number of devices on the OCF platform */
-#define MAX_NUM_DEVICES (1)
+#define MAX_NUM_DEVICES MYNEWT_VAL(OC_NUM_DEVICES)
/* Platform payload size */
-#define MAX_PLATFORM_PAYLOAD_SIZE (256)
+#define MAX_PLATFORM_PAYLOAD_SIZE MYNEWT_VAL(OC_MAX_PAYLOAD)
/* Device payload size */
-#define MAX_DEVICE_PAYLOAD_SIZE (256)
+#define MAX_DEVICE_PAYLOAD_SIZE MYNEWT_VAL(OC_MAX_PAYLOAD)
/* Security layer */
/* Maximum number of authorized clients */
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/39a06ff5/net/oic/syscfg.yml
----------------------------------------------------------------------
diff --git a/net/oic/syscfg.yml b/net/oic/syscfg.yml
index 13857df..f3741ff 100644
--- a/net/oic/syscfg.yml
+++ b/net/oic/syscfg.yml
@@ -44,3 +44,29 @@ syscfg.defs:
OC_TASK_STACK_SIZE:
description: 'The stack size of the OC task in words'
value: '300'
+
+ OC_NUM_REP_OBJECTS:
+ description: 'Estimated number of nodes in payload tree structure'
+ value: 32
+
+ OC_CONCURRENT_REQUESTS:
+ description: 'Maximum number of concurrent requests'
+ value: 2
+
+ OC_MAX_PAYLOAD_SIZE:
+ description: 'Maximum size of request/response PDUs'
+ value: 1120
+
+ OC_APP_RESOURCES:
+ description: 'Maximum number of server resources'
+ value: 8
+
+ OC_NUM_DEVICES:
+ description: 'Number of devices on the OCF platform'
+ value: 1
+
+ OC_MAX_PAYLOAD:
+ description: 'Platform payload size'
+ value: 256
+
+