Module Name: src
Committed By: pooka
Date: Mon Jun 14 14:45:47 UTC 2010
Modified Files:
src/sys/rump/kern/lib: Makefile
Added Files:
src/sys/rump/kern/lib/libtty: Makefile component.c opt_ptm.h
shlib_version
Log Message:
Add unadulterated tty support as a rump component.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/kern/lib/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/rump/kern/lib/libtty/Makefile \
src/sys/rump/kern/lib/libtty/component.c \
src/sys/rump/kern/lib/libtty/opt_ptm.h \
src/sys/rump/kern/lib/libtty/shlib_version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/kern/lib/Makefile
diff -u src/sys/rump/kern/lib/Makefile:1.1 src/sys/rump/kern/lib/Makefile:1.2
--- src/sys/rump/kern/lib/Makefile:1.1 Thu Jun 10 21:56:42 2010
+++ src/sys/rump/kern/lib/Makefile Mon Jun 14 14:45:47 2010
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2010/06/10 21:56:42 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2010/06/14 14:45:47 pooka Exp $
#
-SUBDIR+= libksem
+SUBDIR+= libksem libtty
.include <bsd.subdir.mk>
Added files:
Index: src/sys/rump/kern/lib/libtty/Makefile
diff -u /dev/null src/sys/rump/kern/lib/libtty/Makefile:1.1
--- /dev/null Mon Jun 14 14:45:47 2010
+++ src/sys/rump/kern/lib/libtty/Makefile Mon Jun 14 14:45:47 2010
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.1 2010/06/14 14:45:47 pooka Exp $
+#
+
+.PATH: ${.CURDIR}/../../../../kern
+
+LIB= rumpkern_tty
+
+SRCS= tty.c tty_bsdpty.c tty_conf.c tty_ptm.c tty_pty.c tty_tty.c tty_subr.c
+
+SRCS+= component.c
+
+CPPFLAGS+= -I${RUMPTOP}/librump/rumpkern -I${RUMPTOP}/librump/rumpvfs
+
+.include <bsd.lib.mk>
+.include <bsd.klinks.mk>
Index: src/sys/rump/kern/lib/libtty/component.c
diff -u /dev/null src/sys/rump/kern/lib/libtty/component.c:1.1
--- /dev/null Mon Jun 14 14:45:47 2010
+++ src/sys/rump/kern/lib/libtty/component.c Mon Jun 14 14:45:47 2010
@@ -0,0 +1,71 @@
+/* $NetBSD: component.c,v 1.1 2010/06/14 14:45:47 pooka Exp $ */
+
+/*
+ * Copyright (c) 2010 Antti Kantee. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+ * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__KERNEL_RCSID(0, "$NetBSD: component.c,v 1.1 2010/06/14 14:45:47 pooka Exp $");
+
+#include <sys/param.h>
+#include <sys/conf.h>
+#include <sys/stat.h>
+#include <sys/tty.h>
+
+#include "rump_private.h"
+#include "rump_vfs_private.h"
+
+void ptyattach(int);
+
+RUMP_COMPONENT(RUMP_COMPONENT_KERN_VFS)
+{
+ extern const struct cdevsw ctty_cdevsw, ptc_cdevsw, pts_cdevsw;
+ extern const struct cdevsw ptm_cdevsw;
+ devmajor_t cmaj, bmaj;
+
+ cmaj = bmaj = -1;
+ FLAWLESSCALL(devsw_attach("ctty", NULL, &bmaj, &ctty_cdevsw, &cmaj));
+ FLAWLESSCALL(rump_vfs_makeonedevnode(S_IFCHR, "/dev/tty", cmaj, 0));
+
+ /* create only 10 nodes. should be enough for everyone ... */
+ cmaj = bmaj = -1;
+ FLAWLESSCALL(devsw_attach("ptc", NULL, &bmaj, &ptc_cdevsw, &cmaj));
+ FLAWLESSCALL(rump_vfs_makedevnodes(S_IFCHR, "/dev/ptyp", '0',
+ cmaj, 0, 9));
+
+ cmaj = bmaj = -1;
+ FLAWLESSCALL(devsw_attach("pts", NULL, &bmaj, &pts_cdevsw, &cmaj));
+ FLAWLESSCALL(rump_vfs_makedevnodes(S_IFCHR, "/dev/ttyp", '0',
+ cmaj, 0, 9));
+
+ cmaj = bmaj = -1;
+ FLAWLESSCALL(devsw_attach("ptm", NULL, &bmaj, &ptm_cdevsw, &cmaj));
+ FLAWLESSCALL(rump_vfs_makeonedevnode(S_IFCHR, "/dev/ptmx", cmaj, 0));
+ FLAWLESSCALL(rump_vfs_makeonedevnode(S_IFCHR, "/dev/ptm", cmaj, 1));
+
+ tty_init();
+ ttyldisc_init();
+
+ ptyattach(1);
+}
Index: src/sys/rump/kern/lib/libtty/opt_ptm.h
diff -u /dev/null src/sys/rump/kern/lib/libtty/opt_ptm.h:1.1
--- /dev/null Mon Jun 14 14:45:47 2010
+++ src/sys/rump/kern/lib/libtty/opt_ptm.h Mon Jun 14 14:45:47 2010
@@ -0,0 +1,3 @@
+/* $NetBSD: opt_ptm.h,v 1.1 2010/06/14 14:45:47 pooka Exp $ */
+
+#define COMPAT_BSDPTY
Index: src/sys/rump/kern/lib/libtty/shlib_version
diff -u /dev/null src/sys/rump/kern/lib/libtty/shlib_version:1.1
--- /dev/null Mon Jun 14 14:45:47 2010
+++ src/sys/rump/kern/lib/libtty/shlib_version Mon Jun 14 14:45:47 2010
@@ -0,0 +1,4 @@
+# $NetBSD: shlib_version,v 1.1 2010/06/14 14:45:47 pooka Exp $
+#
+major=0
+minor=0
