d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Create the "cfecons" tty directly using tty_makedev(). It is not clear what

Browse Source 
the intention of having two ttys pointing to the same cfe console device was.

Also we were not initializing the output[] array passed in as input to
tty_makedev() so one name of the ttys was garbage.

Fix the code that calls cfe_write() to deal with the case where only a partial
buffer is written out.

cfe_cngetc() needs to return if there is no character available as input.
If we don't do this then the cfe_timeout() function will spin forever
because cfe_cngetc() will only ever return if there is valid input.

Approved by: imp (mentor)
This commit is contained in:
Neel Natu 2010-01-26 03:42:34 +00:00
parent d87b96dd84
commit 61f7c762de
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/dev/cfe/cfe_console.c
View File

@ -84,14 +84,12 @@ CONSOLE_DRIVER(cfe);
static void static void
cn_drvinit(void *unused) cn_drvinit(void *unused)
{ {
char output[32];
struct tty *tp; struct tty *tp;
if (cfe_consdev.cn_pri != CN_DEAD && if (cfe_consdev.cn_pri != CN_DEAD &&
cfe_consdev.cn_name[0] != '\0') { cfe_consdev.cn_name[0] != '\0') {
tp = tty_alloc(&cfe_ttydevsw, NULL); tp = tty_alloc(&cfe_ttydevsw, NULL);
tty_makedev(tp, NULL, "%s", output); tty_makedev(tp, NULL, "cfecons");
tty_makealias(tp, "cfecons");
} }
} }
@ -117,15 +115,21 @@ cfe_tty_close(struct tty *tp)
static void static void
cfe_tty_outwakeup(struct tty *tp) cfe_tty_outwakeup(struct tty *tp)
{ {
int len; int len, written, rc;
u_char buf[CFEBURSTLEN]; u_char buf[CFEBURSTLEN];
for (;;) { for (;;) {
len = ttydisc_getc(tp, buf, sizeof buf); len = ttydisc_getc(tp, buf, sizeof buf);
if (len == 0) if (len == 0)
break; break;
while (cfe_write(conhandle, buf, len) == 0)
continue; written = 0;
while (written < len) {
rc = cfe_write(conhandle, &buf[written], len - written);
if (rc < 0)
break;
written += rc;
}
} }
} }
@ -184,13 +188,9 @@ cfe_cnterm(struct consdev *cp)
static int static int
cfe_cngetc(struct consdev *cp) cfe_cngetc(struct consdev *cp)
{ {
int result;
unsigned char ch; unsigned char ch;
while ((result = cfe_read(conhandle, &ch, 1)) == 0) if (cfe_read(conhandle, &ch, 1) == 1) {
continue;
if (result > 0) {
#if defined(KDB) && defined(ALT_BREAK_TO_DEBUGGER) #if defined(KDB) && defined(ALT_BREAK_TO_DEBUGGER)
int kdb_brk; int kdb_brk;