diff options
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/kern_descrip.c | 4 | ||||
| -rw-r--r-- | sys/kern/kern_lkm.c | 4 | ||||
| -rw-r--r-- | sys/kern/subr_log.c | 4 | ||||
| -rw-r--r-- | sys/kern/tty_cons.c | 5 | ||||
| -rw-r--r-- | sys/kern/tty_pty.c | 24 | ||||
| -rw-r--r-- | sys/kern/tty_snoop.c | 2 | ||||
| -rw-r--r-- | sys/kern/tty_tty.c | 4 |
7 files changed, 24 insertions, 23 deletions
diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index f1f5557..b4ef0fd 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_descrip.c 8.6 (Berkeley) 4/19/94 - * $Id: kern_descrip.c,v 1.14 1995/11/14 08:58:35 phk Exp $ + * $Id: kern_descrip.c,v 1.15 1995/11/29 10:48:21 julian Exp $ */ #include <sys/param.h> @@ -1049,8 +1049,8 @@ static void fildesc_drvinit(void *unused) x=devfs_add_devsw("/","stderr",major(dev),2,DV_CHR, 0, 0, 0600); } - } #endif + } } SYSINIT(fildescdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR, diff --git a/sys/kern/kern_lkm.c b/sys/kern/kern_lkm.c index 902ed4c..668ad9c 100644 --- a/sys/kern/kern_lkm.c +++ b/sys/kern/kern_lkm.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: kern_lkm.c,v 1.19 1995/11/20 12:06:21 phk Exp $ + * $Id: kern_lkm.c,v 1.20 1995/11/29 10:48:22 julian Exp $ */ /* @@ -1025,8 +1025,8 @@ static void lkm_drvinit(void *unused) /* path name devsw minor type uid gid perm*/ "/", "lkm", major(dev), 0, DV_CHR, 0, 0, 0600); } - } #endif + } } SYSINIT(lkmdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,lkm_drvinit,NULL) diff --git a/sys/kern/subr_log.c b/sys/kern/subr_log.c index 0b9d5da..24af05c 100644 --- a/sys/kern/subr_log.c +++ b/sys/kern/subr_log.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)subr_log.c 8.1 (Berkeley) 6/10/93 - * $Id: subr_log.c,v 1.10 1995/10/29 15:30:59 phk Exp $ + * $Id: subr_log.c,v 1.11 1995/11/29 10:48:25 julian Exp $ */ /* @@ -257,8 +257,8 @@ static void log_drvinit(void *unused) /* path name devsw minor type uid gid perm*/ "/", "log", major(dev), 0, DV_CHR, 0, 0, 0600); } - } #endif + } } SYSINIT(logdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,log_drvinit,NULL) diff --git a/sys/kern/tty_cons.c b/sys/kern/tty_cons.c index 9b8735d..7f2e4d7 100644 --- a/sys/kern/tty_cons.c +++ b/sys/kern/tty_cons.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * from: @(#)cons.c 7.2 (Berkeley) 5/9/91 - * $Id: cons.c,v 1.34 1995/09/10 21:34:49 bde Exp $ + * $Id: cons.c,v 1.35 1995/11/29 10:47:17 julian Exp $ */ #include <sys/param.h> @@ -332,8 +332,9 @@ static void cn_drvinit(void *unused) cn_devsw_installed = 1; #ifdef DEVFS /* path,name,major,minor,type,uid,gid,perm */ - x=devfs_add_devsw("/","console",major(dev),0,DV_CHR,0,0,0640); + x=devfs_add_devsw("/","console",major(dev),0,DV_CHR,0,0,0640); #endif + } } SYSINIT(cndev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,cn_drvinit,NULL) diff --git a/sys/kern/tty_pty.c b/sys/kern/tty_pty.c index ad41417..57e53bdf 100644 --- a/sys/kern/tty_pty.c +++ b/sys/kern/tty_pty.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tty_pty.c 8.2 (Berkeley) 9/23/93 - * $Id: tty_pty.c,v 1.24 1995/11/04 13:24:55 bde Exp $ + * $Id: tty_pty.c,v 1.25 1995/11/29 10:48:28 julian Exp $ */ /* @@ -768,7 +768,6 @@ static void ptc_drvinit(void *unused) if( ! ptc_devsw_installed ) { dev = makedev(CDEV_MAJOR_S,0); cdevsw_add(&dev,&pts_cdevsw,NULL); - pts_devsw_installed = 1; dev_c = makedev(CDEV_MAJOR_C,0); cdevsw_add(&dev_c,&ptc_cdevsw,NULL); ptc_devsw_installed = 1; @@ -778,17 +777,18 @@ static void ptc_drvinit(void *unused) #undef NPTY #define NPTY MAXUNITS #endif - for ( i = 0 ; i<NPTY ; i++ ) { - int x; - - j = i / 16; - k = i % 16; - sprintf(devname,"pty%c%c",jnames[j],knames[k]); - x=devfs_add_devsw("/",devname,major(dev_c),0,DV_CHR,0,0,0600); - sprintf(devname,"tty%c%c",jnames[j],knames[k]); - x=devfs_add_devsw("/",devname,major(dev),0,DV_CHR,0,0,0600); - } + for ( i = 0 ; i<NPTY ; i++ ) { + int x; + + j = i / 16; + k = i % 16; + sprintf(devname,"pty%c%c",jnames[j],knames[k]); + x=devfs_add_devsw("/",devname,major(dev_c),0,DV_CHR,0,0,0600); + sprintf(devname,"tty%c%c",jnames[j],knames[k]); + x=devfs_add_devsw("/",devname,major(dev),0,DV_CHR,0,0,0600); + } #endif + } } SYSINIT(ptcdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR_C,ptc_drvinit,NULL) diff --git a/sys/kern/tty_snoop.c b/sys/kern/tty_snoop.c index c89c975..ec1b928 100644 --- a/sys/kern/tty_snoop.c +++ b/sys/kern/tty_snoop.c @@ -522,8 +522,8 @@ static void snp_drvinit(void *unused) /* path name devsw minor type uid gid perm*/ "/", "snp", major(dev), 0, DV_CHR, 0, 0, 0600); } - } #endif + } } SYSINIT(snpdev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,snp_drvinit,NULL) diff --git a/sys/kern/tty_tty.c b/sys/kern/tty_tty.c index d0a0c8c..a970e03 100644 --- a/sys/kern/tty_tty.c +++ b/sys/kern/tty_tty.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)tty_tty.c 8.2 (Berkeley) 9/23/93 - * $Id: tty_tty.c,v 1.5 1995/05/30 08:06:19 rgrimes Exp $ + * $Id: tty_tty.c,v 1.6 1995/11/29 10:48:30 julian Exp $ */ /* @@ -186,8 +186,8 @@ static void ctty_drvinit(void *unused) /* path name devsw minor type uid gid perm*/ "/", "tty", major(dev), 0, DV_CHR, 0, 0, 0600); } - } #endif + } } SYSINIT(cttydev,SI_SUB_DRIVERS,SI_ORDER_MIDDLE+CDEV_MAJOR,ctty_drvinit,NULL) |
