79e6b0e0f6
As of today <zephyr/zephyr.h> is 100% equivalent to <zephyr/kernel.h>. This patch proposes to then include <zephyr/kernel.h> instead of <zephyr/zephyr.h> since it is more clear that you are including the Kernel APIs and (probably) nothing else. <zephyr/zephyr.h> sounds like a catch-all header that may be confusing. Most applications need to include a bunch of other things to compile, e.g. driver headers or subsystem headers like BT, logging, etc. The idea of a catch-all header in Zephyr is probably not feasible anyway. Reason is that Zephyr is not a library, like it could be for example `libpython`. Zephyr provides many utilities nowadays: a kernel, drivers, subsystems, etc and things will likely grow. A catch-all header would be massive, difficult to keep up-to-date. It is also likely that an application will only build a small subset. Note that subsystem-level headers may use a catch-all approach to make things easier, though. NOTE: This patch is **NOT** removing the header, just removing its usage in-tree. I'd advocate for its deprecation (add a #warning on it), but I understand many people will have concerns. Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
66 lines
1.4 KiB
C
66 lines
1.4 KiB
C
/*
|
|
* Copyright (c) 2016 Intel Corporation
|
|
*
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
#include <ctype.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <strings.h>
|
|
#include <zephyr/kernel.h>
|
|
|
|
#include "shell_utils.h"
|
|
|
|
const uint32_t TIME_US[] = { 60 * 1000 * 1000, 1000 * 1000, 1000, 0 };
|
|
const char *TIME_US_UNIT[] = { "m", "s", "ms", "us" };
|
|
const uint32_t KBPS[] = { 1024, 0 };
|
|
const char *KBPS_UNIT[] = { "Mbps", "Kbps" };
|
|
const uint32_t K[] = { 1024 * 1024, 1024, 0 };
|
|
const char *K_UNIT[] = { "M", "K", "" };
|
|
|
|
void print_number(const struct shell *sh, uint32_t value,
|
|
const uint32_t *divisor, const char **units)
|
|
{
|
|
const char **unit;
|
|
const uint32_t *div;
|
|
uint32_t dec, radix;
|
|
|
|
unit = units;
|
|
div = divisor;
|
|
|
|
while (value < *div) {
|
|
div++;
|
|
unit++;
|
|
}
|
|
|
|
if (*div != 0U) {
|
|
radix = value / *div;
|
|
dec = (value % *div) * 100U / *div;
|
|
shell_fprintf(sh, SHELL_NORMAL, "%u.%s%u %s", radix,
|
|
(dec < 10) ? "0" : "", dec, *unit);
|
|
} else {
|
|
shell_fprintf(sh, SHELL_NORMAL, "%u %s", value, *unit);
|
|
}
|
|
}
|
|
|
|
long parse_number(const char *string, const uint32_t *divisor,
|
|
const char **units)
|
|
{
|
|
const char **unit;
|
|
const uint32_t *div;
|
|
char *suffix;
|
|
long dec;
|
|
int cmp;
|
|
|
|
dec = strtoul(string, &suffix, 10);
|
|
unit = units;
|
|
div = divisor;
|
|
|
|
do {
|
|
cmp = strncasecmp(suffix, *unit++, 1);
|
|
} while (cmp != 0 && *++div != 0U);
|
|
|
|
return (*div == 0U) ? dec : dec * *div;
|
|
}
|