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

- Use a callout instead of the deprecated timeout_handle.

Browse Source 
- Set the console name always so that the bvm console device can be used
  via conscontrol even if it isn't chosen as the default console.
This commit is contained in:
jhb 2014-02-07 15:10:24 +00:00
parent 42c373842a
commit c82f5e592c
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/dev/bvm/bvm_console.c
View File

@ -58,8 +58,7 @@ static struct ttydevsw bvm_ttydevsw = {
}; };
static int polltime; static int polltime;
static struct callout_handle bvm_timeouthandle static struct callout bvm_timer;
= CALLOUT_HANDLE_INITIALIZER(&bvm_timeouthandle);
#if defined(KDB) #if defined(KDB)
static int alt_break_state; static int alt_break_state;
@ -107,9 +106,9 @@ cn_drvinit(void *unused)
{ {
struct tty *tp; struct tty *tp;
if (bvm_consdev.cn_pri != CN_DEAD && if (bvm_consdev.cn_pri != CN_DEAD) {
bvm_consdev.cn_name[0] != '\0') {
tp = tty_alloc(&bvm_ttydevsw, NULL); tp = tty_alloc(&bvm_ttydevsw, NULL);
callout_init_mtx(&bvm_timer, tty_getlock(tp), 0);
tty_makedev(tp, NULL, "bvmcons"); tty_makedev(tp, NULL, "bvmcons");
} }
} }
@ -120,7 +119,7 @@ bvm_tty_open(struct tty *tp)
polltime = hz / BVMCONS_POLL_HZ; polltime = hz / BVMCONS_POLL_HZ;
if (polltime < 1) if (polltime < 1)
polltime = 1; polltime = 1;
bvm_timeouthandle = timeout(bvm_timeout, tp, polltime); callout_reset(&bvm_timer, polltime, bvm_timeout, tp);
return (0); return (0);
} }
@ -129,8 +128,9 @@ static void
bvm_tty_close(struct tty *tp) bvm_tty_close(struct tty *tp)
{ {
/* XXX Should be replaced with callout_stop(9) */ tty_lock(tp);
untimeout(bvm_timeout, tp, bvm_timeouthandle); callout_stop(&bvm_timer);
tty_unlock(tp);
} }
static void static void
@ -158,13 +158,12 @@ bvm_timeout(void *v)
tp = (struct tty *)v; tp = (struct tty *)v;
tty_lock(tp); tty_lock_assert(tp, MA_OWNED);
while ((c = bvm_cngetc(NULL)) != -1) while ((c = bvm_cngetc(NULL)) != -1)
ttydisc_rint(tp, c, 0); ttydisc_rint(tp, c, 0);
ttydisc_rint_done(tp); ttydisc_rint_done(tp);
tty_unlock(tp);
bvm_timeouthandle = timeout(bvm_timeout, tp, polltime); callout_reset(&bvm_timer, polltime, bvm_timeout, tp);
} }
static void static void
@ -174,6 +173,7 @@ bvm_cnprobe(struct consdev *cp)
disabled = 0; disabled = 0;
cp->cn_pri = CN_DEAD; cp->cn_pri = CN_DEAD;
strcpy(cp->cn_name, "bvmcons");
resource_int_value("bvmconsole", 0, "disabled", &disabled); resource_int_value("bvmconsole", 0, "disabled", &disabled);
if (!disabled) { if (!disabled) {
@ -195,8 +195,6 @@ bvm_cninit(struct consdev *cp)
for (i = 0; i < strlen(bootmsg); i++) for (i = 0; i < strlen(bootmsg); i++)
bvm_cnputc(cp, bootmsg[i]); bvm_cnputc(cp, bootmsg[i]);
} }
strcpy(cp->cn_name, "bvmcons");
} }
static void static void