From owner-p4-projects@FreeBSD.ORG  Mon Sep  1 14:01:56 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9A32516A4C1; Mon,  1 Sep 2003 14:01:56 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 47C3116A4BF
	for <perforce@freebsd.org>; Mon,  1 Sep 2003 14:01:56 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C874944003
	for <perforce@freebsd.org>; Mon,  1 Sep 2003 14:01:55 -0700 (PDT)
	(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h81L1t0U094095
	for <perforce@freebsd.org>; Mon, 1 Sep 2003 14:01:55 -0700 (PDT)
	(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h81L1tHn094091
	for perforce@freebsd.org; Mon, 1 Sep 2003 14:01:55 -0700 (PDT)
Date: Mon, 1 Sep 2003 14:01:55 -0700 (PDT)
Message-Id: <200309012101.h81L1tHn094091@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 37339 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Sep 2003 21:01:57 -0000

http://perforce.freebsd.org/chv.cgi?CH=37339

Change 37339 by marcel@marcel_nfs on 2003/09/01 14:01:35

	s/uart_close/uart_tty_close/g
	s/uart_ioctl/uart_tty_ioctl/g
	s/uart_open/uart_tty_open/g
	
	Now that the TTY interface is not the only interface (well,
	by design at least :-), avoid a naming scheme that implies
	otherwise.

Affected files ...

.. //depot/projects/uart/dev/uart/uart_tty.c#9 edit

Differences ...

==== //depot/projects/uart/dev/uart/uart_tty.c#9 (text+ko) ====

@@ -62,16 +62,16 @@
 CONS_DRIVER(uart, uart_cnprobe, uart_cninit, uart_cnterm, uart_cngetc,
     uart_cncheckc, uart_cnputc, NULL);
 
-static d_open_t uart_open;
-static d_close_t uart_close;
-static d_ioctl_t uart_ioctl;
+static d_open_t uart_tty_open;
+static d_close_t uart_tty_close;
+static d_ioctl_t uart_tty_ioctl;
 
 static struct cdevsw uart_cdevsw = {
-	.d_open = uart_open,
-	.d_close = uart_close,
+	.d_open = uart_tty_open,
+	.d_close = uart_tty_close,
 	.d_read = ttyread,
 	.d_write = ttywrite,
-	.d_ioctl = uart_ioctl,
+	.d_ioctl = uart_tty_ioctl,
 	.d_poll = ttypoll,
 	.d_name = uart_driver_name,
 	.d_maj = MAJOR_AUTO,
@@ -335,7 +335,7 @@
 }
 
 static int
-uart_open(dev_t dev, int flags, int mode, struct thread *td)
+uart_tty_open(dev_t dev, int flags, int mode, struct thread *td)
 {
 	struct uart_softc *sc;
 	struct tty *tp;
@@ -424,7 +424,7 @@
 }
 
 static int
-uart_close(dev_t dev, int flags, int mode, struct thread *td)
+uart_tty_close(dev_t dev, int flags, int mode, struct thread *td)
 {
 	struct uart_softc *sc;
 	struct tty *tp;
@@ -452,7 +452,8 @@
 }
 
 static int
-uart_ioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct thread *td)
+uart_tty_ioctl(dev_t dev, u_long cmd, caddr_t data, int flags,
+    struct thread *td)
 {
 	struct uart_softc *sc;
 	struct tty *tp;