33c33
< __FBSDID("$FreeBSD: head/sys/dev/syscons/syscons.c 189596 2009-03-09 19:46:19Z ed $");
---
> __FBSDID("$FreeBSD: head/sys/dev/syscons/syscons.c 189617 2009-03-10 11:28:54Z ed $");
98,102d97
< static default_attr kernel_default = {
< SC_KERNEL_CONS_ATTR,
< SC_KERNEL_CONS_REV_ATTR,
< };
<
107d101
< static void *kernel_console_ts;
326c320
< sc_puts(scp, buf, len);
---
> sc_puts(scp, buf, len, 0);
376,390d369
<
< scinit(unit, flags);
<
< if (sc_console->tsw->te_size > 0) {
< /* assert(sc_console->ts != NULL); */
< kernel_console_ts = sc_console->ts;
< sc_console->ts = malloc(sc_console->tsw->te_size,
< M_DEVBUF, M_WAITOK);
< bcopy(kernel_console_ts, sc_console->ts, sc_console->tsw->te_size);
< (*sc_console->tsw->te_default_attr)(sc_console,
< user_default.std_color,
< user_default.rev_color);
< }
< } else {
< scinit(unit, flags);
391a371
> scinit(unit, flags);
1510d1489
< void *save;
1546,1548d1524
< save = scp->ts;
< if (kernel_console_ts != NULL)
< scp->ts = kernel_console_ts;
1550,1551c1526
< sc_puts(scp, buf, 1);
< scp->ts = save;
---
> sc_puts(scp, buf, 1, 1);
2495c2470
< sc_puts(scr_stat *scp, u_char *buf, int len)
---
> sc_puts(scr_stat *scp, u_char *buf, int len, int kernel)
2510c2485
< (*scp->tsw->te_puts)(scp, buf, len);
---
> (*scp->tsw->te_puts)(scp, buf, len, kernel);
2757,2758c2732,2733
< kernel_default.std_color,
< kernel_default.rev_color);
---
> user_default.std_color,
> user_default.rev_color);