[PATCH 1/2] terminal: correct stdio_dev invocations
Asherah Connor
ashe at kivikakk.ee
Wed Mar 10 12:39:23 CET 2021
stdio_dev methods have taken a pointer to themselves since 709ea543
(nearly 7 years ago).
Signed-off-by: Asherah Connor <ashe at kivikakk.ee>
---
cmd/terminal.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/cmd/terminal.c b/cmd/terminal.c
index f6e4d2539e..733701e059 100644
--- a/cmd/terminal.c
+++ b/cmd/terminal.c
@@ -33,8 +33,8 @@ int do_terminal(struct cmd_tbl *cmd, int flag, int argc, char *const argv[])
int c;
/* read from console and display on serial port */
- if (stdio_devices[0]->tstc()) {
- c = stdio_devices[0]->getc();
+ if (stdio_devices[0]->tstc(stdio_devices[0])) {
+ c = stdio_devices[0]->getc(stdio_devices[0]);
if (last_tilde == 1) {
if (c == '.') {
putc(c);
@@ -43,7 +43,7 @@ int do_terminal(struct cmd_tbl *cmd, int flag, int argc, char *const argv[])
} else {
last_tilde = 0;
/* write the delayed tilde */
- dev->putc('~');
+ dev->putc(dev, '~');
/* fall-through to print current
* character */
}
@@ -53,12 +53,12 @@ int do_terminal(struct cmd_tbl *cmd, int flag, int argc, char *const argv[])
puts("[u-boot]");
putc(c);
}
- dev->putc(c);
+ dev->putc(dev, c);
}
/* read from serial port and display on console */
- if (dev->tstc()) {
- c = dev->getc();
+ if (dev->tstc(dev)) {
+ c = dev->getc(dev);
putc(c);
}
}
--
2.20.1
More information about the U-Boot
mailing list