diff --exclude=CVS -c -r /usr/src-bak/sys/i4b/driver/i4b_ctl.c /usr/src/sys/i4b/driver/i4b_ctl.c *** /usr/src-bak/sys/i4b/driver/i4b_ctl.c Fri Aug 6 16:02:02 1999 --- /usr/src/sys/i4b/driver/i4b_ctl.c Fri Aug 27 15:25:14 1999 *************** *** 27,33 **** * i4b_ctl.c - i4b system control port driver * ------------------------------------------ * ! * $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] * --- 27,33 ---- * i4b_ctl.c - i4b system control port driver * ------------------------------------------ * ! * $Id: i4b_ctl.c,v 1.7 1999/08/27 07:26:19 julian Exp $ * * last edit-date: [Tue Jun 8 09:27:15 1999] * *************** *** 60,73 **** #include #ifdef __FreeBSD__ - #include "opt_devfs.h" - #endif - - #ifdef DEVFS - #include - #endif - - #ifdef __FreeBSD__ #include #include #elif defined(__bsdi__) --- 60,65 ---- *************** *** 136,145 **** #define PDEVSTATIC static #endif /* __FreeBSD__ */ - #ifdef DEVFS - static void *devfs_token; - #endif - #ifndef __FreeBSD__ #define PDEVSTATIC /* */ void i4bctlattach __P((void)); --- 128,133 ---- *************** *** 212,222 **** #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 } /*---------------------------------------------------------------------------* --- 200,206 ---- #ifndef HACK_NO_PSEUDO_ATTACH_MSG printf("i4bctl: ISDN system control port attached\n"); #endif ! make_dev(&i4bctl_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "i4bctl"); } /*---------------------------------------------------------------------------* diff --exclude=CVS -c -r /usr/src-bak/sys/i4b/driver/i4b_rbch.c /usr/src/sys/i4b/driver/i4b_rbch.c *** /usr/src-bak/sys/i4b/driver/i4b_rbch.c Fri Aug 6 16:02:04 1999 --- /usr/src/sys/i4b/driver/i4b_rbch.c Fri Aug 27 15:25:14 1999 *************** *** 27,33 **** * i4b_rbch.c - device driver for raw B channel data * --------------------------------------------------- * ! * $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] * --- 27,33 ---- * i4b_rbch.c - device driver for raw B channel data * --------------------------------------------------- * ! * $Id: i4b_rbch.c,v 1.6 1999/08/27 07:26:19 julian Exp $ * * last edit-date: [Fri Jul 9 09:37:02 1999] * *************** *** 54,67 **** #define termioschars(t) memcpy((t)->c_cc, &ttydefchars, sizeof((t)->c_cc)) #endif - #ifdef __FreeBSD__ - #include "opt_devfs.h" - #endif - - #ifdef DEVFS - #include - #endif - #ifdef __NetBSD__ #include #define bootverbose 0 --- 54,59 ---- *************** *** 124,133 **** #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); --- 116,121 ---- *************** *** 280,291 **** 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 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; --- 268,275 ---- for(i=0; i < NI4BRBCH; i++) { ! 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 --exclude=CVS -c -r /usr/src-bak/sys/i4b/driver/i4b_tel.c /usr/src/sys/i4b/driver/i4b_tel.c *** /usr/src-bak/sys/i4b/driver/i4b_tel.c Fri Aug 6 16:02:04 1999 --- /usr/src/sys/i4b/driver/i4b_tel.c Fri Aug 27 15:25:15 1999 *************** *** 27,33 **** * i4b_tel.c - device driver for ISDN telephony * -------------------------------------------- * ! * $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] * --- 27,33 ---- * i4b_tel.c - device driver for ISDN telephony * -------------------------------------------- * ! * $Id: i4b_tel.c,v 1.6 1999/08/27 07:26:19 julian Exp $ * * last edit-date: [Fri Jul 9 08:35:30 1999] * *************** *** 59,72 **** #include #include - #ifdef __FreeBSD__ - #include "opt_devfs.h" - #endif - - #ifdef DEVFS - #include - #endif - #ifdef __bsdi__ #include #endif --- 59,64 ---- *************** *** 130,139 **** #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]; --- 122,127 ---- *************** *** 311,323 **** 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 } } } --- 299,306 ---- tel_sc[i][j].wcvttab = 0; tel_sc[i][j].result = 0; tel_init_linktab(i); ! make_dev(&i4btel_cdevsw, i, ! UID_ROOT, GID_WHEEL, 0600, "i4btel%d", i); } } } diff --exclude=CVS -c -r /usr/src-bak/sys/i4b/driver/i4b_trace.c /usr/src/sys/i4b/driver/i4b_trace.c *** /usr/src-bak/sys/i4b/driver/i4b_trace.c Fri Aug 6 16:02:04 1999 --- /usr/src/sys/i4b/driver/i4b_trace.c Fri Aug 27 15:25:15 1999 *************** *** 27,33 **** * i4btrc - device driver for trace data read device * --------------------------------------------------- * ! * $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] * --- 27,33 ---- * i4btrc - device driver for trace data read device * --------------------------------------------------- * ! * $Id: i4b_trace.c,v 1.6 1999/08/27 07:26:20 julian Exp $ * * last edit-date: [Tue Jun 1 12:15:40 1999] * *************** *** 69,82 **** #include #ifdef __FreeBSD__ - #include "opt_devfs.h" - #endif - - #ifdef DEVFS - #include - #endif - - #ifdef __FreeBSD__ #include #include #else --- 69,74 ---- *************** *** 97,105 **** #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; --- 89,94 ---- *************** *** 237,248 **** 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 trace_queue[i].ifq_maxlen = IFQ_MAXLEN; device_state[i] = ST_IDLE; } --- 226,233 ---- for(i=0; i < NI4BTRC; i++) { ! 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 --exclude=CVS -c -r /usr/src-bak/sys/i4b/layer4/i4b_i4bdrv.c /usr/src/sys/i4b/layer4/i4b_i4bdrv.c *** /usr/src-bak/sys/i4b/layer4/i4b_i4bdrv.c Fri Aug 6 16:02:45 1999 --- /usr/src/sys/i4b/layer4/i4b_i4bdrv.c Fri Aug 27 15:25:16 1999 *************** *** 27,33 **** * i4b_i4bdrv.c - i4b userland interface driver * -------------------------------------------- * ! * $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] * --- 27,33 ---- * i4b_i4bdrv.c - i4b userland interface driver * -------------------------------------------- * ! * $Id: i4b_i4bdrv.c,v 1.8 1999/08/27 07:26:21 julian Exp $ * * last edit-date: [Tue Jun 8 19:48:16 1999] * *************** *** 70,83 **** #include #ifdef __FreeBSD__ - #include "opt_devfs.h" - #endif - - #ifdef DEVFS - #include - #endif - - #ifdef __FreeBSD__ #include #include #include --- 70,75 ---- *************** *** 103,111 **** static int openflag = 0; static int selflag = 0; static int readflag = 0; - #ifdef DEVFS - static void *devfs_token; - #endif #ifndef __FreeBSD__ --- 95,100 ---- *************** *** 247,257 **** 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 } /*---------------------------------------------------------------------------* --- 236,242 ---- printf("i4b: ISDN call control device attached\n"); #endif i4b_rdqueue.ifq_maxlen = IFQ_MAXLEN; ! make_dev(&i4b_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "i4b"); } /*---------------------------------------------------------------------------*