commit dbc2c68f17bf64f45f96ba2fa2cb7b09f6b73819
author Travis Geiselbrecht <geist@foobox.com> Sun Jun 28 12:18:39 2009 -0700
committer Ajay Dudani <adudani@codeaurora.org> Thu Jul 28 12:08:16 2011 -0700
tree 0b545a97371003a7cbed726b26637e96f31bd9f3
parent beb8d43aed959825f0d4a9d2d2d0af14c396a5d7

[platform] fix the dgetc signature problem

platform/armemu/debug.c

diff --git a/platform/armemu/debug.c b/platform/armemu/debug.c
index 09aabd5..9eea536 100644
--- a/platform/armemu/debug.c
+++ b/platform/armemu/debug.c
@@ -32,15 +32,21 @@
 	*REG8(DEBUG_STDOUT) = c;
 }
 
-int dgetc(char *c)
+int dgetc(char *c, bool wait)
 {
-	int8_t result = (int8_t)*REG8(DEBUG_STDIN);
+	for (;;) {
+		int8_t result = (int8_t)*REG8(DEBUG_STDIN);
 
-	if (result == -1)
-		return -1;
+		if (result == -1) {
+			if (wait)
+				continue;
+			else
+				return -1;
+		}
 
-	*c = (char)result;
-	return 0;
+		*c = (char)result;
+		return 0;
+	}
 }
 
 void debug_dump_regs(void)

platform/integrator/debug.c

diff --git a/platform/integrator/debug.c b/platform/integrator/debug.c
index 0a2e058..1aedf8b 100644
--- a/platform/integrator/debug.c
+++ b/platform/integrator/debug.c
@@ -98,7 +98,7 @@
 	uart_putc(0, c);
 }
 
-int dgetc(char *c)
+int dgetc(char *c, bool wait)
 {
 	int result = uart_getc(0, false);
 

platform/msm_shared/debug.c

diff --git a/platform/msm_shared/debug.c b/platform/msm_shared/debug.c
index 935d886..9adc4e4 100644
--- a/platform/msm_shared/debug.c
+++ b/platform/msm_shared/debug.c
@@ -55,7 +55,7 @@
 #endif
 }
 
-int dgetc(char *c)
+int dgetc(char *c, bool wait)
 {
 	int n;
 #if WITH_DEBUG_DCC

platform/omap3/debug.c

diff --git a/platform/omap3/debug.c b/platform/omap3/debug.c
index ac6300d..8ddf3b2 100644
--- a/platform/omap3/debug.c
+++ b/platform/omap3/debug.c
@@ -37,7 +37,7 @@
 	uart_putc(DEBUG_UART, c);
 }
 
-int dgetc(char *c)
+int dgetc(char *c, bool wait)
 {
 	int _c;