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 2017/02/11 00:01:04 UTC
[1/3] incubator-mynewt-core git commit: MYNEWT-292
Repository: incubator-mynewt-core
Updated Branches:
refs/heads/develop 35b0a91b1 -> 88191c27f
MYNEWT-292
Add an assert checking that same prio is not used by two different
tasks.
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/0f1ec97b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/0f1ec97b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/0f1ec97b
Branch: refs/heads/develop
Commit: 0f1ec97bc26c509ea0e5fe0e738fdeeb9c899576
Parents: 1d2d46b
Author: Fabio Utzig <ut...@utzig.org>
Authored: Wed Feb 8 14:24:32 2017 -0800
Committer: Fabio Utzig <ut...@utzig.org>
Committed: Wed Feb 8 15:06:08 2017 -0800
----------------------------------------------------------------------
hw/mcu/native/pkg.yml | 2 +-
kernel/os/include/os/os_task.h | 2 +-
kernel/os/src/os_task.c | 5 +++++
3 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0f1ec97b/hw/mcu/native/pkg.yml
----------------------------------------------------------------------
diff --git a/hw/mcu/native/pkg.yml b/hw/mcu/native/pkg.yml
index d86e149..7094340 100644
--- a/hw/mcu/native/pkg.yml
+++ b/hw/mcu/native/pkg.yml
@@ -28,6 +28,6 @@ pkg.keywords:
pkg.deps:
- hw/hal
- compiler/sim
-
+
pkg.req_apis:
- console
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0f1ec97b/kernel/os/include/os/os_task.h
----------------------------------------------------------------------
diff --git a/kernel/os/include/os/os_task.h b/kernel/os/include/os/os_task.h
index a9253ba..64c0850 100644
--- a/kernel/os/include/os/os_task.h
+++ b/kernel/os/include/os/os_task.h
@@ -45,7 +45,7 @@ struct os_task_obj
/* Task states */
typedef enum os_task_state {
- OS_TASK_READY = 1,
+ OS_TASK_READY = 1,
OS_TASK_SLEEP = 2,
OS_TASK_SUSPEND = 3
} os_task_state_t;
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/0f1ec97b/kernel/os/src/os_task.c
----------------------------------------------------------------------
diff --git a/kernel/os/src/os_task.c b/kernel/os/src/os_task.c
index 277e4bc..f3106bd 100644
--- a/kernel/os/src/os_task.c
+++ b/kernel/os/src/os_task.c
@@ -98,6 +98,7 @@ os_task_init(struct os_task *t, const char *name, os_task_func_t func,
{
struct os_sanity_check *sc;
int rc;
+ struct os_task *task;
memset(t, 0, sizeof(*t));
@@ -132,6 +133,10 @@ os_task_init(struct os_task *t, const char *name, os_task_func_t func,
t->t_stacktop = &stack_bottom[stack_size];
t->t_stacksize = stack_size;
+ STAILQ_FOREACH(task, &g_os_task_list, t_os_task_list) {
+ assert(t->t_prio != task->t_prio);
+ }
+
/* insert this task into the task list */
STAILQ_INSERT_TAIL(&g_os_task_list, t, t_os_task_list);
[3/3] incubator-mynewt-core git commit: MYNEWT-473;
change console to use HAL UART, and espduino connection goes via
bitbanger. Set console speed to 115200.
Posted by ma...@apache.org.
MYNEWT-473; change console to use HAL UART, and espduino connection
goes via bitbanger. Set console speed to 115200.
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/88191c27
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/88191c27
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/88191c27
Branch: refs/heads/develop
Commit: 88191c27f772d3d9f2e43ff0ed55b80c5258560d
Parents: 0724409
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Fri Feb 10 15:59:33 2017 -0800
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Fri Feb 10 15:59:33 2017 -0800
----------------------------------------------------------------------
hw/bsp/arduino_primo_nrf52/include/bsp/bsp.h | 4 ++--
hw/bsp/arduino_primo_nrf52/syscfg.yml | 10 ++++------
2 files changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/88191c27/hw/bsp/arduino_primo_nrf52/include/bsp/bsp.h
----------------------------------------------------------------------
diff --git a/hw/bsp/arduino_primo_nrf52/include/bsp/bsp.h b/hw/bsp/arduino_primo_nrf52/include/bsp/bsp.h
index f375c41..39da427 100644
--- a/hw/bsp/arduino_primo_nrf52/include/bsp/bsp.h
+++ b/hw/bsp/arduino_primo_nrf52/include/bsp/bsp.h
@@ -41,9 +41,9 @@ extern uint8_t _ram_start;
#define LED_BLINK_PIN (25)
/* UART info */
-#define CONSOLE_UART "uart1"
+#define CONSOLE_UART "uart0"
-#define ESPDUINO_UART "uart0"
+#define ESPDUINO_UART "uart1"
#define ESPDUINO_UART_SPEED 9600
#define NFFS_AREA_MAX (8)
http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/blob/88191c27/hw/bsp/arduino_primo_nrf52/syscfg.yml
----------------------------------------------------------------------
diff --git a/hw/bsp/arduino_primo_nrf52/syscfg.yml b/hw/bsp/arduino_primo_nrf52/syscfg.yml
index bbc7875..4408b8b 100644
--- a/hw/bsp/arduino_primo_nrf52/syscfg.yml
+++ b/hw/bsp/arduino_primo_nrf52/syscfg.yml
@@ -37,10 +37,10 @@ syscfg.defs:
value: 1
UART_0_PIN_TX:
description: 'TBD'
- value: 6
+ value: 12
UART_0_PIN_RX:
description: 'TBD'
- value: 5
+ value: 11
UART_0_PIN_RTS:
description: 'TBD'
value: 0
@@ -53,10 +53,10 @@ syscfg.defs:
value: 1
UART_1_PIN_TX:
description: 'TBD'
- value: 11
+ value: 5
UART_1_PIN_RX:
description: 'TBD'
- value: 12
+ value: 6
UART_1_PIN_RTS:
description: 'TBD'
value: 0
@@ -115,5 +115,3 @@ syscfg.vals:
REBOOT_LOG_FLASH_AREA: FLASH_AREA_REBOOT_LOG
NFFS_FLASH_AREA: FLASH_AREA_NFFS
COREDUMP_FLASH_AREA: FLASH_AREA_IMAGE_1
-
- CONSOLE_BAUD: 9600
[2/3] incubator-mynewt-core git commit: This closes #175.
Posted by ma...@apache.org.
This closes #175.
Merge branch 'disallow-prio-duplication' of https://github.com/utzig/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/0724409d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/tree/0724409d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-mynewt-core/diff/0724409d
Branch: refs/heads/develop
Commit: 0724409d0bc0ec8cd0ece1937eb4802ecf474ba2
Parents: 35b0a91 0f1ec97
Author: Marko Kiiskila <ma...@runtime.io>
Authored: Thu Feb 9 16:40:17 2017 -0800
Committer: Marko Kiiskila <ma...@runtime.io>
Committed: Thu Feb 9 16:40:17 2017 -0800
----------------------------------------------------------------------
hw/mcu/native/pkg.yml | 2 +-
kernel/os/include/os/os_task.h | 2 +-
kernel/os/src/os_task.c | 5 +++++
3 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------