Module Name: src
Committed By: tsutsui
Date: Thu Apr 16 12:57:22 UTC 2009
Modified Files:
src/sys/dev: nullcons_subr.c
Log Message:
- remove an extra decl of cn_tab, which is in <dev/cons.h>
- some KNF
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/nullcons_subr.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/dev/nullcons_subr.c
diff -u src/sys/dev/nullcons_subr.c:1.8 src/sys/dev/nullcons_subr.c:1.9
--- src/sys/dev/nullcons_subr.c:1.8 Sat Mar 14 15:36:16 2009
+++ src/sys/dev/nullcons_subr.c Thu Apr 16 12:57:22 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: nullcons_subr.c,v 1.8 2009/03/14 15:36:16 dsl Exp $ */
+/* $NetBSD: nullcons_subr.c,v 1.9 2009/04/16 12:57:22 tsutsui Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nullcons_subr.c,v 1.8 2009/03/14 15:36:16 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nullcons_subr.c,v 1.9 2009/04/16 12:57:22 tsutsui Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -42,9 +42,6 @@
#include <dev/cons.h>
-
-extern struct consdev *cn_tab; /* physical console device info */
-
static struct tty *nulltty; /* null console tty */
cons_decl(null);
@@ -80,13 +77,13 @@
error = (*nulltty->t_linesw->l_ioctl)(nulltty, cmd, data, flag, l);
if (error != EPASSTHROUGH)
- return (error);
+ return error;
error = ttioctl(nulltty, cmd, data, flag, l);
if (error != EPASSTHROUGH)
- return (error);
+ return error;
- return (0);
+ return 0;
}
struct tty*
@@ -128,8 +125,9 @@
nullcngetc(dev_t dev)
{
- for(;;);
- return (0);
+ for (;;)
+ ;
+ return 0;
}
/*
@@ -151,14 +149,14 @@
int bmajor = -1, cmajor = -1;
if ((cn == NULL) || (cn->cn_pri != CN_NULL) || (cn->cn_dev != NODEV))
- return (0);
+ return 0;
/*
* Attach no-op device to the device list.
*/
error = devsw_attach("nullcn", NULL, &bmajor, &nullcn_devsw, &cmajor);
if (error != 0)
- return (error);
+ return error;
/*
* Allocate tty (mostly to have sane ioctl()).
@@ -168,7 +166,7 @@
tty_attach(nulltty);
cn->cn_dev = nulltty->t_dev;
- return (0);
+ return 0;
}
/*
