CVS commit: src/sys/rump/dev/lib/libwscons

[Antti Kantee]

Module Name:    src
Committed By:   pooka
Date:           Thu Mar 13 01:48:08 UTC 2014

Modified Files:
        src/sys/rump/dev/lib/libwscons: Makefile
Added Files:
        src/sys/rump/dev/lib/libwscons: wscons_component.c
Removed Files:
        src/sys/rump/dev/lib/libwscons: component.c

Log Message:
rename component.c -> wscons_component.c


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/rump/dev/lib/libwscons/Makefile
cvs rdiff -u -r1.5 -r0 src/sys/rump/dev/lib/libwscons/component.c
cvs rdiff -u -r0 -r1.1 src/sys/rump/dev/lib/libwscons/wscons_component.c

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/dev/lib/libwscons/Makefile
diff -u src/sys/rump/dev/lib/libwscons/Makefile:1.3 src/sys/rump/dev/lib/libwscons/Makefile:1.4
--- src/sys/rump/dev/lib/libwscons/Makefile:1.3	Mon Mar  8 10:54:21 2010
+++ src/sys/rump/dev/lib/libwscons/Makefile	Thu Mar 13 01:48:08 2014
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2010/03/08 10:54:21 pooka Exp $
+#	$NetBSD: Makefile,v 1.4 2014/03/13 01:48:08 pooka Exp $
 #
 
 .PATH:	${.CURDIR}/../../../../dev/wscons
@@ -8,7 +8,7 @@ IOCONF=	WSCONS.ioconf
 
 SRCS=   wsevent.c wskbd.c wskbdutil.c wsmouse.c
 
-SRCS+=	component.c
+SRCS+=	wscons_component.c
 
 CPPFLAGS+=	-I${RUMPTOP}/librump/rumpvfs -I${.CURDIR}/opt
 

Added files:

Index: src/sys/rump/dev/lib/libwscons/wscons_component.c
diff -u /dev/null src/sys/rump/dev/lib/libwscons/wscons_component.c:1.1
--- /dev/null	Thu Mar 13 01:48:08 2014
+++ src/sys/rump/dev/lib/libwscons/wscons_component.c	Thu Mar 13 01:48:08 2014
@@ -0,0 +1,31 @@
+/*	$NetBSD: wscons_component.c,v 1.1 2014/03/13 01:48:08 pooka Exp $	*/
+
+#include <sys/param.h>
+#include <sys/conf.h>
+#include <sys/device.h>
+#include <sys/mount.h>
+#include <sys/stat.h>
+
+#include "ioconf.c"
+
+#include "rump_private.h"
+#include "rump_dev_private.h"
+#include "rump_vfs_private.h"
+
+RUMP_COMPONENT(RUMP_COMPONENT_DEV)
+{
+	extern struct cdevsw wskbd_cdevsw, wsmouse_cdevsw;
+	devmajor_t bmaj, cmaj;
+
+	config_init_component(cfdriver_ioconf_wscons,
+	    cfattach_ioconf_wscons, cfdata_ioconf_wscons);
+
+	bmaj = cmaj = -1;
+	FLAWLESSCALL(devsw_attach("wskbd", NULL, &bmaj, &wskbd_cdevsw, &cmaj));
+	FLAWLESSCALL(rump_vfs_makeonedevnode(S_IFCHR, "/dev/wskbd", cmaj, 0));
+
+	bmaj = cmaj = -1;
+	FLAWLESSCALL(devsw_attach("wsmouse", NULL, &bmaj,
+	    &wsmouse_cdevsw, &cmaj));
+	FLAWLESSCALL(rump_vfs_makeonedevnode(S_IFCHR, "/dev/wsmouse", cmaj, 0));
+}