Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Rename ttymalloc() to tty_alloc(), and ttyfree() to tty_...
details: https://anonhg.NetBSD.org/src/rev/1b5d274e2b3f
branches: trunk
changeset: 764457:1b5d274e2b3f
user: rmind <rmind%NetBSD.org@localhost>
date: Sun Apr 24 16:26:51 2011 +0000
description:
Rename ttymalloc() to tty_alloc(), and ttyfree() to tty_free() for
consistency. Remove some unnecessary malloc.h inclusions as well.
diffstat:
sys/arch/alpha/a12/a12dc.c | 13 ++++++-------
sys/arch/alpha/alpha/promcons.c | 6 +++---
sys/arch/amiga/dev/ite.c | 6 +++---
sys/arch/amiga/dev/mfc.c | 9 ++++-----
sys/arch/amiga/dev/msc.c | 7 +++----
sys/arch/amiga/dev/ser.c | 9 ++++-----
sys/arch/arc/dev/pccons.c | 8 ++++----
sys/arch/arm/at91/at91dbgu.c | 8 ++++----
sys/arch/arm/at91/at91usart.c | 9 ++++-----
sys/arch/arm/ep93xx/epcom.c | 6 +++---
sys/arch/arm/footbridge/footbridge_com.c | 6 +++---
sys/arch/arm/imx/imxuart.c | 10 +++++-----
sys/arch/arm/ixp12x0/ixp12x0_com.c | 6 +++---
sys/arch/arm/s3c2xx0/sscom.c | 8 +++-----
sys/arch/arm/sa11x0/sa11x0_com.c | 8 ++++----
sys/arch/atari/dev/ite.c | 6 +++---
sys/arch/atari/dev/ser.c | 6 +++---
sys/arch/atari/dev/zs.c | 6 +++---
sys/arch/emips/ebus/dz_ebus.c | 10 +++++-----
sys/arch/evbarm/dev/plcom.c | 8 ++++----
sys/arch/evbppc/virtex/dev/xlcom.c | 6 +++---
sys/arch/hp300/dev/dcm.c | 8 ++++----
sys/arch/hp700/dev/pdc.c | 13 ++++++++-----
sys/arch/hpcmips/tx/txcom.c | 6 +++---
sys/arch/luna68k/dev/siotty.c | 8 ++++----
sys/arch/macppc/dev/ofcons.c | 6 +++---
sys/arch/mips/adm5120/dev/uart.c | 6 +++---
sys/arch/mips/sibyte/dev/sbjcn.c | 6 +++---
sys/arch/mips/sibyte/dev/sbscn.c | 6 +++---
sys/arch/sgimips/dev/scn.c | 8 ++++----
sys/arch/sh3/dev/sci.c | 6 +++---
sys/arch/sh3/dev/scif.c | 6 +++---
sys/arch/sparc/dev/kd.c | 6 +++---
sys/arch/sparc64/dev/kd.c | 6 +++---
sys/arch/sparc64/dev/pcons.c | 6 +++---
sys/arch/sparc64/dev/sab.c | 6 +++---
sys/arch/sun2/dev/kd.c | 6 +++---
sys/arch/sun2/dev/pcons.c | 6 +++---
sys/arch/sun3/dev/kd.c | 6 +++---
sys/arch/vax/vax/gencons.c | 6 +++---
sys/arch/x68k/dev/com.c | 8 ++++----
sys/arch/x68k/dev/ite.c | 8 ++++----
sys/arch/xen/xen/xencons.c | 8 ++++----
sys/dev/arcbios/arcbios_tty.c | 6 +++---
sys/dev/dec/dz.c | 6 +++---
sys/dev/ic/cd18xx.c | 6 +++---
sys/dev/ic/clmpcc.c | 6 +++---
sys/dev/ic/com.c | 10 +++++-----
sys/dev/ic/cy.c | 6 +++---
sys/dev/ic/z8530tty.c | 6 +++---
sys/dev/marvell/gtmpsc.c | 6 +++---
sys/dev/nullcons_subr.c | 6 +++---
sys/dev/ofw/ofcons.c | 6 +++---
sys/dev/pci/cz.c | 6 +++---
sys/dev/qbus/dhu.c | 7 ++++---
sys/dev/qbus/dl.c | 6 +++---
sys/dev/qbus/qd.c | 6 +++---
sys/dev/sbus/magma.c | 10 ++++++----
sys/dev/sbus/spif.c | 6 +++---
sys/dev/usb/ucom.c | 8 ++++----
sys/dev/usb/ucycom.c | 8 ++++----
sys/dev/usb/uhso.c | 8 ++++----
sys/dev/wscons/wsdisplay.c | 8 ++++----
sys/kern/tty.c | 22 ++++++++++++----------
sys/kern/tty_pty.c | 8 ++++----
sys/sys/tty.h | 6 +++---
66 files changed, 243 insertions(+), 242 deletions(-)
diffs (truncated from 2071 to 300 lines):
diff -r 3ec3f36901f2 -r 1b5d274e2b3f sys/arch/alpha/a12/a12dc.c
--- a/sys/arch/alpha/a12/a12dc.c Sun Apr 24 14:09:39 2011 +0000
+++ b/sys/arch/alpha/a12/a12dc.c Sun Apr 24 16:26:51 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: a12dc.c,v 1.24 2009/11/21 05:35:40 rmind Exp $ */
+/* $NetBSD: a12dc.c,v 1.25 2011/04/24 16:26:52 rmind Exp $ */
/* [Notice revision 2.2]
* Copyright (c) 1997, 1998 Avalon Computer Systems, Inc.
@@ -64,12 +64,11 @@
#ifndef BSIDE
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: a12dc.c,v 1.24 2009/11/21 05:35:40 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: a12dc.c,v 1.25 2011/04/24 16:26:52 rmind Exp $");
#include <sys/types.h>
#include <sys/param.h>
#include <sys/systm.h>
-#include <sys/malloc.h>
#include <sys/tty.h>
#include <sys/proc.h>
@@ -158,9 +157,9 @@
/* note that we've attached the chipset; can't have 2 A12Cs. */
a12dcfound = 1;
- printf(": driver %s\n", "$Revision: 1.24 $");
+ printf(": driver %s\n", "$Revision: 1.25 $");
- tp = a12dc_tty[0] = ttymalloc();
+ tp = a12dc_tty[0] = tty_alloc();
tp->t_oproc = a12dcstart;
tp->t_param = a12dcparam;
tty_attach(tp);
@@ -170,7 +169,7 @@
}
void
-a12dc_init(struct a12dc_config *ccp, int mallocsafe)
+a12dc_init(struct a12dc_config *ccp, int sleepsafe)
{
}
@@ -269,7 +268,7 @@
#endif
if (!a12dc_tty[unit]) {
- tp = a12dc_tty[unit] = ttymalloc();
+ tp = a12dc_tty[unit] = tty_alloc();
tty_attach(tp);
} else
tp = a12dc_tty[unit];
diff -r 3ec3f36901f2 -r 1b5d274e2b3f sys/arch/alpha/alpha/promcons.c
--- a/sys/arch/alpha/alpha/promcons.c Sun Apr 24 14:09:39 2011 +0000
+++ b/sys/arch/alpha/alpha/promcons.c Sun Apr 24 16:26:51 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: promcons.c,v 1.35 2009/11/21 05:35:40 rmind Exp $ */
+/* $NetBSD: promcons.c,v 1.36 2011/04/24 16:26:52 rmind Exp $ */
/*
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: promcons.c,v 1.35 2009/11/21 05:35:40 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: promcons.c,v 1.36 2011/04/24 16:26:52 rmind Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -98,7 +98,7 @@
s = spltty();
if (!prom_tty[unit]) {
- tp = prom_tty[unit] = ttymalloc();
+ tp = prom_tty[unit] = tty_alloc();
tty_attach(tp);
} else
tp = prom_tty[unit];
diff -r 3ec3f36901f2 -r 1b5d274e2b3f sys/arch/amiga/dev/ite.c
--- a/sys/arch/amiga/dev/ite.c Sun Apr 24 14:09:39 2011 +0000
+++ b/sys/arch/amiga/dev/ite.c Sun Apr 24 16:26:51 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ite.c,v 1.91 2011/02/08 20:20:08 rmind Exp $ */
+/* $NetBSD: ite.c,v 1.92 2011/04/24 16:26:52 rmind Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -46,7 +46,7 @@
#include "opt_ddb.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.91 2011/02/08 20:20:08 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ite.c,v 1.92 2011/04/24 16:26:52 rmind Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -426,7 +426,7 @@
return ENXIO;
if (ip->tp == NULL) {
- tp = ip->tp = ttymalloc();
+ tp = ip->tp = tty_alloc();
tty_attach(tp);
} else
tp = ip->tp;
diff -r 3ec3f36901f2 -r 1b5d274e2b3f sys/arch/amiga/dev/mfc.c
--- a/sys/arch/amiga/dev/mfc.c Sun Apr 24 14:09:39 2011 +0000
+++ b/sys/arch/amiga/dev/mfc.c Sun Apr 24 16:26:51 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: mfc.c,v 1.53 2009/10/26 19:16:54 cegger Exp $ */
+/* $NetBSD: mfc.c,v 1.54 2011/04/24 16:26:52 rmind Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -55,7 +55,7 @@
#include "opt_kgdb.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mfc.c,v 1.53 2009/10/26 19:16:54 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mfc.c,v 1.54 2011/04/24 16:26:52 rmind Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -64,7 +64,6 @@
#include <sys/tty.h>
#include <sys/proc.h>
#include <sys/file.h>
-#include <sys/malloc.h>
#include <sys/uio.h>
#include <sys/syslog.h>
#include <sys/queue.h>
@@ -490,7 +489,7 @@
if (sc->sc_tty)
tp = sc->sc_tty;
else {
- tp = sc->sc_tty = ttymalloc();
+ tp = sc->sc_tty = tty_alloc();
tty_attach(tp);
}
@@ -603,7 +602,7 @@
#if not_yet
if (tp != &mfcs_cons) {
remove_vbl_function(&sc->vbl_node);
- ttyfree(tp);
+ tty_free(tp);
sc->sc_tty = (struct tty *) NULL;
}
#endif
diff -r 3ec3f36901f2 -r 1b5d274e2b3f sys/arch/amiga/dev/msc.c
--- a/sys/arch/amiga/dev/msc.c Sun Apr 24 14:09:39 2011 +0000
+++ b/sys/arch/amiga/dev/msc.c Sun Apr 24 16:26:51 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: msc.c,v 1.42 2010/05/25 02:21:30 jklos Exp $ */
+/* $NetBSD: msc.c,v 1.43 2011/04/24 16:26:52 rmind Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -93,7 +93,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: msc.c,v 1.42 2010/05/25 02:21:30 jklos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msc.c,v 1.43 2011/04/24 16:26:52 rmind Exp $");
#include "msc.h"
@@ -104,7 +104,6 @@
#include <sys/tty.h>
#include <sys/proc.h>
#include <sys/file.h>
-#include <sys/malloc.h>
#include <sys/uio.h>
#include <sys/kernel.h>
#include <sys/syslog.h>
@@ -348,7 +347,7 @@
if (!msc_tty[ttyn]) {
- tp = ttymalloc();
+ tp = tty_alloc();
tty_attach(tp);
msc_tty[ttyn] = tp;
msc_tty[ttyn+1] = (struct tty *)NULL;
diff -r 3ec3f36901f2 -r 1b5d274e2b3f sys/arch/amiga/dev/ser.c
--- a/sys/arch/amiga/dev/ser.c Sun Apr 24 14:09:39 2011 +0000
+++ b/sys/arch/amiga/dev/ser.c Sun Apr 24 16:26:51 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ser.c,v 1.78 2008/06/11 12:59:10 tsutsui Exp $ */
+/* $NetBSD: ser.c,v 1.79 2011/04/24 16:26:52 rmind Exp $ */
/*
* Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
@@ -40,7 +40,7 @@
#include "opt_kgdb.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ser.c,v 1.78 2008/06/11 12:59:10 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ser.c,v 1.79 2011/04/24 16:26:52 rmind Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -49,7 +49,6 @@
#include <sys/tty.h>
#include <sys/proc.h>
#include <sys/file.h>
-#include <sys/malloc.h>
#include <sys/uio.h>
#include <sys/kernel.h>
#include <sys/syslog.h>
@@ -257,7 +256,7 @@
if (0 == serconsole)
serconsinit = 0;
- tp = ttymalloc();
+ tp = tty_alloc();
tp->t_oproc = (void (*) (struct tty *)) serstart;
tp->t_param = serparam;
tp->t_hwiflow = serhwiflow;
@@ -419,7 +418,7 @@
#if not_yet
if (tp != &ser_cons) {
remove_vbl_function(&ser_vbl_node);
- ttyfree(tp);
+ tty_free(tp);
ser_tty = (struct tty *) NULL;
}
#endif
diff -r 3ec3f36901f2 -r 1b5d274e2b3f sys/arch/arc/dev/pccons.c
--- a/sys/arch/arc/dev/pccons.c Sun Apr 24 14:09:39 2011 +0000
+++ b/sys/arch/arc/dev/pccons.c Sun Apr 24 16:26:51 2011 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pccons.c,v 1.57 2009/03/14 21:04:04 dsl Exp $ */
+/* $NetBSD: pccons.c,v 1.58 2011/04/24 16:26:53 rmind Exp $ */
/* $OpenBSD: pccons.c,v 1.22 1999/01/30 22:39:37 imp Exp $ */
/* NetBSD: pccons.c,v 1.89 1995/05/04 19:35:20 cgd Exp */
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pccons.c,v 1.57 2009/03/14 21:04:04 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pccons.c,v 1.58 2011/04/24 16:26:53 rmind Exp $");
#include "opt_ddb.h"
@@ -600,7 +600,7 @@
return ENXIO;
if (!sc->sc_tty) {
- tp = sc->sc_tty = ttymalloc();
+ tp = sc->sc_tty = tty_alloc();
}
else {
tp = sc->sc_tty;
@@ -638,7 +638,7 @@
(*tp->t_linesw->l_close)(tp, flag);
ttyclose(tp);
#ifdef notyet /* XXX */
- ttyfree(tp);
+ tty_free(tp);
#endif
return 0;
}
diff -r 3ec3f36901f2 -r 1b5d274e2b3f sys/arch/arm/at91/at91dbgu.c
--- a/sys/arch/arm/at91/at91dbgu.c Sun Apr 24 14:09:39 2011 +0000
+++ b/sys/arch/arm/at91/at91dbgu.c Sun Apr 24 16:26:51 2011 +0000
@@ -1,5 +1,5 @@
-/* $Id: at91dbgu.c,v 1.4 2010/06/19 19:47:34 matt Exp $ */
-/* $NetBSD: at91dbgu.c,v 1.4 2010/06/19 19:47:34 matt Exp $ */
+/* $Id: at91dbgu.c,v 1.5 2011/04/24 16:26:53 rmind Exp $ */
+/* $NetBSD: at91dbgu.c,v 1.5 2011/04/24 16:26:53 rmind Exp $ */
/*
*
@@ -83,7 +83,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91dbgu.c,v 1.4 2010/06/19 19:47:34 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91dbgu.c,v 1.5 2011/04/24 16:26:53 rmind Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -243,7 +243,7 @@
DBGUREG(DBGU_IER) = DBGU_INT_RXRDY; // @@@@@
}
- tp = ttymalloc();
+ tp = tty_alloc();
tp->t_oproc = at91dbgu_start;
tp->t_param = at91dbgu_param;
tp->t_hwiflow = at91dbgu_hwiflow;
diff -r 3ec3f36901f2 -r 1b5d274e2b3f sys/arch/arm/at91/at91usart.c
--- a/sys/arch/arm/at91/at91usart.c Sun Apr 24 14:09:39 2011 +0000
+++ b/sys/arch/arm/at91/at91usart.c Sun Apr 24 16:26:51 2011 +0000
@@ -1,5 +1,5 @@
-/* $Id: at91usart.c,v 1.3 2009/10/23 06:53:13 snj Exp $ */
Home |
Main Index |
Thread Index |
Old Index