michaelh/zephyr
1
0
Fork 0
Code Releases Activity

console: semihost_console: use semihost API

Browse source 
Update the semihost_console implementation to use the semihost API
instead of manually constructing the supervisor calls.

Signed-off-by: Jordan Yates <jordan.yates@data61.csiro.au>
This commit is contained in:
Jordan Yates 2022-03-30 20:47:56 +10:00 • committed by Carles Cufí
commit f280114f0e
1 changed files with 5 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

44
drivers/console/semihost_console.c
View file

@ -3,50 +3,16 @@
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
#include <kernel.h> #include <zephyr/kernel.h>
#include <device.h> #include <zephyr/device.h>
#include <init.h> #include <zephyr/init.h>
#include <zephyr/arch/common/semihost.h>
extern void __stdout_hook_install(int (*fn)(int)); extern void __stdout_hook_install(int (*fn)(int));
#define SYS_WRITEC 0x03
int arch_printk_char_out(int _c) int arch_printk_char_out(int _c)
{ {
char c = _c; semihost_poll_out((char)_c);
#if defined(CONFIG_CPU_CORTEX_M)
register unsigned long r0 __asm__("r0") = SYS_WRITEC;
register void *r1 __asm__("r1") = &c;
__asm__ __volatile__ ("bkpt 0xab" : : "r" (r0), "r" (r1) : "memory");
#elif defined(CONFIG_ARM64)
register unsigned long x0 __asm__("x0") = SYS_WRITEC;
register void *x1 __asm__("x1") = &c;
__asm__ volatile ("hlt 0xf000" : : "r" (x0), "r" (x1) : "memory");
#elif defined(CONFIG_RISCV)
register unsigned long a0 __asm__("a0") = SYS_WRITEC;
register void *a1 __asm__("a1") = &c;
__asm__ volatile (
".option push\n\t"
".option norvc\n\t"
"slli zero, zero, 0x1f\n\t"
"ebreak\n\t"
"srai zero, zero, 0x7\n\t"
".option pop"
: : "r" (a0), "r" (a1) : "memory");
#else
#error "unsupported CPU type"
#endif
return 0; return 0;
} }