Add wsmux device.
(Also add lots of missing chrtoblktbl[] entries.)
This commit is contained in:
augustss
parent
4d486ab67d
commit
3652732791
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: conf.c,v 1.39 1999/04/24 17:01:15 ross Exp $ */
|
||||
/* $NetBSD: conf.c,v 1.40 1999/07/29 19:14:35 augustss Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1991 The Regents of the University of California.
|
||||
|
|
@ -37,7 +37,7 @@
|
|||
|
||||
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
|
||||
|
||||
__KERNEL_RCSID(0, "$NetBSD: conf.c,v 1.39 1999/04/24 17:01:15 ross Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: conf.c,v 1.40 1999/07/29 19:14:35 augustss Exp $");
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/systm.h>
|
||||
|
|
@ -170,6 +170,8 @@ cdev_decl(wsdisplay);
|
|||
cdev_decl(wskbd);
|
||||
#include "wsmouse.h"
|
||||
cdev_decl(wsmouse);
|
||||
#include "wsmux.h"
|
||||
cdev_decl(wsmux);
|
||||
|
||||
#include "spkr.h"
|
||||
cdev_decl(spkr);
|
||||
|
|
@ -313,6 +315,7 @@ struct cdevsw cdevsw[] =
|
|||
cdev_notdef(), /* 54 */
|
||||
cdev_notdef(), /* 55 */
|
||||
#endif
|
||||
cdev_mouse_init(NWSMUX, wsmux), /* 56: ws multiplexor */
|
||||
|
||||
};
|
||||
int nchrdev = sizeof (cdevsw) / sizeof (cdevsw[0]);
|
||||
|
|
@ -406,6 +409,12 @@ static int chrtoblktbl[] = {
|
|||
/* 48 */ NODEV,
|
||||
/* 49 */ NODEV,
|
||||
/* 50 */ NODEV,
|
||||
/* 51 */ NODEV,
|
||||
/* 52 */ NODEV,
|
||||
/* 53 */ NODEV,
|
||||
/* 54 */ NODEV,
|
||||
/* 55 */ NODEV,
|
||||
/* 56 */ NODEV,
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: conf.c,v 1.38 1999/01/23 22:18:41 sommerfe Exp $ */
|
||||
/* $NetBSD: conf.c,v 1.39 1999/07/29 19:14:36 augustss Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1994-1998 Mark Brinicombe.
|
||||
|
|
@ -187,6 +187,7 @@ int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
|
|||
#include "wsdisplay.h"
|
||||
#include "wskbd.h"
|
||||
#include "wsmouse.h"
|
||||
#include "wsmux.h"
|
||||
#include "scsibus.h"
|
||||
|
||||
/* Character devices */
|
||||
|
|
@ -281,7 +282,8 @@ struct cdevsw cdevsw[] = {
|
|||
cdev_lkm_dummy(), /* 69: reserved */
|
||||
cdev_scsibus_init(NSCSIBUS,scsibus), /* 70: SCSI bus */
|
||||
cdev_disk_init(NRAID,raid), /* 71: RAIDframe disk driver */
|
||||
cdev_ugen_init(NUGEN,ugen), /* 72: USB generic driver */
|
||||
cdev_ugen_init(NUGEN,ugen), /* 72: USB generic driver */
|
||||
cdev_mouse_init(NWSMUX,wsmux), /* 73: ws multiplexor */
|
||||
};
|
||||
|
||||
int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);
|
||||
|
|
@ -395,6 +397,8 @@ static int chrtoblktbl[] = {
|
|||
/* 69 */ NODEV,
|
||||
/* 70 */ NODEV,
|
||||
/* 71 */ 71,
|
||||
/* 72 */ NODEV,
|
||||
/* 73 */ NODEV,
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: conf.c,v 1.10 1998/11/13 04:47:04 oster Exp $ */
|
||||
/* $NetBSD: conf.c,v 1.11 1999/07/29 19:14:36 augustss Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1998 The NetBSD Foundation, Inc.
|
||||
|
|
@ -201,6 +201,8 @@ cdev_decl(wsdisplay);
|
|||
cdev_decl(wskbd);
|
||||
#include "wsmouse.h"
|
||||
cdev_decl(wsmouse);
|
||||
#include "wsmux.h"
|
||||
cdev_decl(wsmux);
|
||||
|
||||
#include "scsibus.h"
|
||||
cdev_decl(scsibus);
|
||||
|
|
@ -267,6 +269,7 @@ struct cdevsw cdevsw[] =
|
|||
wsmouse), /* 49: mice */
|
||||
cdev_scsibus_init(NSCSIBUS,scsibus), /* 50: SCSI bus */
|
||||
cdev_disk_init(NRAID,raid), /* 51: RAIDframe disk driver */
|
||||
cdev_mouse_init(NWSMUX, wsmux), /* 52: ws multiplexor */
|
||||
};
|
||||
int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);
|
||||
|
||||
|
|
@ -360,6 +363,7 @@ static int chrtoblktbl[] = {
|
|||
/* 49 */ NODEV,
|
||||
/* 50 */ NODEV,
|
||||
/* 51 */ 18,
|
||||
/* 52 */ NODEV,
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: conf.c,v 1.113 1999/04/08 12:10:53 drochner Exp $ */
|
||||
/* $NetBSD: conf.c,v 1.114 1999/07/29 19:14:36 augustss Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1998 The NetBSD Foundation, Inc.
|
||||
|
|
@ -218,6 +218,8 @@ cdev_decl(wsdisplay);
|
|||
cdev_decl(wskbd);
|
||||
#include "wsmouse.h"
|
||||
cdev_decl(wsmouse);
|
||||
#include "wsmux.h"
|
||||
cdev_decl(wsmux);
|
||||
#include "esh.h"
|
||||
cdev_decl(esh_fp);
|
||||
#include "scsibus.h"
|
||||
|
|
@ -354,6 +356,7 @@ struct cdevsw cdevsw[] =
|
|||
cdev_disk_init(NRAID,raid), /* 62: RAIDframe disk driver */
|
||||
cdev_esh_init(NESH, esh_fp), /* 63: HIPPI (esh) raw device */
|
||||
cdev_ugen_init(NUGEN,ugen), /* 64: USB generic driver */
|
||||
cdev_mouse_init(NWSMUX, wsmux), /* 65: ws multiplexor */
|
||||
};
|
||||
int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);
|
||||
|
||||
|
|
@ -460,6 +463,7 @@ static int chrtoblktbl[] = {
|
|||
/* 62 */ 18,
|
||||
/* 63 */ NODEV,
|
||||
/* 64 */ NODEV,
|
||||
/* 65 */ NODEV,
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: conf.c,v 1.50 1999/04/19 21:22:59 kleink Exp $ */
|
||||
/* $NetBSD: conf.c,v 1.51 1999/07/29 19:14:37 augustss Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1990 The Regents of the University of California.
|
||||
|
|
@ -115,6 +115,7 @@ int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
|
|||
#if 0
|
||||
#include "wskbd.h"
|
||||
#include "wsmouse.h"
|
||||
#include "wsmux.h"
|
||||
#endif
|
||||
#include "zsc.h"
|
||||
#include "zstty.h"
|
||||
|
|
@ -156,6 +157,7 @@ cdev_decl(vnd);
|
|||
#if 0
|
||||
cdev_decl(wskbd);
|
||||
cdev_decl(wsmouse);
|
||||
cdev_decl(wsmux);
|
||||
#endif
|
||||
cdev_decl(zs);
|
||||
cdev_decl(zsc);
|
||||
|
|
@ -216,6 +218,11 @@ struct cdevsw cdevsw[] =
|
|||
cdev_disk_init(NRAID,raid), /* 42: RAIDframe disk driver */
|
||||
cdev_disk_init(NFD,fd), /* 43: Sony floppy disk */
|
||||
cdev_svr4_net_init(NSVR4_NET,svr4_net), /* 44: svr4 net pseudo-device */
|
||||
#if 0
|
||||
cdev_mouse_init(NWSMUX, wsmux), /* 44: ws multiplexor */
|
||||
#else
|
||||
cdev_notdef(), /* 44 */
|
||||
#endif
|
||||
};
|
||||
int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);
|
||||
|
||||
|
|
@ -300,6 +307,8 @@ static int chrtoblktab[] = {
|
|||
/* 40 */ NODEV,
|
||||
/* 41 */ NODEV,
|
||||
/* 42 */ 20,
|
||||
/* 43 */ NODEV,
|
||||
/* 44 */ NODEV,
|
||||
};
|
||||
|
||||
dev_t
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: conf.c,v 1.13 1998/12/29 04:43:24 tsubai Exp $ */
|
||||
/* $NetBSD: conf.c,v 1.14 1999/07/29 19:14:37 augustss Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
|
||||
|
|
@ -130,6 +130,8 @@ cdev_decl(wsdisplay);
|
|||
cdev_decl(wskbd);
|
||||
#include "wsmouse.h"
|
||||
cdev_decl(wsmouse);
|
||||
#include "wsmux.h"
|
||||
cdev_decl(wsmux);
|
||||
|
||||
#include "usb.h"
|
||||
cdev_decl(usb);
|
||||
|
|
@ -184,6 +186,7 @@ struct cdevsw cdevsw[] = {
|
|||
cdev_usbdev_init(NUHID,uhid), /* 40: USB generic HID */
|
||||
cdev_lpt_init(NULPT,ulpt), /* 41: USB printer */
|
||||
cdev_ugen_init(NUGEN,ugen), /* 42: USB generic driver */
|
||||
cdev_mouse_init(NWSMUX,wsmux), /* 43: ws multiplexor */
|
||||
};
|
||||
int nchrdev = sizeof cdevsw / sizeof cdevsw[0];
|
||||
|
||||
|
|
@ -261,6 +264,7 @@ static int chrtoblktbl[] = {
|
|||
/* 40 */ NODEV,
|
||||
/* 41 */ NODEV,
|
||||
/* 42 */ NODEV,
|
||||
/* 43 */ NODEV,
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: conf.c,v 1.7 1999/04/19 21:23:00 kleink Exp $ */
|
||||
/* $NetBSD: conf.c,v 1.8 1999/07/29 19:14:37 augustss Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1990 The Regents of the University of California.
|
||||
|
|
@ -144,6 +144,8 @@ cdev_decl(wsdisplay);
|
|||
cdev_decl(wskbd);
|
||||
#include "wsmouse.h"
|
||||
cdev_decl(wsmouse);
|
||||
#include "wsmux.h"
|
||||
cdev_decl(wsmux);
|
||||
|
||||
dev_decl(filedesc,open);
|
||||
|
||||
|
|
@ -194,6 +196,7 @@ struct cdevsw cdevsw[] =
|
|||
cdev_mouse_init(NWSKBD, wskbd), /* 42: keyboards */
|
||||
cdev_mouse_init(NWSMOUSE, wsmouse), /* 43: mice */
|
||||
cdev_svr4_net_init(NSVR4_NET,svr4_net), /* 44: svr4 net pseudo-device */
|
||||
cdev_mouse_init(NWSMUX, wsmux), /* 45: ws multiplexor */
|
||||
};
|
||||
int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);
|
||||
|
||||
|
|
@ -276,6 +279,11 @@ static int chrtoblktab[] = {
|
|||
/* 38 */ NODEV,
|
||||
/* 39 */ NODEV,
|
||||
/* 40 */ 20,
|
||||
/* 41 */ NODEV,
|
||||
/* 42 */ NODEV,
|
||||
/* 43 */ NODEV,
|
||||
/* 44 */ NODEV,
|
||||
/* 45 */ NODEV,
|
||||
};
|
||||
|
||||
dev_t
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: conf.c,v 1.42 1999/06/06 19:05:21 ragge Exp $ */
|
||||
/* $NetBSD: conf.c,v 1.43 1999/07/29 19:14:37 augustss Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1982, 1986 The Regents of the University of California.
|
||||
|
|
@ -383,6 +383,8 @@ cdev_decl(wsdisplay);
|
|||
cdev_decl(wskbd);
|
||||
#include "wsmouse.h"
|
||||
cdev_decl(wsmouse);
|
||||
#include "wsmux.h"
|
||||
cdev_decl(wsmux);
|
||||
|
||||
#include "scsibus.h"
|
||||
cdev_decl(scsibus);
|
||||
|
|
@ -466,6 +468,7 @@ struct cdevsw cdevsw[] =
|
|||
cdev_disk_init(NRY,ry), /* 71: VS floppy */
|
||||
cdev_scsibus_init(NSCSIBUS,scsibus), /* 72: SCSI bus */
|
||||
cdev_disk_init(NRAID,raid), /* 73: RAIDframe disk driver */
|
||||
cdev_mouse_init(NWSMUX, wsmux), /* 74: ws multiplexor */
|
||||
};
|
||||
int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);
|
||||
|
||||
|
|
@ -557,6 +560,7 @@ int chrtoblktbl[] = {
|
|||
NODEV, /* 71 */
|
||||
NODEV, /* 72 */
|
||||
25, /* 73 */
|
||||
NODEV, /* 74 */
|
||||
};
|
||||
|
||||
dev_t
|
||||
|
|
|
|||
Loading…
Reference in New Issue