9os

commit 6c9f8d77183b91462388bc44572c858b642ea19b
parent 4740cd137a4a385f29f383736173315b9e8b5597
Author: Roberto Vargas <roberto.vargas@arm.com>
Date:   Thu,  9 May 2019 10:46:37 +0100

Merge branch 'master' of ssh://gerrit.oss.arm.com/trusted-firmware/rcode

Change-Id: Id52dfc0288fa734a498ceb6b448674a0e65ebade

Diffstat:
M
drivers/devcons.c
 | 
6
+++++-
M
drivers/devfip.c
 | 
2
+-

2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/devcons.c b/drivers/devcons.c
@@ -313,7 +313,11 @@ fillbuffer(Chan *c)
 {
 	char ch;
 
-	while (head + 1 < sizeof(buffer) && (ch = kgetc(in)) != EOF) {
+	while (head + 1 < sizeof(buffer)) {
+		if (devtab[in->type]->read(in, &ch, 1) < 0) {
+			ch = EOF;
+			break;
+		}
 		buffer[head] = ch;
 		consreadediting(c);
 		if (buffer[head++] == '\n')
diff --git a/drivers/devfip.c b/drivers/devfip.c
@@ -124,7 +124,7 @@ fipgen(Chan *c, const Dirtab *tab, int ntab, int n, Dir *dir)
 	for (i = 0; i <= n; i++) {
 		if (fip->offset[i] == -1)
 			return 0;
-		if (devtab[nc.type]->devseek(&nc, off, KSEEK_SET) < 0)
+		if (devtab[nc.type]->seek(&nc, off, KSEEK_SET) < 0)
 			return -1;
 		if ((r = getntry(&nc, &ntry)) <= 0)
 			return r;