diff options
author | phk <phk@FreeBSD.org> | 2006-01-04 09:46:20 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 2006-01-04 09:46:20 +0000 |
commit | 44d6de75f9eb511d1fb49fbc4e960cde63ef48f5 (patch) | |
tree | a52e228ccc2f1778946b7c5ba2e0d902ce05ac2e | |
parent | 990533856ec969bb87b18b54c27c93aa376a6017 (diff) | |
download | FreeBSD-src-44d6de75f9eb511d1fb49fbc4e960cde63ef48f5.zip FreeBSD-src-44d6de75f9eb511d1fb49fbc4e960cde63ef48f5.tar.gz |
Use ttyalloc() instead of ttymalloc()
-rw-r--r-- | sys/i386/isa/pcvt/pcvt_drv.c | 4 | ||||
-rw-r--r-- | sys/i386/xbox/xboxfb.c | 3 | ||||
-rw-r--r-- | sys/ia64/ia64/ssc.c | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/sys/i386/isa/pcvt/pcvt_drv.c b/sys/i386/isa/pcvt/pcvt_drv.c index 465067e..00bb30f 100644 --- a/sys/i386/isa/pcvt/pcvt_drv.c +++ b/sys/i386/isa/pcvt/pcvt_drv.c @@ -257,7 +257,7 @@ pcvt_attach(device_t dev) for(i = 0; i < totalscreens; i++) { - pcvt_tty[i] = ttymalloc(pcvt_tty[i]); + pcvt_tty[i] = ttyalloc(); vs[i].vs_tty = pcvt_tty[i]; make_dev(&vt_cdevsw, i, UID_ROOT, GID_WHEEL, 0600, "ttyv%r", i); } @@ -644,7 +644,7 @@ pcvt_cn_probe(struct consdev *cp) sprintf(cp->cn_name, "ttyv%r", 0); cp->cn_pri = CN_INTERNAL; - pcvt_tty[0] = ttymalloc(pcvt_tty[0]); + pcvt_tty[0] = ttyalloc(); cp->cn_tp = pcvt_tty[0]; } diff --git a/sys/i386/xbox/xboxfb.c b/sys/i386/xbox/xboxfb.c index 6271b8a..3537491 100644 --- a/sys/i386/xbox/xboxfb.c +++ b/sys/i386/xbox/xboxfb.c @@ -322,6 +322,7 @@ xboxfb_drvinit (void* unused) /* probe for a keyboard */ xboxfb_timer (NULL); + xboxfb_tp = ttyalloc(); } static void @@ -361,7 +362,7 @@ xboxfb_dev_open(struct cdev* dev, int flag, int mode, struct thread* td) { struct tty* tp; - tp = xboxfb_tp = dev->si_tty = ttymalloc (xboxfb_tp); + tp = dev->si_tty = xboxfb_tp; tp->t_oproc = xboxfb_tty_start; tp->t_param = xboxfb_tty_param; diff --git a/sys/ia64/ia64/ssc.c b/sys/ia64/ia64/ssc.c index f2da792..5d03b28 100644 --- a/sys/ia64/ia64/ssc.c +++ b/sys/ia64/ia64/ssc.c @@ -102,7 +102,9 @@ static void ssccnattach(void *arg) { make_dev(&ssc_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "ssccons"); + ssc_tp = ttyalloc(); } + SYSINIT(ssccnattach, SI_SUB_DRIVERS, SI_ORDER_ANY, ssccnattach, 0); static void @@ -139,7 +141,7 @@ sscopen(struct cdev *dev, int flag, int mode, struct thread *td) int s; int error = 0, setuptimeout = 0; - tp = ssc_tp = dev->si_tty = ttymalloc(ssc_tp); + tp = dev->si_tty = ssc_tp; s = spltty(); tp->t_oproc = sscstart; |