diff options
Diffstat (limited to 'zephyr')
| -rw-r--r-- | zephyr/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | zephyr/shim/src/console.c | 11 | ||||
| -rw-r--r-- | zephyr/shim/src/util.c | 44 | ||||
| -rw-r--r-- | zephyr/test/hooks/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | zephyr/test/i2c/CMakeLists.txt | 3 |
5 files changed, 58 insertions, 3 deletions
diff --git a/zephyr/CMakeLists.txt b/zephyr/CMakeLists.txt index 68f7382cc6..28620657d4 100644 --- a/zephyr/CMakeLists.txt +++ b/zephyr/CMakeLists.txt @@ -40,6 +40,7 @@ add_subdirectory_ifdef(CONFIG_PLATFORM_EC "shim") # supported by all boards and emulators (including unit tests) using the shim # layer. zephyr_sources_ifdef(CONFIG_PLATFORM_EC "${PLATFORM_EC}/common/base32.c" + "${PLATFORM_EC}/common/printf.c" "${PLATFORM_EC}/common/queue.c" "${PLATFORM_EC}/common/shared_mem.c") diff --git a/zephyr/shim/src/console.c b/zephyr/shim/src/console.c index f59bda2f63..f07b56cf2f 100644 --- a/zephyr/shim/src/console.c +++ b/zephyr/shim/src/console.c @@ -10,12 +10,19 @@ #include <zephyr.h> #include "console.h" +#include "printf.h" int cputs(enum console_channel channel, const char *str) { return cprintf(channel, "%s", str); } +static int printk_putchar(void *context, int c) +{ + printk("%c", c); + return 0; +} + static void console_vprintf(enum console_channel channel, const char *format, va_list args) { @@ -27,7 +34,7 @@ static void console_vprintf(enum console_channel channel, const char *format, * use shell_ print functions instead of printk function as they could * be on different uarts (they are not for Chrome OS Apps though). */ - vprintk(format, args); + vfnprintf(printk_putchar, NULL, format, args); } __attribute__((__format__(__printf__, 2, 3))) int @@ -46,7 +53,7 @@ cprints(enum console_channel channel, const char *format, ...) { va_list args; - cprintf(channel, "[%lld ", k_uptime_get()); + cprintf(channel, "[%pT ", PRINTF_TIMESTAMP_NOW); va_start(args, format); console_vprintf(channel, format, args); va_end(args); diff --git a/zephyr/shim/src/util.c b/zephyr/shim/src/util.c index 3181fccb95..5a7131b23a 100644 --- a/zephyr/shim/src/util.c +++ b/zephyr/shim/src/util.c @@ -161,3 +161,47 @@ int parse_offset_size(int argc, char **argv, int shift, int *offset, int *size) return EC_SUCCESS; } + +int uint64divmod(uint64_t *n, int d) +{ + uint64_t q = 0, mask; + int r = 0; + + /* Divide-by-zero returns zero */ + if (!d) { + *n = 0; + return 0; + } + + /* Common powers of 2 = simple shifts */ + if (d == 2) { + r = *n & 1; + *n >>= 1; + return r; + } else if (d == 16) { + r = *n & 0xf; + *n >>= 4; + return r; + } + + /* If v fits in 32-bit, we're done. */ + if (*n <= 0xffffffff) { + uint32_t v32 = *n; + r = v32 % d; + *n = v32 / d; + return r; + } + + /* Otherwise do integer division the slow way. */ + for (mask = (1ULL << 63); mask; mask >>= 1) { + r <<= 1; + if (*n & mask) + r |= 1; + if (r >= d) { + r -= d; + q |= mask; + } + } + *n = q; + return r; +} diff --git a/zephyr/test/hooks/CMakeLists.txt b/zephyr/test/hooks/CMakeLists.txt index e44ebfe674..2236963762 100644 --- a/zephyr/test/hooks/CMakeLists.txt +++ b/zephyr/test/hooks/CMakeLists.txt @@ -23,5 +23,7 @@ zephyr_include_directories( # Include test file, test under test and console dependency target_sources(app PRIVATE hooks.c) +target_sources(app PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../../../common/printf.c") target_sources(app PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../../shim/src/hooks.c") target_sources(app PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../../shim/src/console.c") +target_sources(app PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../../shim/src/util.c") diff --git a/zephyr/test/i2c/CMakeLists.txt b/zephyr/test/i2c/CMakeLists.txt index 94c5deb8cc..4edbfb9006 100644 --- a/zephyr/test/i2c/CMakeLists.txt +++ b/zephyr/test/i2c/CMakeLists.txt @@ -25,4 +25,5 @@ target_sources(app PRIVATE "${PLATFORM_EC}/zephyr/shim/src/console.c" "${PLATFORM_EC}/zephyr/shim/src/i2c.c" "${PLATFORM_EC}/zephyr/shim/src/util.c" - "${PLATFORM_EC}/common/i2c_controller.c") + "${PLATFORM_EC}/common/i2c_controller.c" + "${PLATFORM_EC}/common/printf.c") |