mirror of
https://github.com/Fishwaldo/opensbi.git
synced 2025-07-08 14:09:23 +00:00
lib: sbi: Add console_puts() callback in the console device
We add console_puts() callback in the console device which allows console drivers (such as semihosting) to implement a specialized way to output character string. Signed-off-by: Anup Patel <apatel@ventanamicro.com> Reviewed-by: Atish Patra <atishp@rivosinc.com> Reviewed-by: Xiang W <wxjstz@126.com> Reviewed-by: Bin Meng <bmeng@tinylab.org> Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
This commit is contained in:
parent
5a41a3884f
commit
c43903c4ea
2 changed files with 25 additions and 7 deletions
|
@ -19,6 +19,9 @@ struct sbi_console_device {
|
||||||
/** Write a character to the console output */
|
/** Write a character to the console output */
|
||||||
void (*console_putc)(char ch);
|
void (*console_putc)(char ch);
|
||||||
|
|
||||||
|
/** Write a character string to the console output */
|
||||||
|
unsigned long (*console_puts)(const char *str, unsigned long len);
|
||||||
|
|
||||||
/** Read a character from the console input */
|
/** Read a character from the console input */
|
||||||
int (*console_getc)(void);
|
int (*console_getc)(void);
|
||||||
};
|
};
|
||||||
|
|
|
@ -12,6 +12,7 @@
|
||||||
#include <sbi/sbi_hart.h>
|
#include <sbi/sbi_hart.h>
|
||||||
#include <sbi/sbi_platform.h>
|
#include <sbi/sbi_platform.h>
|
||||||
#include <sbi/sbi_scratch.h>
|
#include <sbi/sbi_scratch.h>
|
||||||
|
#include <sbi/sbi_string.h>
|
||||||
|
|
||||||
static const struct sbi_console_device *console_dev = NULL;
|
static const struct sbi_console_device *console_dev = NULL;
|
||||||
static spinlock_t console_out_lock = SPIN_LOCK_INITIALIZER;
|
static spinlock_t console_out_lock = SPIN_LOCK_INITIALIZER;
|
||||||
|
@ -43,24 +44,38 @@ void sbi_putc(char ch)
|
||||||
|
|
||||||
void sbi_puts(const char *str)
|
void sbi_puts(const char *str)
|
||||||
{
|
{
|
||||||
|
unsigned long p, len;
|
||||||
|
|
||||||
spin_lock(&console_out_lock);
|
spin_lock(&console_out_lock);
|
||||||
while (*str) {
|
if (console_dev && console_dev->console_puts) {
|
||||||
sbi_putc(*str);
|
p = 0;
|
||||||
str++;
|
len = sbi_strlen(str);
|
||||||
|
while (p < len)
|
||||||
|
p += console_dev->console_puts(&str[p], len - p);
|
||||||
|
} else {
|
||||||
|
while (*str) {
|
||||||
|
sbi_putc(*str);
|
||||||
|
str++;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
spin_unlock(&console_out_lock);
|
spin_unlock(&console_out_lock);
|
||||||
}
|
}
|
||||||
|
|
||||||
unsigned long sbi_nputs(const char *str, unsigned long len)
|
unsigned long sbi_nputs(const char *str, unsigned long len)
|
||||||
{
|
{
|
||||||
unsigned long i;
|
unsigned long i, ret;
|
||||||
|
|
||||||
spin_lock(&console_out_lock);
|
spin_lock(&console_out_lock);
|
||||||
for (i = 0; i < len; i++)
|
if (console_dev && console_dev->console_puts) {
|
||||||
sbi_putc(str[i]);
|
ret = console_dev->console_puts(str, len);
|
||||||
|
} else {
|
||||||
|
for (i = 0; i < len; i++)
|
||||||
|
sbi_putc(str[i]);
|
||||||
|
ret = len;
|
||||||
|
}
|
||||||
spin_unlock(&console_out_lock);
|
spin_unlock(&console_out_lock);
|
||||||
|
|
||||||
return i;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
void sbi_gets(char *s, int maxwidth, char endchar)
|
void sbi_gets(char *s, int maxwidth, char endchar)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue