From owner-p4-projects@FreeBSD.ORG Sun Aug 10 00:18:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1EDA01065679; Sun, 10 Aug 2008 00:18:25 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BE6E31065673 for ; Sun, 10 Aug 2008 00:18:24 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A7AC38FC12 for ; Sun, 10 Aug 2008 00:18:24 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.2/8.14.2) with ESMTP id m7A0IO6A080782 for ; Sun, 10 Aug 2008 00:18:24 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.2/8.14.1/Submit) id m7A0IOHI080780 for perforce@freebsd.org; Sun, 10 Aug 2008 00:18:24 GMT (envelope-from ed@FreeBSD.org) Date: Sun, 10 Aug 2008 00:18:24 GMT Message-Id: <200808100018.m7A0IOHI080780@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 147030 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Aug 2008 00:18:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=147030 Change 147030 by ed@ed_dull on 2008/08/10 00:18:01 Now that we've performed enough tests with the pts(4) driver, move it back to its old location. This doesn't really make the diff against the original sources smaller, but causes the drivers to be at the same place where they used to be. Affected files ... .. //depot/projects/mpsafetty/sys/conf/files#9 edit .. //depot/projects/mpsafetty/sys/dev/pts/pts.c#9 delete .. //depot/projects/mpsafetty/sys/dev/pts/pts.h#4 delete .. //depot/projects/mpsafetty/sys/dev/pty/pty.c#2 delete .. //depot/projects/mpsafetty/sys/kern/init_sysent.c#2 edit .. //depot/projects/mpsafetty/sys/kern/syscalls.master#2 edit .. //depot/projects/mpsafetty/sys/kern/tty_pts.c#5 add .. //depot/projects/mpsafetty/sys/kern/tty_pty.c#5 add .. //depot/projects/mpsafetty/sys/modules/Makefile#6 edit .. //depot/projects/mpsafetty/sys/modules/pts/Makefile#2 delete .. //depot/projects/mpsafetty/sys/modules/pty/Makefile#2 delete .. //depot/projects/mpsafetty/sys/sys/tty.h#7 edit Differences ... ==== //depot/projects/mpsafetty/sys/conf/files#9 (text+ko) ==== @@ -1004,8 +1004,6 @@ dev/pst/pst-iop.c optional pst dev/pst/pst-pci.c optional pst pci dev/pst/pst-raid.c optional pst -dev/pts/pts.c optional pts -dev/pty/pty.c optional pty dev/puc/puc.c optional puc dev/puc/puc_cfg.c optional puc dev/puc/puc_pccard.c optional puc pccard @@ -1662,6 +1660,8 @@ kern/tty_info.c standard kern/tty_inq.c standard kern/tty_outq.c standard +kern/tty_pts.c standard +kern/tty_pty.c optional pty kern/tty_tty.c standard kern/tty_ttydisc.c standard kern/uipc_accf.c optional inet ==== //depot/projects/mpsafetty/sys/kern/init_sysent.c#2 (text+ko) ==== @@ -532,5 +532,5 @@ { AS(renameat_args), (sy_call_t *)renameat, AUE_RENAMEAT, NULL, 0, 0 }, /* 501 = renameat */ { AS(symlinkat_args), (sy_call_t *)symlinkat, AUE_SYMLINKAT, NULL, 0, 0 }, /* 502 = symlinkat */ { AS(unlinkat_args), (sy_call_t *)unlinkat, AUE_UNLINKAT, NULL, 0, 0 }, /* 503 = unlinkat */ - { AS(posix_openpt_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0 }, /* 504 = posix_openpt */ + { AS(posix_openpt_args), (sy_call_t *)posix_openpt, AUE_POSIXOPENPT, NULL, 0, 0 }, /* 504 = posix_openpt */ }; ==== //depot/projects/mpsafetty/sys/kern/syscalls.master#2 (text+ko) ==== @@ -886,6 +886,6 @@ 502 AUE_SYMLINKAT STD { int symlinkat(char *path1, int fd, \ char *path2); } 503 AUE_UNLINKAT STD { int unlinkat(int fd, char *path, int flag); } -504 AUE_POSIXOPENPT NOSTD { int posix_openpt(int flags); } +504 AUE_POSIXOPENPT STD { int posix_openpt(int flags); } ; Please copy any additions and changes to the following compatability tables: ; sys/compat/freebsd32/syscalls.master ==== //depot/projects/mpsafetty/sys/modules/Makefile#6 (text+ko) ==== @@ -218,8 +218,6 @@ procfs \ pseudofs \ ${_pst} \ - pts \ - pty \ puc \ ral \ ${_random} \ ==== //depot/projects/mpsafetty/sys/sys/tty.h#7 (text+ko) ==== @@ -43,6 +43,7 @@ #include struct cdev; +struct file; struct pgrp; struct session; struct ucred; @@ -184,6 +185,11 @@ /* Status line printing */ void tty_info(struct tty *); +/* Pseudo-terminal hooks */ +typedef void pts_external_free_t(void *); +int pts_alloc_external(int, struct thread *, struct file *, + pts_external_free_t, void *, const char *); + /* Drivers and line disciplines also need to call these */ #include #include