4d404edce3
In some configuration, xmon help string is larger than xmon_printf buffer. We need not to use printf. This patch adds xmon_puts and change to use it to show help string. Signed-off-by: Kou Ishizaki <kou.ishizaki@toshiba.co.jp> Signed-off-by: Paul Mackerras <paulus@samba.org>
139 lines
2.5 KiB
C
139 lines
2.5 KiB
C
/*
|
|
* Copyright (C) 1996-2005 Paul Mackerras.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version
|
|
* 2 of the License, or (at your option) any later version.
|
|
*/
|
|
#include <linux/string.h>
|
|
#include <asm/time.h>
|
|
#include "nonstdio.h"
|
|
|
|
int xmon_putchar(int c)
|
|
{
|
|
char ch = c;
|
|
|
|
if (c == '\n')
|
|
xmon_putchar('\r');
|
|
return xmon_write(&ch, 1) == 1? c: -1;
|
|
}
|
|
|
|
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;
|
|
|
|
if (lineleft == 0) {
|
|
lineptr = line;
|
|
for (;;) {
|
|
c = xmon_readchar();
|
|
if (c == -1 || c == 4)
|
|
break;
|
|
if (c == '\r' || c == '\n') {
|
|
*lineptr++ = '\n';
|
|
xmon_putchar('\n');
|
|
break;
|
|
}
|
|
switch (c) {
|
|
case 0177:
|
|
case '\b':
|
|
if (lineptr > line) {
|
|
xmon_putchar('\b');
|
|
xmon_putchar(' ');
|
|
xmon_putchar('\b');
|
|
--lineptr;
|
|
}
|
|
break;
|
|
case 'U' & 0x1F:
|
|
while (lineptr > line) {
|
|
xmon_putchar('\b');
|
|
xmon_putchar(' ');
|
|
xmon_putchar('\b');
|
|
--lineptr;
|
|
}
|
|
break;
|
|
default:
|
|
if (lineptr >= &line[sizeof(line) - 1])
|
|
xmon_putchar('\a');
|
|
else {
|
|
xmon_putchar(c);
|
|
*lineptr++ = c;
|
|
}
|
|
}
|
|
}
|
|
lineleft = lineptr - line;
|
|
lineptr = line;
|
|
}
|
|
if (lineleft == 0)
|
|
return -1;
|
|
--lineleft;
|
|
return *lineptr++;
|
|
}
|
|
|
|
char *xmon_gets(char *str, int nb)
|
|
{
|
|
char *p;
|
|
int c;
|
|
|
|
for (p = str; p < str + nb - 1; ) {
|
|
c = xmon_getchar();
|
|
if (c == -1) {
|
|
if (p == str)
|
|
return NULL;
|
|
break;
|
|
}
|
|
*p++ = c;
|
|
if (c == '\n')
|
|
break;
|
|
}
|
|
*p = 0;
|
|
return str;
|
|
}
|
|
|
|
void xmon_printf(const char *format, ...)
|
|
{
|
|
va_list args;
|
|
int n;
|
|
static char xmon_outbuf[1024];
|
|
|
|
va_start(args, format);
|
|
n = vsnprintf(xmon_outbuf, sizeof(xmon_outbuf), format, args);
|
|
va_end(args);
|
|
xmon_write(xmon_outbuf, n);
|
|
}
|
|
|
|
void xmon_puts(const char *str)
|
|
{
|
|
xmon_write(str, strlen(str));
|
|
}
|