aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/powerpc/xmon/nonstdio.c27
-rw-r--r--arch/powerpc/xmon/nonstdio.h2
-rw-r--r--arch/powerpc/xmon/start.c7
3 files changed, 0 insertions, 36 deletions
diff --git a/arch/powerpc/xmon/nonstdio.c b/arch/powerpc/xmon/nonstdio.c
index bfac84fbe780..a225d8046652 100644
--- a/arch/powerpc/xmon/nonstdio.c
+++ b/arch/powerpc/xmon/nonstdio.c
@@ -23,33 +23,6 @@ static char line[256];
23static char *lineptr; 23static char *lineptr;
24static int lineleft; 24static int lineleft;
25 25
26int xmon_expect(const char *str, unsigned long timeout)
27{
28 int c;
29 unsigned long t0;
30
31 /* assume 25MHz default timebase if tb_ticks_per_sec not set yet */
32 timeout *= tb_ticks_per_sec? tb_ticks_per_sec: 25000000;
33 t0 = get_tbl();
34 do {
35 lineptr = line;
36 for (;;) {
37 c = xmon_read_poll();
38 if (c == -1) {
39 if (get_tbl() - t0 > timeout)
40 return 0;
41 continue;
42 }
43 if (c == '\n')
44 break;
45 if (c != '\r' && lineptr < &line[sizeof(line) - 1])
46 *lineptr++ = c;
47 }
48 *lineptr = 0;
49 } while (strstr(line, str) == NULL);
50 return 1;
51}
52
53int xmon_getchar(void) 26int xmon_getchar(void)
54{ 27{
55 int c; 28 int c;
diff --git a/arch/powerpc/xmon/nonstdio.h b/arch/powerpc/xmon/nonstdio.h
index 23dd95f4599c..d8cec38ec528 100644
--- a/arch/powerpc/xmon/nonstdio.h
+++ b/arch/powerpc/xmon/nonstdio.h
@@ -9,7 +9,5 @@ extern void xmon_puts(const char *);
9extern char *xmon_gets(char *, int); 9extern char *xmon_gets(char *, int);
10extern void xmon_printf(const char *, ...); 10extern void xmon_printf(const char *, ...);
11extern void xmon_map_scc(void); 11extern void xmon_map_scc(void);
12extern int xmon_expect(const char *str, unsigned long timeout);
13extern int xmon_write(const void *ptr, int nb); 12extern int xmon_write(const void *ptr, int nb);
14extern int xmon_readchar(void); 13extern int xmon_readchar(void);
15extern int xmon_read_poll(void);
diff --git a/arch/powerpc/xmon/start.c b/arch/powerpc/xmon/start.c
index 8864de2af382..84f3a155eb48 100644
--- a/arch/powerpc/xmon/start.c
+++ b/arch/powerpc/xmon/start.c
@@ -25,10 +25,3 @@ int xmon_readchar(void)
25 return udbg_getc(); 25 return udbg_getc();
26 return -1; 26 return -1;
27} 27}
28
29int xmon_read_poll(void)
30{
31 if (udbg_getc_poll)
32 return udbg_getc_poll();
33 return -1;
34}