diff options
author | julian <julian@FreeBSD.org> | 1999-08-27 07:26:26 +0000 |
---|---|---|
committer | julian <julian@FreeBSD.org> | 1999-08-27 07:26:26 +0000 |
commit | a0797ab43e7d1e9c6641c6f2f89994f1f8dda27f (patch) | |
tree | 3b869586ea654277810c20b32801d13ccc0f0866 /sys/i4b | |
parent | ef5c098b80b05fce18894be29b3297b9f4436089 (diff) | |
download | FreeBSD-src-a0797ab43e7d1e9c6641c6f2f89994f1f8dda27f.zip FreeBSD-src-a0797ab43e7d1e9c6641c6f2f89994f1f8dda27f.tar.gz |
Add PHK's make_dev() into more places where DEVFS used to be
hooked in directly.
Alpha change checked by: Matthew Jacob <mjacob@feral.com>
i4b ISDN changes checked by: Udo Schweigert <ust@cert.siemens.de>
and Hellmuth Michaelis <hm@hcs.de>
PC98 changes checked by: Takahashi Yoshihiro <nyan@FreeBSD.org>
Diffstat (limited to 'sys/i4b')
-rw-r--r-- | sys/i4b/driver/i4b_ctl.c | 20 | ||||
-rw-r--r-- | sys/i4b/driver/i4b_rbch.c | 22 | ||||
-rw-r--r-- | sys/i4b/driver/i4b_tel.c | 23 | ||||
-rw-r--r-- | sys/i4b/driver/i4b_trace.c | 21 | ||||
-rw-r--r-- | sys/i4b/layer4/i4b_i4bdrv.c | 19 |
5 files changed, 13 insertions, 92 deletions
diff --git a/sys/i4b/driver/i4b_ctl.c b/sys/i4b/driver/i4b_ctl.c index 3ad68a0..afd34d7 100644 --- a/sys/i4b/driver/i4b_ctl.c +++ b/sys/i4b/driver/i4b_ctl.c @@ -27,7 +27,7 @@ * i4b_ctl.c - i4b system control port driver * ------------------------------------------ * - * $Id: i4b_ctl.c,v 1.25 1999/06/08 08:13:00 hm Exp $ + * $Id: i4b_ctl.c,v 1.6 1999/08/06 14:02:02 hm Exp $ * * last edit-date: [Tue Jun 8 09:27:15 1999] * @@ -60,14 +60,6 @@ #include <net/if.h> #ifdef __FreeBSD__ -#include "opt_devfs.h" -#endif - -#ifdef DEVFS -#include <sys/devfsext.h> -#endif - -#ifdef __FreeBSD__ #include <machine/i4b_debug.h> #include <machine/i4b_ioctl.h> #elif defined(__bsdi__) @@ -136,10 +128,6 @@ PSEUDO_SET(i4bctlattach, i4b_i4bctldrv); #define PDEVSTATIC static #endif /* __FreeBSD__ */ -#ifdef DEVFS -static void *devfs_token; -#endif - #ifndef __FreeBSD__ #define PDEVSTATIC /* */ void i4bctlattach __P((void)); @@ -212,11 +200,7 @@ i4bctlattach() #ifndef HACK_NO_PSEUDO_ATTACH_MSG printf("i4bctl: ISDN system control port attached\n"); #endif -#ifdef DEVFS - devfs_token = devfs_add_devswf(&i4bctl_cdevsw, 0, DV_CHR, - UID_ROOT, GID_WHEEL, 0600, - "i4bctl"); -#endif + make_dev(&i4bctl_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "i4bctl"); } /*---------------------------------------------------------------------------* diff --git a/sys/i4b/driver/i4b_rbch.c b/sys/i4b/driver/i4b_rbch.c index 1179b35..16d9de4 100644 --- a/sys/i4b/driver/i4b_rbch.c +++ b/sys/i4b/driver/i4b_rbch.c @@ -27,7 +27,7 @@ * i4b_rbch.c - device driver for raw B channel data * --------------------------------------------------- * - * $Id: i4b_rbch.c,v 1.36 1999/07/19 14:03:33 hm Exp $ + * $Id: i4b_rbch.c,v 1.5 1999/08/06 14:02:04 hm Exp $ * * last edit-date: [Fri Jul 9 09:37:02 1999] * @@ -54,14 +54,6 @@ extern cc_t ttydefchars; #define termioschars(t) memcpy((t)->c_cc, &ttydefchars, sizeof((t)->c_cc)) #endif -#ifdef __FreeBSD__ -#include "opt_devfs.h" -#endif - -#ifdef DEVFS -#include <sys/devfsext.h> -#endif - #ifdef __NetBSD__ #include <sys/filio.h> #define bootverbose 0 @@ -124,10 +116,6 @@ static struct rbch_softc { #define I4BRBCHMAXQLEN 10 struct selinfo selp; /* select / poll */ - -#ifdef DEVFS - void *devfs_token; /* device filesystem */ -#endif } rbch_softc[NI4BRBCH]; static void rbch_rx_data_rdy(int unit); @@ -280,12 +268,8 @@ i4brbchattach() for(i=0; i < NI4BRBCH; i++) { -#ifdef DEVFS - rbch_softc[i].devfs_token = - devfs_add_devswf(&i4brbch_cdevsw, i, DV_CHR, - UID_ROOT, GID_WHEEL, 0600, - "i4brbch%d", i); -#endif + make_dev(&i4brbch_cdevsw, i, + UID_ROOT, GID_WHEEL, 0600, "i4brbch%d", i); rbch_softc[i].sc_devstate = ST_IDLE; rbch_softc[i].sc_hdlcq.ifq_maxlen = I4BRBCHMAXQLEN; rbch_softc[i].it_in.c_ispeed = rbch_softc[i].it_in.c_ospeed = 64000; diff --git a/sys/i4b/driver/i4b_tel.c b/sys/i4b/driver/i4b_tel.c index a96a77f..4dd18c1 100644 --- a/sys/i4b/driver/i4b_tel.c +++ b/sys/i4b/driver/i4b_tel.c @@ -27,7 +27,7 @@ * i4b_tel.c - device driver for ISDN telephony * -------------------------------------------- * - * $Id: i4b_tel.c,v 1.43 1999/07/09 06:44:00 hm Exp $ + * $Id: i4b_tel.c,v 1.5 1999/08/06 14:02:04 hm Exp $ * * last edit-date: [Fri Jul 9 08:35:30 1999] * @@ -59,14 +59,6 @@ #include <sys/proc.h> #include <sys/tty.h> -#ifdef __FreeBSD__ -#include "opt_devfs.h" -#endif - -#ifdef DEVFS -#include <sys/devfsext.h> -#endif - #ifdef __bsdi__ #include <sys/device.h> #endif @@ -130,10 +122,6 @@ typedef struct { #define ST_WRWAITEMPTY 0x08 /* userland write waiting */ struct selinfo selp; /* select / poll */ - -#ifdef DEVFS - void *devfs_token; /* token for DEVFS */ -#endif } tel_sc_t; static tel_sc_t tel_sc[NI4BTEL][NOFUNCS]; @@ -311,13 +299,8 @@ i4btelattach() tel_sc[i][j].wcvttab = 0; tel_sc[i][j].result = 0; tel_init_linktab(i); -#ifdef DEVFS - -/* XXX */ tel_sc[i][j].devfs_token - = devfs_add_devswf(&i4btel_cdevsw, i, DV_CHR, - UID_ROOT, GID_WHEEL, 0600, - "i4btel%d", i); -#endif + make_dev(&i4btel_cdevsw, i, + UID_ROOT, GID_WHEEL, 0600, "i4btel%d", i); } } } diff --git a/sys/i4b/driver/i4b_trace.c b/sys/i4b/driver/i4b_trace.c index aacf53d..5283241 100644 --- a/sys/i4b/driver/i4b_trace.c +++ b/sys/i4b/driver/i4b_trace.c @@ -27,7 +27,7 @@ * i4btrc - device driver for trace data read device * --------------------------------------------------- * - * $Id: i4b_trace.c,v 1.20 1999/06/01 10:23:58 hm Exp $ + * $Id: i4b_trace.c,v 1.5 1999/08/06 14:02:04 hm Exp $ * * last edit-date: [Tue Jun 1 12:15:40 1999] * @@ -69,14 +69,6 @@ #include <sys/tty.h> #ifdef __FreeBSD__ -#include "opt_devfs.h" -#endif - -#ifdef DEVFS -#include <sys/devfsext.h> -#endif - -#ifdef __FreeBSD__ #include <machine/i4b_trace.h> #include <machine/i4b_ioctl.h> #else @@ -97,9 +89,6 @@ static int device_state[NI4BTRC]; #define ST_IDLE 0x00 #define ST_ISOPEN 0x01 #define ST_WAITDATA 0x02 -#ifdef DEVFS -static void *devfs_token[NI4BTRC]; -#endif static int analyzemode = 0; static int rxunit = -1; @@ -237,12 +226,8 @@ i4btrcattach() for(i=0; i < NI4BTRC; i++) { -#ifdef DEVFS - devfs_token[i] - = devfs_add_devswf(&i4btrc_cdevsw, i, DV_CHR, - UID_ROOT, GID_WHEEL, 0600, - "i4btrc%d", i); -#endif + make_dev(&i4btrc_cdevsw, i, + UID_ROOT, GID_WHEEL, 0600, "i4btrc%d", i); trace_queue[i].ifq_maxlen = IFQ_MAXLEN; device_state[i] = ST_IDLE; } diff --git a/sys/i4b/layer4/i4b_i4bdrv.c b/sys/i4b/layer4/i4b_i4bdrv.c index d152555..fb2d129 100644 --- a/sys/i4b/layer4/i4b_i4bdrv.c +++ b/sys/i4b/layer4/i4b_i4bdrv.c @@ -27,7 +27,7 @@ * i4b_i4bdrv.c - i4b userland interface driver * -------------------------------------------- * - * $Id: i4b_i4bdrv.c,v 1.47 1999/06/08 17:49:44 hm Exp $ + * $Id: i4b_i4bdrv.c,v 1.7 1999/08/06 14:02:45 hm Exp $ * * last edit-date: [Tue Jun 8 19:48:16 1999] * @@ -70,14 +70,6 @@ #include <net/if.h> #ifdef __FreeBSD__ -#include "opt_devfs.h" -#endif - -#ifdef DEVFS -#include <sys/devfsext.h> -#endif - -#ifdef __FreeBSD__ #include <machine/i4b_debug.h> #include <machine/i4b_ioctl.h> #include <machine/i4b_cause.h> @@ -103,9 +95,6 @@ static struct ifqueue i4b_rdqueue; static int openflag = 0; static int selflag = 0; static int readflag = 0; -#ifdef DEVFS -static void *devfs_token; -#endif #ifndef __FreeBSD__ @@ -247,11 +236,7 @@ i4battach() printf("i4b: ISDN call control device attached\n"); #endif i4b_rdqueue.ifq_maxlen = IFQ_MAXLEN; -#ifdef DEVFS - devfs_token = devfs_add_devswf(&i4b_cdevsw, 0, DV_CHR, - UID_ROOT, GID_WHEEL, 0600, - "i4b"); -#endif + make_dev(&i4b_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "i4b"); } /*---------------------------------------------------------------------------* |