Skip to content

Commit 545d68a

Browse files
aescolarhenrikbrixandersen
authored andcommitted
native_simulator: Get latest from upstream
Align with native_simulator's upstream main f02906708cf1668fe54ef2c2f1e159ed947573aa Which includes: * f029067 CPU ctrl: Fix two malformed error/warning messages * 114f78b Host trampolines: Fix typos in comment Signed-off-by: Alberto Escolar Piedras <[email protected]>
1 parent 39ea8ac commit 545d68a

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

scripts/native_simulator/common/src/include/nsi_host_trampolines.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
* function calls, as that would break the include path isolation
1313
*
1414
* Naming convention: nsi_host_<fun>() where <func> is the name of the equivalent
15-
* C library call we call thru.
15+
* C library function we call through
1616
*/
1717

1818
#ifndef NSI_COMMON_SRC_INCL_NSI_HOST_TRAMPOLINES_H

scripts/native_simulator/common/src/nsi_cpu_ctrl.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ static bool cpu_booted[NSI_N_CPUS];
1515
#define CPU_N_RANGE_CHECK(cpu_n) \
1616
if (cpu_n >= NSI_N_CPUS) { \
1717
nsi_print_error_and_exit("%s called with cpu_n(%i) >= NSI_N_CPUS (%i)\n", \
18-
cpu_n, NSI_N_CPUS); \
18+
__func__, cpu_n, NSI_N_CPUS); \
1919
}
2020

2121
void nsi_cpu_set_auto_start(int cpu_n, bool auto_start)
@@ -45,7 +45,7 @@ void nsi_cpu_boot(int cpu_n)
4545
CPU_N_RANGE_CHECK(cpu_n);
4646
if (cpu_booted[cpu_n]) {
4747
nsi_print_warning("%s called with cpu_n(%i) which was already booted\n",
48-
cpu_n);
48+
__func__, cpu_n);
4949
}
5050
cpu_booted[cpu_n] = true;
5151
nsif_cpun_boot(cpu_n);

0 commit comments

Comments
 (0)