From 01f8f60cf06e180b2b5eb96ceb162473c0cb196a Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Thu, 14 Apr 2016 08:48:59 +0200 Subject: stdio: rename getc to getchar The function we have implemented as getc has the semantics of the standard function getchar, so rename it accorgingly. Signed-off-by: Sascha Hauer --- common/console.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'common/console.c') diff --git a/common/console.c b/common/console.c index f0988b8bc0..37574b9b01 100644 --- a/common/console.c +++ b/common/console.c @@ -164,7 +164,7 @@ int console_set_baudrate(struct console_device *cdev, unsigned baudrate) if (cdev->f_active) { mdelay(50); do { - c = getc(); + c = getchar(); } while (c != '\r' && c != '\n'); } @@ -345,7 +345,7 @@ static int tstc_raw(void) return 0; } -int getc(void) +int getchar(void) { unsigned char ch; uint64_t start; @@ -380,14 +380,14 @@ int getc(void) return ch; } -EXPORT_SYMBOL(getc); +EXPORT_SYMBOL(getchar); int fgetc(int fd) { char c; if (!fd) - return getc(); + return getchar(); return read(fd, &c, 1); } EXPORT_SYMBOL(fgetc); @@ -476,7 +476,7 @@ int ctrlc (void) { poller_call(); - if (tstc() && getc() == 3) + if (tstc() && getchar() == 3) return 1; return 0; } -- cgit v1.2.3