31c31
< __FBSDID("$FreeBSD: user/ed/newcons/sys/kern/subr_terminal.c 243802 2012-12-02 22:21:40Z nwhitehorn $");
---
> __FBSDID("$FreeBSD: user/ed/newcons/sys/kern/subr_terminal.c 256143 2013-10-08 12:01:17Z ray $");
143d142
<
406,410c405,411
< static cn_probe_t termcn_probe;
< static cn_init_t termcn_init;
< static cn_term_t termcn_term;
< static cn_getc_t termcn_getc;
< static cn_putc_t termcn_putc;
---
> static cn_probe_t termcn_cnprobe;
> static cn_init_t termcn_cninit;
> static cn_term_t termcn_cnterm;
> static cn_getc_t termcn_cngetc;
> static cn_putc_t termcn_cnputc;
> static cn_grab_t termcn_cngrab;
> static cn_ungrab_t termcn_cnungrab;
412,417c413,420
< const struct consdev_ops termcn_ops = {
< .cn_probe = termcn_probe,
< .cn_init = termcn_init,
< .cn_term = termcn_term,
< .cn_getc = termcn_getc,
< .cn_putc = termcn_putc,
---
> const struct consdev_ops termcn_cnops = {
> .cn_probe = termcn_cnprobe,
> .cn_init = termcn_cninit,
> .cn_term = termcn_cnterm,
> .cn_getc = termcn_cngetc,
> .cn_putc = termcn_cnputc,
> .cn_grab = termcn_cngrab,
> .cn_ungrab = termcn_cnungrab,
419a423,446
> void
> termcn_cnregister(struct terminal *tm)
> {
> struct consdev *cp;
>
> cp = tm->consdev;
> if (cp == NULL) {
> cp = malloc(sizeof(struct consdev), M_TERMINAL,
> M_WAITOK|M_ZERO);
> cp->cn_ops = &termcn_cnops;
> cp->cn_arg = tm;
> cp->cn_pri = CN_INTERNAL;
> sprintf(cp->cn_name, "ttyv0");
>
> tm->tm_flags = TF_CONS;
> tm->consdev = cp;
>
> terminal_init(tm);
> }
>
> /* Attach terminal as console. */
> cnadd(cp);
> }
>
421c448
< termcn_probe(struct consdev *cp)
---
> termcn_cngrab(struct consdev *cp)
422a450,461
>
> }
>
> static void
> termcn_cnungrab(struct consdev *cp)
> {
>
> }
>
> static void
> termcn_cnprobe(struct consdev *cp)
> {
424a464,469
> if (tm == NULL) {
> cp->cn_pri = CN_DEAD;
> return;
> }
>
> tm->consdev = cp;
431c476
< termcn_init(struct consdev *cp)
---
> termcn_cninit(struct consdev *cp)
432a478
>
436c482
< termcn_term(struct consdev *cp)
---
> termcn_cnterm(struct consdev *cp)
437a484
>
441c488
< termcn_getc(struct consdev *cp)
---
> termcn_cngetc(struct consdev *cp)
449c496
< termcn_putc(struct consdev *cp, int c)
---
> termcn_cnputc(struct consdev *cp, int c)