Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-16 17:44:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "refactor(console): move putchar() to console driver" into integration

Browse source
This commit is contained in:
Madhukar Pappireddy 2022-10-04 17:06:43 +02:00 • committed by TrustedFirmware Code Review
commit c19116dd61
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/console/multi_console.c
View file

@ -6,6 +6,7 @@
#include <assert.h>
#include <stddef.h>
#include <stdlib.h>
#include <drivers/console.h>
@ -96,10 +97,17 @@ int console_putc(int c)
if ((err == ERROR_NO_VALID_CONSOLE) || (ret < err))
err = ret;
}
return err;
}
int putchar(int c)
{
if (console_putc(c) == 0)
return c;
else
return EOF;
}
int console_getc(void)
{
int err = ERROR_NO_VALID_CONSOLE;

14
lib/libc/putchar.c
View file

@ -6,15 +6,9 @@
#include <stdio.h>
#include <drivers/console.h>
int putchar(int c)
int __putchar(int c)
{
int res;
if (console_putc((unsigned char)c) >= 0)
res = c;
else
res = EOF;
return res;
return c;
}
int putchar(int c) __attribute__((weak,alias("__putchar")));