mirror of
https://github.com/freebsd/freebsd-src
synced 2024-10-16 21:34:10 +00:00
Backout rev 183181. It appears that I should have been using boot-device
of "cd:,\\:tbxi" with properly configured boot.tbxi, instead of booting \boot\loader directly. Rev 183168 could probably stay, since it can be viewed as an anti-foot-shooting measure and has no impact on normal operation. I can revert it as well, if anybody objects.
This commit is contained in:
parent
f93ed32a82
commit
d221204d90
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=183198
|
@ -14,7 +14,7 @@ CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../../.. -I.
|
|||
|
||||
CFLAGS+= -ffreestanding
|
||||
.if ${MACHINE_ARCH} == "powerpc"
|
||||
CFLAGS+= -msoft-float -DPOWERMAC_SCREEN_HACK
|
||||
CFLAGS+= -msoft-float
|
||||
.endif
|
||||
|
||||
.ifdef(BOOT_DISK_DEBUG)
|
||||
|
|
|
@ -42,10 +42,6 @@ int ofw_cons_poll(void);
|
|||
|
||||
static ihandle_t stdin;
|
||||
static ihandle_t stdout;
|
||||
#ifdef POWERMAC_SCREEN_HACK
|
||||
static ihandle_t stdout1;
|
||||
static int do_stdout1 = 0;
|
||||
#endif
|
||||
|
||||
struct console ofwconsole = {
|
||||
"ofw",
|
||||
|
@ -61,26 +57,9 @@ struct console ofwconsole = {
|
|||
static void
|
||||
ofw_cons_probe(struct console *cp)
|
||||
{
|
||||
#ifdef POWERMAC_SCREEN_HACK
|
||||
char path1[128], path2[128];
|
||||
#endif
|
||||
|
||||
OF_getprop(chosen, "stdin", &stdin, sizeof(stdin));
|
||||
OF_getprop(chosen, "stdout", &stdout, sizeof(stdout));
|
||||
#ifdef POWERMAC_SCREEN_HACK
|
||||
stdout1 = OF_open("screen");
|
||||
if (stdout1 != -1) {
|
||||
if (OF_instance_to_path(stdout, path1, sizeof(path1)) == -1)
|
||||
path1[0] = '\0';
|
||||
if (OF_instance_to_path(stdout1, path2, sizeof(path2)) == -1)
|
||||
path2[0] = '\0';
|
||||
if (strcmp(path1, path2) == 0) {
|
||||
OF_close(stdout1);
|
||||
} else {
|
||||
do_stdout1 = 1;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
cp->c_flags |= C_PRESENTIN|C_PRESENTOUT;
|
||||
}
|
||||
|
||||
|
@ -98,18 +77,10 @@ ofw_cons_putchar(int c)
|
|||
if (c == '\n') {
|
||||
cbuf = '\r';
|
||||
OF_write(stdout, &cbuf, 1);
|
||||
#ifdef POWERMAC_SCREEN_HACK
|
||||
if (do_stdout1 != 0)
|
||||
OF_write(stdout1, &cbuf, 1);
|
||||
#endif
|
||||
}
|
||||
|
||||
cbuf = c;
|
||||
OF_write(stdout, &cbuf, 1);
|
||||
#ifdef POWERMAC_SCREEN_HACK
|
||||
if (do_stdout1 != 0)
|
||||
OF_write(stdout1, &cbuf, 1);
|
||||
#endif
|
||||
}
|
||||
|
||||
static int saved_char = -1;
|
||||
|
|
Loading…
Reference in a new issue