YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

target: zephyr: Update to Zephyr 1.6 API. (#1462)

Browse Source 
Zephyr 1.6 switched to "unified kernel API". Old API is supported, but
deprecated and leads to warnings.

JerryScript-DCO-1.0-Signed-off-by: Paul Sokolovsky paul.sokolovsky@linaro.org
This commit is contained in:
Paul Sokolovsky
2016-12-01 09:24:40 +02:00
committed by László Langó
parent 7b2fc4f27a
commit 958344ee16
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
targets/zephyr/src/getline-zephyr.c
+7 -7
View File
@@ -22,8 +22,8 @@
buffer to accumulate more console input. */ buffer to accumulate more console input. */
static struct uart_console_input line_bufs[2]; static struct uart_console_input line_bufs[2];
static struct nano_fifo free_queue; static struct k_fifo free_queue;
static struct nano_fifo used_queue; static struct k_fifo used_queue;
char *zephyr_getline(void) char *zephyr_getline(void)
{ {
@@ -32,10 +32,10 @@ char *zephyr_getline(void)
/* Recycle cmd buffer returned previous time */ /* Recycle cmd buffer returned previous time */
if (cmd != NULL) if (cmd != NULL)
{ {
nano_fifo_put(&free_queue, cmd); k_fifo_put(&free_queue, cmd);
} }
cmd = nano_fifo_get(&used_queue, TICKS_UNLIMITED); cmd = k_fifo_get(&used_queue, K_FOREVER);
return cmd->line; return cmd->line;
} }
@@ -43,11 +43,11 @@ void zephyr_getline_init(void)
{ {
int i; int i;
nano_fifo_init(&used_queue); k_fifo_init(&used_queue);
nano_fifo_init(&free_queue); k_fifo_init(&free_queue);
for (i = 0; i < sizeof(line_bufs) / sizeof(*line_bufs); i++) for (i = 0; i < sizeof(line_bufs) / sizeof(*line_bufs); i++)
{ {
nano_fifo_put(&free_queue, &line_bufs[i]); k_fifo_put(&free_queue, &line_bufs[i]);
} }
/* Zephyr UART handler takes an empty buffer from free_queue, /* Zephyr UART handler takes an empty buffer from free_queue,
targets/zephyr/src/jerry-port.c
+3 -3
View File
@@ -63,13 +63,13 @@ void jerry_port_fatal (jerry_fatal_code_t code)
/** /**
* Implementation of jerry_port_get_current_time. * Implementation of jerry_port_get_current_time.
* *
* @return current timer's counter value in microseconds * @return current timer's counter value in milliseconds
*/ */
double double
jerry_port_get_current_time () jerry_port_get_current_time ()
{ {
int64_t us = sys_tick_get() * sys_clock_us_per_tick; int64_t ms = k_uptime_get();
return (double) us / 1000; return (double) ms;
} /* jerry_port_get_current_time */ } /* jerry_port_get_current_time */
/** /**