Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb1c2abb authored by Michael Ellerman's avatar Michael Ellerman Committed by Benjamin Herrenschmidt
Browse files

powerpc/xmon: Remove unused xmon_expect() & xmon_read_poll() 



It looks like xmon_expect() was used for doing xmon over a modem (!?),
that code was dropped in 2005 in commit 51d3082f "Unify udbg (#2)".

Once xmon_expect() is gone xmon_read_poll() is unused, drop it too.

Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 6432200a

arch/powerpc/xmon/nonstdio.c

+0 −27
Original line number Diff line number Diff line
@@ -23,33 +23,6 @@ static char line[256]; 
static char *lineptr;

static int lineleft;



int xmon_expect(const char *str, unsigned long timeout)

{

	int c;

	unsigned long t0;



	/* assume 25MHz default timebase if tb_ticks_per_sec not set yet */

	timeout *= tb_ticks_per_sec? tb_ticks_per_sec: 25000000;

	t0 = get_tbl();

	do {

		lineptr = line;

		for (;;) {

			c = xmon_read_poll();

			if (c == -1) {

				if (get_tbl() - t0 > timeout)

					return 0;

				continue;

			}

			if (c == '\n')

				break;

			if (c != '\r' && lineptr < &line[sizeof(line) - 1])

				*lineptr++ = c;

		}

		*lineptr = 0;

	} while (strstr(line, str) == NULL);

	return 1;

}



int xmon_getchar(void)

{

	int c;

arch/powerpc/xmon/nonstdio.h

+0 −2
Original line number Diff line number Diff line
@@ -9,7 +9,5 @@ extern void xmon_puts(const char *); 
extern char *xmon_gets(char *, int);

extern void xmon_printf(const char *, ...);

extern void xmon_map_scc(void);

extern int xmon_expect(const char *str, unsigned long timeout);

extern int xmon_write(const void *ptr, int nb);

extern int xmon_readchar(void);
 
extern int xmon_read_poll(void);

arch/powerpc/xmon/start.c

+0 −7
Original line number Diff line number Diff line
@@ -25,10 +25,3 @@ int xmon_readchar(void) 
		return udbg_getc();

	return -1;

}
 


int xmon_read_poll(void)

{

	if (udbg_getc_poll)

		return udbg_getc_poll();

	return -1;

}