Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename ISDN devices, per discussion on tech-kern. The network devices 

become ippp (ISDN ppp) and irip (ISDN raw IP). The character device now
are called: /dev/isdn (isdnd <-> kernel communication), /dev/isdnctl (dialing
and other control), /dev/isdntrc* (tracing), /dev/isdnbchan* (raw B channel
access, i.e. for user land PPP) and /dev/isdntel* (telephone devices, i.e.
for answering machines).
This commit is contained in:
martin 2002-03-16 16:55:51 +00:00
parent 11f2ca401d
commit 94881fb123
36 changed files with 681 additions and 723 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
sys/arch/acorn32/acorn32/conf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: conf.c,v 1.3 2002/01/12 12:23:48 manu Exp $ */
/* $NetBSD: conf.c,v 1.4 2002/03/16 16:55:51 martin Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@ -158,16 +158,16 @@ struct bdevsw bdevsw[] = {
int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
#include "i4b.h"
#include "i4bctl.h"
#include "i4btrc.h"
#include "i4brbch.h"
#include "i4btel.h"
cdev_decl(i4b);
cdev_decl(i4bctl);
cdev_decl(i4btrc);
cdev_decl(i4brbch);
cdev_decl(i4btel);
#include "isdn.h"
#include "isdnctl.h"
#include "isdntrc.h"
#include "isdnbchan.h"
#include "isdntel.h"
cdev_decl(isdn);
cdev_decl(isdnctl);
cdev_decl(isdntrc);
cdev_decl(isdnbchan);
cdev_decl(isdntel);
#include "vt.h"
#include "vidcconsole.h"
@ -291,11 +291,11 @@ struct cdevsw cdevsw[] = {
cdev_notdef(), /* 76: USB scanner */
cdev_notdef(), /* 77: */
cdev_notdef(), /* 78: bicons pseudo-dev */
cdev_i4b_init(NI4B, i4b), /* 79: i4b main device */
cdev_i4bctl_init(NI4BCTL, i4bctl), /* 80: i4b control device */
cdev_i4brbch_init(NI4BRBCH, i4brbch), /* 81: i4b raw b-channel access */
cdev_i4btrc_init(NI4BTRC, i4btrc), /* 82: i4b trace device */
cdev_i4btel_init(NI4BTEL, i4btel), /* 83: i4b phone device */
cdev_isdn_init(NISDN, isdn), /* 79: isdn main device */
cdev_isdnctl_init(NISDNCTL, isdnctl), /* 80: isdn control device */
cdev_isdnbchan_init(NISDNBCHAN, isdnbchan), /* 81: isdn raw b-channel access */
cdev_isdntrc_init(NISDNTRC, isdntrc), /* 82: isdn trace device */
cdev_isdntel_init(NISDNTEL, isdntel), /* 83: isdn phone device */
cdev_clockctl_init(NCLOCKCTL, clockctl),/* 84: clockctl pseudo device */
};

34
sys/arch/algor/algor/conf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: conf.c,v 1.4 2002/01/12 12:24:17 manu Exp $ */
/* $NetBSD: conf.c,v 1.5 2002/03/16 16:55:52 martin 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.4 2002/01/12 12:24:17 manu Exp $");
__KERNEL_RCSID(0, "$NetBSD: conf.c,v 1.5 2002/03/16 16:55:52 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -237,16 +237,16 @@ cdev_decl(urio);
#include "uscanner.h"
cdev_decl(uscanner);
#include "i4b.h"
#include "i4bctl.h"
#include "i4btrc.h"
#include "i4brbch.h"
#include "i4btel.h"
cdev_decl(i4b);
cdev_decl(i4bctl);
cdev_decl(i4btrc);
cdev_decl(i4brbch);
cdev_decl(i4btel);
#include "isdn.h"
#include "isdnctl.h"
#include "isdntrc.h"
#include "isdnbchan.h"
#include "isdntel.h"
cdev_decl(isdn);
cdev_decl(isdnctl);
cdev_decl(isdntrc);
cdev_decl(isdnbchan);
cdev_decl(isdntel);
#include <altq/altqconf.h>
@ -312,11 +312,11 @@ struct cdevsw cdevsw[] =
cdev_ugen_init(NUGEN,ugen), /* 48: USB generic driver */
cdev_midi_init(NMIDI,midi), /* 49: MIDI I/O */
cdev_midi_init(NSEQUENCER,sequencer), /* 50: sequencer I/O */
cdev_i4b_init(NI4B, i4b), /* 51: i4b main device */
cdev_i4bctl_init(NI4BCTL, i4bctl), /* 52: i4b control device */
cdev_i4brbch_init(NI4BRBCH, i4brbch), /* 53: i4b raw b-chnl access */
cdev_i4btrc_init(NI4BTRC, i4btrc), /* 54: i4b trace device */
cdev_i4btel_init(NI4BTEL, i4btel), /* 55: i4b phone device */
cdev_isdn_init(NISDN, isdn), /* 51: isdn main device */
cdev_isdnctl_init(NISDNCTL, isdnctl), /* 52: isdn control device */
cdev_isdnbchan_init(NISDNBCHAN, isdnbchan), /* 53: isdn raw b-chnl access */
cdev_isdntrc_init(NISDNTRC, isdntrc), /* 54: isdn trace device */
cdev_isdntel_init(NISDNTEL, isdntel), /* 55: isdn phone device */
cdev_mouse_init(NWSMUX, wsmux), /* 56: ws multiplexor */
cdev_tty_init(NUCOM, ucom), /* 57: USB tty */
cdev_ses_init(NSES,ses), /* 58: SCSI SES/SAF-TE */

34
sys/arch/alpha/alpha/conf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: conf.c,v 1.61 2002/01/12 12:32:58 manu Exp $ */
/* $NetBSD: conf.c,v 1.62 2002/03/16 16:55:52 martin 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.61 2002/01/12 12:32:58 manu Exp $");
__KERNEL_RCSID(0, "$NetBSD: conf.c,v 1.62 2002/03/16 16:55:52 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -196,16 +196,16 @@ cdev_decl(urio);
#include "uscanner.h"
cdev_decl(uscanner);
#include "i4b.h"
#include "i4bctl.h"
#include "i4btrc.h"
#include "i4brbch.h"
#include "i4btel.h"
cdev_decl(i4b);
cdev_decl(i4bctl);
cdev_decl(i4btrc);
cdev_decl(i4brbch);
cdev_decl(i4btel);
#include "isdn.h"
#include "isdnctl.h"
#include "isdntrc.h"
#include "isdnbchan.h"
#include "isdntel.h"
cdev_decl(isdn);
cdev_decl(isdnctl);
cdev_decl(isdntrc);
cdev_decl(isdnbchan);
cdev_decl(isdntel);
#include <altq/altqconf.h>
@ -284,11 +284,11 @@ struct cdevsw cdevsw[] =
cdev_ugen_init(NUGEN,ugen), /* 48: USB generic driver */
cdev_midi_init(NMIDI,midi), /* 49: MIDI I/O */
cdev_midi_init(NSEQUENCER,sequencer), /* 50: sequencer I/O */
cdev_i4b_init(NI4B, i4b), /* 51: i4b main device */
cdev_i4bctl_init(NI4BCTL, i4bctl), /* 52: i4b control device */
cdev_i4brbch_init(NI4BRBCH, i4brbch), /* 53: i4b raw b-chnl access */
cdev_i4btrc_init(NI4BTRC, i4btrc), /* 54: i4b trace device */
cdev_i4btel_init(NI4BTEL, i4btel), /* 55: i4b phone device */
cdev_isdn_init(NISDN, isdn), /* 51: isdn main device */
cdev_isdnctl_init(NISDNCTL, isdnctl), /* 52: isdn control device */
cdev_isdnbchan_init(NISDNBCHAN, isdnbchan), /* 53: isdn raw b-chnl access */
cdev_isdntrc_init(NISDNTRC, isdntrc), /* 54: isdn trace device */
cdev_isdntel_init(NISDNTEL, isdntel), /* 55: isdn phone device */
cdev_mouse_init(NWSMUX, wsmux), /* 56: ws multiplexor */
cdev_tty_init(NUCOM, ucom), /* 57: USB tty */
cdev_ses_init(NSES,ses), /* 58: SCSI SES/SAF-TE */

34
sys/arch/amiga/amiga/conf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: conf.c,v 1.64 2002/01/28 09:56:46 aymeric Exp $ */
/* $NetBSD: conf.c,v 1.65 2002/03/16 16:55:52 martin Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@ -38,7 +38,7 @@
#include "opt_compat_svr4.h"
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: conf.c,v 1.64 2002/01/28 09:56:46 aymeric Exp $");
__KERNEL_RCSID(0, "$NetBSD: conf.c,v 1.65 2002/03/16 16:55:52 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -122,16 +122,16 @@ cdev_decl(wskbd);
cdev_decl(wd);
#include "i4b.h"
#include "i4bctl.h"
#include "i4btrc.h"
#include "i4brbch.h"
#include "i4btel.h"
cdev_decl(i4b);
cdev_decl(i4bctl);
cdev_decl(i4btrc);
cdev_decl(i4brbch);
cdev_decl(i4btel);
#include "isdn.h"
#include "isdnctl.h"
#include "isdntrc.h"
#include "isdnbchan.h"
#include "isdntel.h"
cdev_decl(isdn);
cdev_decl(isdnctl);
cdev_decl(isdntrc);
cdev_decl(isdnbchan);
cdev_decl(isdntel);
struct cdevsw cdevsw[] =
{
@ -180,11 +180,11 @@ struct cdevsw cdevsw[] =
cdev_rnd_init(NRND,rnd), /* 42: random source pseudo-device */
cdev_disk_init(NMD,md), /* 43: memory disk */
cdev_scsibus_init(NSCSIBUS,scsibus), /* 44: SCSI bus */
cdev_i4b_init(NI4B, i4b), /* 45: i4b main device */
cdev_i4bctl_init(NI4BCTL, i4bctl), /* 46: i4b control device */
cdev_i4brbch_init(NI4BRBCH, i4brbch), /* 47: i4b raw b-channel */
cdev_i4btrc_init(NI4BTRC, i4btrc), /* 48: i4b trace device */
cdev_i4btel_init(NI4BTEL, i4btel), /* 49: i4b phone device */
cdev_isdn_init(NISDN, isdn), /* 45: isdn main device */
cdev_isdnctl_init(NISDNCTL, isdnctl), /* 46: isdn control device */
cdev_isdnbchan_init(NISDNBCHAN, isdnbchan), /* 47: isdn raw b-channel */
cdev_isdntrc_init(NISDNTRC, isdntrc), /* 48: isdn trace device */
cdev_isdntel_init(NISDNTEL, isdntel), /* 49: isdn phone device */
cdev_disk_init(NRAID,raid), /* 50: RAIDframe disk driver */
cdev_svr4_net_init(NSVR4_NET,svr4_net), /* 51: svr4 net pseudo-device */
cdev_disk_init(NWD,wd), /* 52: IDE disk */

32
sys/arch/arc/arc/conf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: conf.c,v 1.22 2002/01/12 12:31:23 manu Exp $ */
/* $NetBSD: conf.c,v 1.23 2002/03/16 16:55:53 martin Exp $ */
/* $OpenBSD: conf.c,v 1.27 1999/08/12 13:06:33 niklas Exp $ */
/*
@ -100,16 +100,16 @@ int nblkdev = ARRAY_LENGTH(bdevsw);
* Character devices.
*/
#include "i4b.h"
#include "i4bctl.h"
#include "i4btrc.h"
#include "i4brbch.h"
#include "i4btel.h"
cdev_decl(i4b);
cdev_decl(i4bctl);
cdev_decl(i4btrc);
cdev_decl(i4brbch);
cdev_decl(i4btel);
#include "isdn.h"
#include "isdnctl.h"
#include "isdntrc.h"
#include "isdnbchan.h"
#include "isdntel.h"
cdev_decl(isdn);
cdev_decl(isdnctl);
cdev_decl(isdntrc);
cdev_decl(isdnbchan);
cdev_decl(isdntel);
cdev_decl(cn);
cdev_decl(sw);
@ -213,11 +213,11 @@ struct cdevsw cdevsw[] =
cdev_scanner_init(NSS,ss), /* 34: SCSI scanner */
cdev_notdef(), /* 35: OpenBSD Kernel symbols device */
cdev_ch_init(NCH,ch), /* 36: SCSI autochanger */
cdev_i4b_init(NI4B, i4b), /* 37: i4b main device */
cdev_i4bctl_init(NI4BCTL, i4bctl), /* 38: i4b control device */
cdev_i4brbch_init(NI4BRBCH, i4brbch), /* 39: i4b raw b-channel access */
cdev_i4btrc_init(NI4BTRC, i4btrc), /* 40: i4b trace device */
cdev_i4btel_init(NI4BTEL, i4btel), /* 41: i4b phone device */
cdev_isdn_init(NISDN, isdn), /* 37: isdn main device */
cdev_isdnctl_init(NISDNCTL, isdnctl), /* 38: isdn control device */
cdev_isdnbchan_init(NISDNBCHAN, isdnbchan), /* 39: isdn raw b-channel access */
cdev_isdntrc_init(NISDNTRC, isdntrc), /* 40: isdn trace device */
cdev_isdntel_init(NISDNTEL, isdntel), /* 41: isdn phone device */
cdev_notdef(), /* 42: */
cdev_notdef(), /* 33: */
cdev_notdef(), /* 44: */

42
sys/arch/arm/arm32/conf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: conf.c,v 1.7 2002/01/05 00:51:30 chris Exp $ */
/* $NetBSD: conf.c,v 1.8 2002/03/16 16:55:53 martin Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@ -182,17 +182,17 @@ bdev_decl(sw);
* ISDN devices
*/
#ifdef CONF_HAVE_ISDN
#include "i4b.h"
#include "i4bctl.h"
#include "i4btrc.h"
#include "i4brbch.h"
#include "i4btel.h"
#include "isdn.h"
#include "isdnctl.h"
#include "isdntrc.h"
#include "isdnbchan.h"
#include "isdntel.h"
#else
#define NI4B 0
#define NI4BCTL 0
#define NI4BTRC 0
#define NI4BRBCH 0
#define NI4BTEL 0
#define NISDN 0
#define ISDNCTL 0
#define NISDNTRC 0
#define NISDNBCHAN 0
#define NISDNTEL 0
#endif
#ifdef CONF_HAVE_PCI
@ -391,11 +391,11 @@ struct bdevsw bdevsw[] = {
};
/* Character devices */
cdev_decl(i4b);
cdev_decl(i4bctl);
cdev_decl(i4btrc);
cdev_decl(i4brbch);
cdev_decl(i4btel);
cdev_decl(isdn);
cdev_decl(isdnctl);
cdev_decl(isdntrc);
cdev_decl(isdnbchan);
cdev_decl(isdntel);
#define ptstty ptytty
#define ptsioctl ptyioctl
#define ptctty ptytty
@ -481,11 +481,11 @@ struct cdevsw cdevsw[] = {
cdev_ugen_init(NUSCANNER,uscanner), /* 76: USB scanner */
cdev_openfirm_init(NOPENFIRM,openfirm), /* 77: openfirmware */
cdev_tty_init(NBICONSDEV,biconsdev), /* 78: bicons pseudo-dev */
cdev_i4b_init(NI4B,i4b), /* 79: i4b main device */
cdev_i4bctl_init(NI4BCTL,i4bctl), /* 80: i4b control device */
cdev_i4brbch_init(NI4BRBCH,i4brbch), /* 81: i4b raw b-channel access */
cdev_i4btrc_init(NI4BTRC,i4btrc), /* 82: i4b trace device */
cdev_i4btel_init(NI4BTEL,i4btel), /* 83: i4b phone device */
cdev_isdn_init(NISDN,isdn), /* 79: isdn main device */
cdev_isdnctl_init(NISDNCTL,isdnctl), /* 80: isdn control device */
cdev_isdnbchan_init(NISDNBCHAN,isdnbchan), /* 81: isdn raw b-channel access */
cdev_isdntrc_init(NISDNTRC,isdntrc), /* 82: isdn trace device */
cdev_isdntel_init(NISDNTEL,isdntel), /* 83: isdn phone device */
cdev_tty_init(NSACOM,sacom), /* 84: SA11x0 serial port */
cdev__oci_init(NMLY,mly), /* 85: Newer Mylex ctrl iface */
cdev__oci_init(NWSFONT,wsfont), /* 86: wsfont pseudo-device */

32
sys/arch/atari/atari/conf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: conf.c,v 1.51 2002/01/12 12:42:17 manu Exp $ */
/* $NetBSD: conf.c,v 1.52 2002/03/16 16:55:54 martin Exp $ */
/*
* Copyright (c) 1991 The Regents of the University of California.
@ -113,16 +113,16 @@ int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
#define cdev_et_init(c,n) cdev__ocrwim_init(c,n)
#define cdev_leo_init(c,n) cdev__ocrwim_init(c,n)
#include "i4b.h"
#include "i4bctl.h"
#include "i4btrc.h"
#include "i4brbch.h"
#include "i4btel.h"
cdev_decl(i4b);
cdev_decl(i4bctl);
cdev_decl(i4btrc);
cdev_decl(i4brbch);
cdev_decl(i4btel);
#include "isdn.h"
#include "isdnctl.h"
#include "isdntrc.h"
#include "isdnbchan.h"
#include "isdntel.h"
cdev_decl(isdn);
cdev_decl(isdnctl);
cdev_decl(isdntrc);
cdev_decl(isdnbchan);
cdev_decl(isdntel);
#include "audio.h"
#include "bpfilter.h"
@ -240,11 +240,11 @@ struct cdevsw cdevsw[] =
wsdisplay), /* 41: wscons placeholder */
cdev_audio_init(NAUDIO,audio), /* 42 */
cdev_notdef(), /* 43 */
cdev_i4b_init(NI4B, i4b), /* 44: i4b main device */
cdev_i4bctl_init(NI4BCTL, i4bctl), /* 45: i4b control device */
cdev_i4brbch_init(NI4BRBCH, i4brbch), /* 46: i4b raw b-channel access */
cdev_i4btrc_init(NI4BTRC, i4btrc), /* 47: i4b trace device */
cdev_i4btel_init(NI4BTEL, i4btel), /* 48: i4b phone device */
cdev_isdn_init(NISDN, isdn), /* 44: isdn main device */
cdev_isdnctl_init(NISDNCTL, isdnctl), /* 45: isdn control device */
cdev_isdnbchan_init(NISDNBCHAN, isdnbchan), /* 46: isdn raw b-channel access */
cdev_isdntrc_init(NISDNTRC, isdntrc), /* 47: isdn trace device */
cdev_isdntel_init(NISDNTEL, isdntel), /* 48: isdn phone device */
cdev_scsibus_init(NSCSIBUS,scsibus), /* 49: SCSI bus */
cdev_disk_init(NRAID,raid), /* 50: RAIDframe disk driver */
cdev_svr4_net_init(NSVR4_NET,svr4_net), /* 51: svr4 net pseudo-device */

32
sys/arch/bebox/bebox/conf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: conf.c,v 1.16 2002/01/12 12:56:39 manu Exp $ */
/* $NetBSD: conf.c,v 1.17 2002/03/16 16:55:54 martin Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -96,16 +96,16 @@ struct bdevsw bdevsw[] =
};
int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
#include "i4b.h"
#include "i4bctl.h"
#include "i4btrc.h"
#include "i4brbch.h"
#include "i4btel.h"
cdev_decl(i4b);
cdev_decl(i4bctl);
cdev_decl(i4btrc);
cdev_decl(i4brbch);
cdev_decl(i4btel);
#include "isdn.h"
#include "isdnctl.h"
#include "isdntrc.h"
#include "isdnbchan.h"
#include "isdntel.h"
cdev_decl(isdn);
cdev_decl(isdnctl);
cdev_decl(isdntrc);
cdev_decl(isdnbchan);
cdev_decl(isdntel);
cdev_decl(cn);
cdev_decl(ctty);
@ -250,11 +250,11 @@ struct cdevsw cdevsw[] =
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 */
cdev_i4b_init(NI4B, i4b), /* 53: i4b main device */
cdev_i4bctl_init(NI4BCTL, i4bctl), /* 54: i4b control device */
cdev_i4brbch_init(NI4BRBCH, i4brbch), /* 55: i4b raw b-channel access */
cdev_i4btrc_init(NI4BTRC, i4btrc), /* 56: i4b trace device */
cdev_i4btel_init(NI4BTEL, i4btel), /* 57: i4b phone device */
cdev_isdn_init(NISDN, isdn), /* 53: isdn main device */
cdev_isdnctl_init(NISDNCTL, isdnctl), /* 54: isdn control device */
cdev_isdnbchan_init(NISDNBCHAN, isdnbchan), /* 55: isdn raw b-channel access */
cdev_isdntrc_init(NISDNTRC, isdntrc), /* 56: isdn trace device */
cdev_isdntel_init(NISDNTEL, isdntel), /* 57: isdn phone device */
cdev_clockctl_init(NCLOCKCTL, clockctl),/* 58: clockctl pseudo device */
};

32
sys/arch/cobalt/cobalt/conf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: conf.c,v 1.12 2002/01/12 13:00:46 manu Exp $ */
/* $NetBSD: conf.c,v 1.13 2002/03/16 16:55:54 martin Exp $ */
/*
* Copyright (c) 1992, 1993
@ -73,16 +73,16 @@ cdev_decl(scsibus);
cdev_decl(ses);
#include "ld.h"
#include "i4b.h"
#include "i4bctl.h"
#include "i4btrc.h"
#include "i4brbch.h"
#include "i4btel.h"
cdev_decl(i4b);
cdev_decl(i4bctl);
cdev_decl(i4btrc);
cdev_decl(i4brbch);
cdev_decl(i4btel);
#include "isdn.h"
#include "isdnctl.h"
#include "isdntrc.h"
#include "isdnbchan.h"
#include "isdntel.h"
cdev_decl(isdn);
cdev_decl(isdnctl);
cdev_decl(isdntrc);
cdev_decl(isdnbchan);
cdev_decl(isdntel);
#include "clockctl.h"
cdev_decl(clockctl);
@ -147,11 +147,11 @@ struct cdevsw cdevsw[] =
cdev_ses_init(NSES,ses), /* 25: SCSI SES/SAF-TE */
cdev_tty_init(NCOM,com), /* 26: com serial port */
cdev_disk_init(NLD,ld), /* 27: logical disk driver */
cdev_i4b_init(NI4B, i4b), /* 28: i4b main device */
cdev_i4bctl_init(NI4BCTL, i4bctl), /* 29: i4b control device */
cdev_i4brbch_init(NI4BRBCH, i4brbch), /* 30: i4b raw b-channel access */
cdev_i4btrc_init(NI4BTRC, i4btrc), /* 31: i4b trace device */
cdev_i4btel_init(NI4BTEL, i4btel), /* 32: i4b phone device */
cdev_isdn_init(NISDN, isdn), /* 28: isdn main device */
cdev_isdnctl_init(NISDNCTL, isdnctl), /* 29: isdn control device */
cdev_isdnbchan_init(NISDNBCHAN, isdnbchan), /* 30: isdn raw b-channel access */
cdev_isdntrc_init(NISDNTRC, isdntrc), /* 31: isdn trace device */
cdev_isdntel_init(NISDNTEL, isdntel), /* 32: isdn phone device */
cdev_clockctl_init(NCLOCKCTL, clockctl),/* 33: clockctl pseudo device */
};

34
sys/arch/evbmips/malta/conf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: conf.c,v 1.1 2002/03/07 14:44:03 simonb Exp $ */
/* $NetBSD: conf.c,v 1.2 2002/03/16 16:55:55 martin Exp $ */
/*
* Copyright (c) 1992, 1993
@ -38,7 +38,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: conf.c,v 1.1 2002/03/07 14:44:03 simonb Exp $");
__KERNEL_RCSID(0, "$NetBSD: conf.c,v 1.2 2002/03/16 16:55:55 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -242,16 +242,16 @@ cdev_decl(urio);
#include "uscanner.h"
cdev_decl(uscanner);
#include "i4b.h"
#include "i4bctl.h"
#include "i4btrc.h"
#include "i4brbch.h"
#include "i4btel.h"
cdev_decl(i4b);
cdev_decl(i4bctl);
cdev_decl(i4btrc);
cdev_decl(i4brbch);
cdev_decl(i4btel);
#include "isdn.h"
#include "isdnctl.h"
#include "isdntrc.h"
#include "isdnbchan.h"
#include "isdntel.h"
cdev_decl(isdn);
cdev_decl(isdnctl);
cdev_decl(isdntrc);
cdev_decl(isdnbchan);
cdev_decl(isdntel);
#include <altq/altqconf.h>
@ -316,11 +316,11 @@ struct cdevsw cdevsw[] =
cdev_ugen_init(NUGEN,ugen), /* 48: USB generic driver */
cdev_midi_init(NMIDI,midi), /* 49: MIDI I/O */
cdev_midi_init(NSEQUENCER,sequencer), /* 50: sequencer I/O */
cdev_i4b_init(NI4B, i4b), /* 51: i4b main device */
cdev_i4bctl_init(NI4BCTL, i4bctl), /* 52: i4b control device */
cdev_i4brbch_init(NI4BRBCH, i4brbch), /* 53: i4b raw b-chnl access */
cdev_i4btrc_init(NI4BTRC, i4btrc), /* 54: i4b trace device */
cdev_i4btel_init(NI4BTEL, i4btel), /* 55: i4b phone device */
cdev_isdn_init(NISDN, isdn), /* 51: isdn main device */
cdev_isdnctl_init(NISDNCTL, isdnctl), /* 52: isdn control device */
cdev_isdnbchan_init(NISDNBCHAN, isdnbchan), /* 53: isdn raw b-chnl access */
cdev_isdntrc_init(NISDNTRC, isdntrc), /* 54: isdn trace device */
cdev_isdntel_init(NISDNTEL, isdntel), /* 55: isdn phone device */
cdev_mouse_init(NWSMUX, wsmux), /* 56: ws multiplexor */
cdev_tty_init(NUCOM, ucom), /* 57: USB tty */
cdev_ses_init(NSES,ses), /* 58: SCSI SES/SAF-TE */

32
sys/arch/hpcmips/hpcmips/conf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: conf.c,v 1.15 2002/01/12 13:16:54 manu Exp $ */
/* $NetBSD: conf.c,v 1.16 2002/03/16 16:55:55 martin Exp $ */
/*
* Copyright (c) 1992, 1993
@ -169,16 +169,16 @@ cdev_decl(urio);
#include "uscanner.h"
cdev_decl(uscanner);
#include "i4b.h"
#include "i4bctl.h"
#include "i4btrc.h"
#include "i4brbch.h"
#include "i4btel.h"
cdev_decl(i4b);
cdev_decl(i4bctl);
cdev_decl(i4btrc);
cdev_decl(i4brbch);
cdev_decl(i4btel);
#include "isdn.h"
#include "isdnctl.h"
#include "isdntrc.h"
#include "isdnbchan.h"
#include "isdntel.h"
cdev_decl(isdn);
cdev_decl(isdnctl);
cdev_decl(isdntrc);
cdev_decl(isdnbchan);
cdev_decl(isdntel);
#include "rnd.h"
@ -234,11 +234,11 @@ struct cdevsw cdevsw[] =
cdev_mouse_init(NWSMUX, wsmux), /* 38: ws multiplexor */
cdev_usbdev_init(NURIO,urio), /* 39: Diamond Rio 500 */
cdev_ugen_init(NUSCANNER,uscanner),/* 40: USB scanner */
cdev_i4b_init(NI4B, i4b), /* 41: i4b main device */
cdev_i4bctl_init(NI4BCTL, i4bctl), /* 42: i4b control device */
cdev_i4brbch_init(NI4BRBCH, i4brbch), /* 43: i4b raw b-channel access */
cdev_i4btrc_init(NI4BTRC, i4btrc), /* 44: i4b trace device */
cdev_i4btel_init(NI4BTEL, i4btel), /* 45: i4b phone device */
cdev_isdn_init(NISDN, isdn), /* 41: isdn main device */
cdev_isdnctl_init(NISDNCTL, isdnctl), /* 42: isdn control device */
cdev_isdnbchan_init(NISDNBCHAN, isdnbchan), /* 43: isdn raw b-channel access */
cdev_isdntrc_init(NISDNTRC, isdntrc), /* 44: isdn trace device */
cdev_isdntel_init(NISDNTEL, isdntel), /* 45: isdn phone device */
cdev_clockctl_init(NCLOCKCTL, clockctl),/* 46: clockctl pseudo device */
};

16
sys/arch/i386/conf/GENERIC_ISDN
View File

@ -1,4 +1,4 @@
# $NetBSD: GENERIC_ISDN,v 1.6 2002/01/21 12:31:42 martin Exp $
# $NetBSD: GENERIC_ISDN,v 1.7 2002/03/16 16:55:55 martin Exp $
#
# GENERIC kernel with all supported ISDN devices and drivers
@ -67,12 +67,12 @@ isic* at pcmcia? function ?
# ISDN user land devices, drivers and pseudo-devices.
#---------------------------------------------------------------------
#
pseudo-device i4b # communication with userland daemon
pseudo-device i4btrc 2 # userland driver to do ISDN tracing
pseudo-device i4bctl # userland driver to control the whole thing
pseudo-device i4brbch 4 # userland driver for access to raw B channel
pseudo-device i4btel 2 # userland driver for telephony
pseudo-device isdn # communication with userland daemon
pseudo-device isdntrc 2 # userland driver to do ISDN tracing
pseudo-device isdnctl # userland driver to control the whole thing
pseudo-device isdnbchan 4 # userland driver for access to raw B channel
pseudo-device isdntel 2 # userland driver for telephony
options IPR_VJ # compile support for VJ compression
pseudo-device i4bipr 2 # network driver for IP over raw HDLC ISDN
pseudo-device i4bisppp 2 # synchronous PPP over ISDN
pseudo-device irip 2 # network driver for IP over raw HDLC ISDN
pseudo-device ippp 2 # synchronous PPP over ISDN
#---------------------------------------------------------------------

34
sys/arch/i386/i386/conf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: conf.c,v 1.153 2002/01/12 13:23:47 manu Exp $ */
/* $NetBSD: conf.c,v 1.154 2002/03/16 16:55:56 martin Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: conf.c,v 1.153 2002/01/12 13:23:47 manu Exp $");
__KERNEL_RCSID(0, "$NetBSD: conf.c,v 1.154 2002/03/16 16:55:56 martin Exp $");
#include "opt_compat_svr4.h"
@ -222,16 +222,16 @@ cdev_decl(irframe);
#include "cir.h"
cdev_decl(cir);
#include "i4b.h"
#include "i4bctl.h"
#include "i4btrc.h"
#include "i4brbch.h"
#include "i4btel.h"
cdev_decl(i4b);
cdev_decl(i4bctl);
cdev_decl(i4btrc);
cdev_decl(i4brbch);
cdev_decl(i4btel);
#include "isdn.h"
#include "isdnctl.h"
#include "isdntrc.h"
#include "isdnbchan.h"
#include "isdntel.h"
cdev_decl(isdn);
cdev_decl(isdnctl);
cdev_decl(isdntrc);
cdev_decl(isdnbchan);
cdev_decl(isdntel);
/* open, close, read, write, ioctl, mmap */
#define cdev_vmegen_init(c,n) cdev__ocrwim_init(c,n)
@ -320,11 +320,11 @@ struct cdevsw cdevsw[] =
cdev_mouse_init(NWSKBD, wskbd), /* 48: keyboards */
cdev_mouse_init(NWSMOUSE,
wsmouse), /* 49: mice */
cdev_i4b_init(NI4B, i4b), /* 50: i4b main device */
cdev_i4bctl_init(NI4BCTL, i4bctl), /* 51: i4b control device */
cdev_i4brbch_init(NI4BRBCH, i4brbch), /* 52: i4b raw b-channel access */
cdev_i4btrc_init(NI4BTRC, i4btrc), /* 53: i4b trace device */
cdev_i4btel_init(NI4BTEL, i4btel), /* 54: i4b phone device */
cdev_isdn_init(NISDN, isdn), /* 50: isdn main device */
cdev_isdnctl_init(NISDNCTL, isdnctl), /* 51: isdn control device */
cdev_isdnbchan_init(NISDNBCHAN, isdnbchan), /* 52: isdn raw b-channel access */
cdev_isdntrc_init(NISDNTRC, isdntrc), /* 53: isdn trace device */
cdev_isdntel_init(NISDNTEL, isdntel), /* 54: isdn phone device */
cdev_usb_init(NUSB,usb), /* 55: USB controller */
cdev_usbdev_init(NUHID,uhid), /* 56: USB generic HID */
cdev_lpt_init(NULPT,ulpt), /* 57: USB printer */

32
sys/arch/macppc/macppc/conf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: conf.c,v 1.37 2002/03/03 07:02:54 nathanw Exp $ */
/* $NetBSD: conf.c,v 1.38 2002/03/16 16:55:56 martin Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -163,16 +163,16 @@ cdev_decl(cy);
#include "openfirm.h"
cdev_decl(openfirm);
#include "i4b.h"
#include "i4bctl.h"
#include "i4btrc.h"
#include "i4brbch.h"
#include "i4btel.h"
cdev_decl(i4b);
cdev_decl(i4bctl);
cdev_decl(i4btrc);
cdev_decl(i4brbch);
cdev_decl(i4btel);
#include "isdn.h"
#include "isdnctl.h"
#include "isdntrc.h"
#include "isdnbchan.h"
#include "isdntel.h"
cdev_decl(isdn);
cdev_decl(isdnctl);
cdev_decl(isdntrc);
cdev_decl(isdnbchan);
cdev_decl(isdntel);
#include "clockctl.h"
cdev_decl(clockctl);
@ -234,11 +234,11 @@ struct cdevsw cdevsw[] = {
cdev_usbdev_init(NURIO,urio), /* 51: Diamond Rio 500 */
cdev_ugen_init(NUSCANNER,uscanner),/* 52: USB scanner */
cdev_openfirm_init(NOPENFIRM,openfirm), /* 53: /dev/openfirm */
cdev_i4b_init(NI4B, i4b), /* 54: i4b main device */
cdev_i4bctl_init(NI4BCTL, i4bctl), /* 55: i4b control device */
cdev_i4brbch_init(NI4BRBCH, i4brbch), /* 56: i4b raw b-channel access */
cdev_i4btrc_init(NI4BTRC, i4btrc), /* 57: i4b trace device */
cdev_i4btel_init(NI4BTEL, i4btel), /* 58: i4b phone device */
cdev_isdn_init(NISDN, isdn), /* 54: isdn main device */
cdev_isdnctl_init(NISDNCTL, isdnctl), /* 55: isdn control device */
cdev_isdnbchan_init(NISDNBCHAN, isdnbchan), /* 56: isdn raw b-channel access */
cdev_isdntrc_init(NISDNTRC, isdntrc), /* 57: isdn trace device */
cdev_isdntel_init(NISDNTEL, isdntel), /* 58: isdn phone device */
cdev_disk_init(NLD,ld), /* 59: logical disk driver */
cdev_pci_init(NPCI,pci), /* 60: PCI bus access device */
cdev_clockctl_init(NCLOCKCTL, clockctl),/* 61: settimeofday driver */

32
sys/arch/mvmeppc/mvmeppc/conf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: conf.c,v 1.1 2002/02/27 21:02:23 scw Exp $ */
/* $NetBSD: conf.c,v 1.2 2002/03/16 16:55:57 martin Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -100,16 +100,16 @@ struct bdevsw bdevsw[] =
};
int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
#include "i4b.h"
#include "i4bctl.h"
#include "i4btrc.h"
#include "i4brbch.h"
#include "i4btel.h"
cdev_decl(i4b);
cdev_decl(i4bctl);
cdev_decl(i4btrc);
cdev_decl(i4brbch);
cdev_decl(i4btel);
#include "isdn.h"
#include "isdnctl.h"
#include "isdntrc.h"
#include "isdnbchan.h"
#include "isdntel.h"
cdev_decl(isdn);
cdev_decl(isdnctl);
cdev_decl(isdntrc);
cdev_decl(isdnbchan);
cdev_decl(isdntel);
cdev_decl(cn);
cdev_decl(ctty);
@ -251,11 +251,11 @@ struct cdevsw cdevsw[] =
cdev_scsibus_init(NSCSIBUS,scsibus), /* 50: SCSI bus */
cdev_disk_init(NRAID,raid), /* 51: RAIDframe disk driver */
cdev_notdef(), /* 52: Resvd: ws multiplexor */
cdev_i4b_init(NI4B, i4b), /* 53: i4b main device */
cdev_i4bctl_init(NI4BCTL, i4bctl), /* 54: i4b control device */
cdev_i4brbch_init(NI4BRBCH, i4brbch), /* 55: i4b raw b-channel access */
cdev_i4btrc_init(NI4BTRC, i4btrc), /* 56: i4b trace device */
cdev_i4btel_init(NI4BTEL, i4btel), /* 57: i4b phone device */
cdev_isdn_init(NISDN, isdn), /* 53: isdn main device */
cdev_isdnctl_init(NISDNCTL, isdnctl), /* 54: isdn control device */
cdev_isdnbchan_init(NISDNBCHAN, isdnbchan), /* 55: isdn raw b-channel access */
cdev_isdntrc_init(NISDNTRC, isdntrc), /* 56: isdn trace device */
cdev_isdntel_init(NISDNTEL, isdntel), /* 57: isdn phone device */
cdev_clockctl_init(NCLOCKCTL, clockctl),/* 58: clockctl pseudo device */
};

32
sys/arch/prep/prep/conf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: conf.c,v 1.8 2002/01/12 15:02:22 manu Exp $ */
/* $NetBSD: conf.c,v 1.9 2002/03/16 16:55:57 martin Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -172,16 +172,16 @@ cdev_decl(wsfont);
#include "scsibus.h"
cdev_decl(scsibus);
#include "i4b.h"
#include "i4bctl.h"
#include "i4btrc.h"
#include "i4brbch.h"
#include "i4btel.h"
cdev_decl(i4b);
cdev_decl(i4bctl);
cdev_decl(i4btrc);
cdev_decl(i4brbch);
cdev_decl(i4btel);
#include "isdn.h"
#include "isdnctl.h"
#include "isdntrc.h"
#include "isdnbchan.h"
#include "isdntel.h"
cdev_decl(isdn);
cdev_decl(isdnctl);
cdev_decl(isdntrc);
cdev_decl(isdnbchan);
cdev_decl(isdntel);
#include "pci.h"
cdev_decl(pci);
@ -259,11 +259,11 @@ struct cdevsw cdevsw[] =
cdev_notdef(), /* 63 */
cdev_notdef(), /* 64 */
cdev_mouse_init(NWSMUX, wsmux), /* 65: ws multiplexor */
cdev_i4b_init(NI4B, i4b), /* 66: i4b main device */
cdev_i4bctl_init(NI4BCTL, i4bctl), /* 67: i4b control device */
cdev_i4brbch_init(NI4BRBCH, i4brbch), /* 68: i4b raw b-channel access */
cdev_i4btrc_init(NI4BTRC, i4btrc), /* 69: i4b trace device */
cdev_i4btel_init(NI4BTEL, i4btel), /* 70: i4b phone device */
cdev_isdn_init(NISDN, isdn), /* 66: isdn main device */
cdev_isdnctl_init(NISDNCTL, isdnctl), /* 67: isdn control device */
cdev_isdnbchan_init(NISDNBCHAN, isdnbchan), /* 68: isdn raw b-channel access */
cdev_isdntrc_init(NISDNTRC, isdntrc), /* 69: isdn trace device */
cdev_isdntel_init(NISDNTEL, isdntel), /* 70: isdn phone device */
cdev__oci_init(NWSFONT,wsfont), /* 71: wsfont pseudo-device */
cdev_pci_init(NPCI,pci), /* 72: PCI bus access device */
cdev_clockctl_init(NCLOCKCTL, clockctl),/* 73: clockctl pseudo device */

32
sys/arch/sandpoint/sandpoint/conf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: conf.c,v 1.6 2002/01/12 15:03:58 manu Exp $ */
/* $NetBSD: conf.c,v 1.7 2002/03/16 16:55:57 martin Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -96,16 +96,16 @@ struct bdevsw bdevsw[] =
};
int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
#include "i4b.h"
#include "i4bctl.h"
#include "i4btrc.h"
#include "i4brbch.h"
#include "i4btel.h"
cdev_decl(i4b);
cdev_decl(i4bctl);
cdev_decl(i4btrc);
cdev_decl(i4brbch);
cdev_decl(i4btel);
#include "isdn.h"
#include "isdnctl.h"
#include "isdntrc.h"
#include "isdnbchan.h"
#include "isdntel.h"
cdev_decl(isdn);
cdev_decl(isdnctl);
cdev_decl(isdntrc);
cdev_decl(isdnbchan);
cdev_decl(isdntel);
cdev_decl(cn);
cdev_decl(ctty);
@ -247,11 +247,11 @@ struct cdevsw cdevsw[] =
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 */
cdev_i4b_init(NI4B, i4b), /* 53: i4b main device */
cdev_i4bctl_init(NI4BCTL, i4bctl), /* 54: i4b control device */
cdev_i4brbch_init(NI4BRBCH, i4brbch), /* 55: i4b raw b-channel access */
cdev_i4btrc_init(NI4BTRC, i4btrc), /* 56: i4b trace device */
cdev_i4btel_init(NI4BTEL, i4btel), /* 57: i4b phone device */
cdev_isdn_init(NISDN, isdn), /* 53: isdn main device */
cdev_isdnctl_init(NISDNCTL, isdnctl), /* 54: isdn control device */
cdev_isdnbchan_init(NISDNBCHAN, isdnbchan), /* 55: isdn raw b-channel access */
cdev_isdntrc_init(NISDNTRC, isdntrc), /* 56: isdn trace device */
cdev_isdntel_init(NISDNTEL, isdntel), /* 57: isdn phone device */
cdev_clockctl_init(NCLOCKCTL, clockctl),/* 58: clockctl pseudo device */
};

34
sys/arch/sbmips/sbmips/conf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: conf.c,v 1.1 2002/03/06 02:13:50 simonb Exp $ */
/* $NetBSD: conf.c,v 1.2 2002/03/16 16:55:58 martin Exp $ */
/*
* Copyright (c) 1992, 1993
@ -38,7 +38,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: conf.c,v 1.1 2002/03/06 02:13:50 simonb Exp $");
__KERNEL_RCSID(0, "$NetBSD: conf.c,v 1.2 2002/03/16 16:55:58 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -252,16 +252,16 @@ cdev_decl(urio);
#include "uscanner.h"
cdev_decl(uscanner);
#include "i4b.h"
#include "i4bctl.h"
#include "i4btrc.h"
#include "i4brbch.h"
#include "i4btel.h"
cdev_decl(i4b);
cdev_decl(i4bctl);
cdev_decl(i4btrc);
cdev_decl(i4brbch);
cdev_decl(i4btel);
#include "isdn.h"
#include "isdnctl.h"
#include "isdntrc.h"
#include "isdnbchan.h"
#include "isdntel.h"
cdev_decl(isdn);
cdev_decl(isdnctl);
cdev_decl(isdntrc);
cdev_decl(isdnbchan);
cdev_decl(isdntel);
#include <altq/altqconf.h>
@ -334,11 +334,11 @@ struct cdevsw cdevsw[] =
cdev_ugen_init(NUGEN,ugen), /* 48: USB generic driver */
cdev_midi_init(NMIDI,midi), /* 49: MIDI I/O */
cdev_midi_init(NSEQUENCER,sequencer), /* 50: sequencer I/O */
cdev_i4b_init(NI4B, i4b), /* 51: i4b main device */
cdev_i4bctl_init(NI4BCTL, i4bctl), /* 52: i4b control device */
cdev_i4brbch_init(NI4BRBCH, i4brbch), /* 53: i4b raw b-chnl access */
cdev_i4btrc_init(NI4BTRC, i4btrc), /* 54: i4b trace device */
cdev_i4btel_init(NI4BTEL, i4btel), /* 55: i4b phone device */
cdev_isdn_init(NISDN, isdn), /* 51: isdn main device */
cdev_isdnctl_init(NISDNCTL, isdnctl), /* 52: isdn control device */
cdev_isdnbchan_init(NISDNBCHAN, isdnbchan), /* 53: isdn raw b-chnl access */
cdev_isdntrc_init(NISDNTRC, isdntrc), /* 54: isdn trace device */
cdev_isdntel_init(NISDNTEL, isdntel), /* 55: isdn phone device */
cdev_mouse_init(NWSMUX, wsmux), /* 56: ws multiplexor */
cdev_tty_init(NUCOM, ucom), /* 57: USB tty */
cdev_ses_init(NSES,ses), /* 58: SCSI SES/SAF-TE */

32
sys/arch/sgimips/sgimips/conf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: conf.c,v 1.14 2002/03/15 17:29:06 manu Exp $ */
/* $NetBSD: conf.c,v 1.15 2002/03/16 16:55:58 martin Exp $ */
/*
* Copyright (c) 1992, 1993
@ -85,16 +85,16 @@ cdev_decl(wsmux);
#include "wsfont.h"
cdev_decl(wsfont);
#include "i4b.h"
#include "i4bctl.h"
#include "i4btrc.h"
#include "i4brbch.h"
#include "i4btel.h"
cdev_decl(i4b);
cdev_decl(i4bctl);
cdev_decl(i4btrc);
cdev_decl(i4brbch);
cdev_decl(i4btel);
#include "isdn.h"
#include "isdnctl.h"
#include "isdntrc.h"
#include "isdnbchan.h"
#include "isdntel.h"
cdev_decl(isdn);
cdev_decl(isdnctl);
cdev_decl(isdntrc);
cdev_decl(isdnbchan);
cdev_decl(isdntel);
cdev_decl(arcbios_tty);
@ -178,11 +178,11 @@ struct cdevsw cdevsw[] =
cdev_tty_init(NZSTTY,zs), /* 35: Zilog 8530 serial port */
cdev_tty_init(NCOM,com), /* 36: com serial port */
cdev_tty_init(1,arcbios_tty), /* 37: ARCS PROM console */
cdev_i4b_init(NI4B, i4b), /* 38: i4b main device */
cdev_i4bctl_init(NI4BCTL, i4bctl), /* 39: i4b control device */
cdev_i4brbch_init(NI4BRBCH, i4brbch), /* 40: i4b raw b-channel access */
cdev_i4btrc_init(NI4BTRC, i4btrc), /* 41: i4b trace device */
cdev_i4btel_init(NI4BTEL, i4btel), /* 42: i4b phone device */
cdev_isdn_init(NISDN, isdn), /* 38: isdn main device */
cdev_isdnctl_init(NISDNCTL, isdnctl), /* 39: isdn control device */
cdev_isdnbchan_init(NISDNBCHAN, isdnbchan), /* 40: isdn raw b-channel access */
cdev_isdntrc_init(NISDNTRC, isdntrc), /* 41: isdn trace device */
cdev_isdntel_init(NISDNTEL, isdntel), /* 42: isdn phone device */
cdev_svr4_net_init(NSVR4_NET,svr4_net), /* 43: svr4 net pseudo-device */
cdev_notdef(), /* 44: */
cdev_notdef(), /* 45: */

32
sys/arch/sparc/sparc/conf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: conf.c,v 1.73 2002/01/12 15:07:37 manu Exp $ */
/* $NetBSD: conf.c,v 1.74 2002/03/16 16:55:59 martin Exp $ */
/*
* Copyright (c) 1992, 1993
@ -107,16 +107,16 @@ cdev_decl(ses);
#include "vcoda.h"
cdev_decl(vc_nb_);
#include "i4b.h"
#include "i4bctl.h"
#include "i4btrc.h"
#include "i4brbch.h"
#include "i4btel.h"
cdev_decl(i4b);
cdev_decl(i4bctl);
cdev_decl(i4btrc);
cdev_decl(i4brbch);
cdev_decl(i4btel);
#include "isdn.h"
#include "isdnctl.h"
#include "isdntrc.h"
#include "isdnbchan.h"
#include "isdntel.h"
cdev_decl(isdn);
cdev_decl(isdnctl);
cdev_decl(isdntrc);
cdev_decl(isdnbchan);
cdev_decl(isdntel);
#include "pci.h"
cdev_decl(pci);
@ -229,11 +229,11 @@ struct cdevsw cdevsw[] =
cdev__ocrwip_init(NAUDIO,audio), /* 69: /dev/audio */
cdev_openprom_init(1,openprom), /* 70: /dev/openprom */
cdev_tctrl_init(NTCTRL,tctrl), /* 71: /dev/tctrl */
cdev_i4b_init(NI4B, i4b), /* 72: i4b main device */
cdev_i4bctl_init(NI4BCTL, i4bctl), /* 73: i4b control device */
cdev_i4brbch_init(NI4BRBCH, i4brbch), /* 74: i4b raw b-channel access */
cdev_i4btrc_init(NI4BTRC, i4btrc), /* 75: i4b trace device */
cdev_i4btel_init(NI4BTEL, i4btel), /* 76: i4b phone device */
cdev_isdn_init(NISDN, isdn), /* 72: isdn main device */
cdev_isdnctl_init(NISDNCTL, isdnctl), /* 73: isdn control device */
cdev_isdnbchan_init(NISDNBCHAN, isdnbchan), /* 74: isdn raw b-channel access */
cdev_isdntrc_init(NISDNTRC, isdntrc), /* 75: isdn trace device */
cdev_isdntel_init(NISDNTEL, isdntel), /* 76: isdn phone device */
cdev_notdef(), /* 77 */
cdev_notdef(), /* 78 */
cdev_notdef(), /* 79 */

32
sys/arch/sparc64/sparc64/conf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: conf.c,v 1.20 2002/01/12 15:12:54 manu Exp $ */
/* $NetBSD: conf.c,v 1.21 2002/03/16 16:55:59 martin Exp $ */
/*
* Copyright (c) 1992, 1993
@ -107,16 +107,16 @@ cdev_decl(ses);
#include "vcoda.h"
cdev_decl(vc_nb_);
#include "i4b.h"
#include "i4bctl.h"
#include "i4btrc.h"
#include "i4brbch.h"
#include "i4btel.h"
cdev_decl(i4b);
cdev_decl(i4bctl);
cdev_decl(i4btrc);
cdev_decl(i4brbch);
cdev_decl(i4btel);
#include "isdn.h"
#include "isdnctl.h"
#include "isdntrc.h"
#include "isdnbchan.h"
#include "isdntel.h"
cdev_decl(isdn);
cdev_decl(isdnctl);
cdev_decl(isdntrc);
cdev_decl(isdnbchan);
cdev_decl(isdntel);
#include "pci.h"
cdev_decl(pci);
@ -229,11 +229,11 @@ struct cdevsw cdevsw[] =
cdev__ocrwip_init(NAUDIO,audio), /* 69: /dev/audio */
cdev_openprom_init(1,openprom), /* 70: /dev/openprom */
cdev_notdef(), /* 71 */
cdev_i4b_init(NI4B, i4b), /* 72: i4b main device */
cdev_i4bctl_init(NI4BCTL, i4bctl), /* 73: i4b control device */
cdev_i4brbch_init(NI4BRBCH, i4brbch), /* 74: i4b raw b-channel access */
cdev_i4btrc_init(NI4BTRC, i4btrc), /* 75: i4b trace device */
cdev_i4btel_init(NI4BTEL, i4btel), /* 76: i4b phone device */
cdev_isdn_init(NISDN, isdn), /* 72: isdn main device */
cdev_isdnctl_init(NISDNCTL, isdnctl), /* 73: isdn control device */
cdev_isdnbchan_init(NISDNBCHAN, isdnbchan), /* 74: isdn raw b-channel access */
cdev_isdntrc_init(NISDNTRC, isdntrc), /* 75: isdn trace device */
cdev_isdntel_init(NISDNTEL, isdntel), /* 76: isdn phone device */
cdev_notdef(), /* 77 */
cdev_notdef(), /* 78 */
cdev_notdef(), /* 79 */

32
sys/arch/walnut/walnut/conf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: conf.c,v 1.2 2002/01/12 15:18:13 manu Exp $ */
/* $NetBSD: conf.c,v 1.3 2002/03/16 16:56:00 martin Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@ -123,16 +123,16 @@ cdev_decl(com);
#include "cy.h"
cdev_decl(cy);
#include "i4b.h"
#include "i4bctl.h"
#include "i4btrc.h"
#include "i4brbch.h"
#include "i4btel.h"
cdev_decl(i4b);
cdev_decl(i4bctl);
cdev_decl(i4btrc);
cdev_decl(i4brbch);
cdev_decl(i4btel);
#include "isdn.h"
#include "isdnctl.h"
#include "isdntrc.h"
#include "isdnbchan.h"
#include "isdntel.h"
cdev_decl(isdn);
cdev_decl(isdnctl);
cdev_decl(isdntrc);
cdev_decl(isdnbchan);
cdev_decl(isdntel);
#include "clockctl.h"
cdev_decl(clockctl);
@ -191,11 +191,11 @@ struct cdevsw cdevsw[] = {
cdev_notdef(),
cdev_notdef(),
cdev_notdef(),
cdev_i4b_init(NI4B, i4b), /* 54: i4b main device */
cdev_i4bctl_init(NI4BCTL, i4bctl), /* 55: i4b control device */
cdev_i4brbch_init(NI4BRBCH, i4brbch), /* 56: i4b raw b-channel access */
cdev_i4btrc_init(NI4BTRC, i4btrc), /* 57: i4b trace device */
cdev_i4btel_init(NI4BTEL, i4btel), /* 58: i4b phone device */
cdev_isdn_init(NISDN, isdn), /* 54: isdn main device */
cdev_isdnctl_init(NISDNCTL, isdnctl), /* 55: isdn control device */
cdev_isdnbchan_init(NISDNBCHAN, isdnbchan), /* 56: isdn raw b-channel access */
cdev_isdntrc_init(NISDNTRC, isdntrc), /* 57: isdn trace device */
cdev_isdntel_init(NISDNTEL, isdntel), /* 58: isdn phone device */
cdev_clockctl_init(NCLOCKCTL, clockctl),/* 59: clockctl pseudo device */
};
int nchrdev = sizeof cdevsw / sizeof cdevsw[0];

32
sys/arch/x68k/x68k/conf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: conf.c,v 1.27 2001/12/19 06:38:37 minoura Exp $ */
/* $NetBSD: conf.c,v 1.28 2002/03/16 16:56:00 martin Exp $ */
/*-
* Copyright (c) 1991 The Regents of the University of California.
@ -99,16 +99,16 @@ int nblkdev = sizeof(bdevsw) / sizeof(bdevsw[0]);
#define cdev_pow_init(c,n) cdev__oci_init(c,n)
#define cdev_bell_init(c,n) cdev__oci_init(c,n)
#include "i4b.h"
#include "i4bctl.h"
#include "i4btrc.h"
#include "i4brbch.h"
#include "i4btel.h"
cdev_decl(i4b);
cdev_decl(i4bctl);
cdev_decl(i4btrc);
cdev_decl(i4brbch);
cdev_decl(i4btel);
#include "isdn.h"
#include "isdnctl.h"
#include "isdntrc.h"
#include "isdnbchan.h"
#include "isdntel.h"
cdev_decl(isdn);
cdev_decl(isdnctl);
cdev_decl(isdntrc);
cdev_decl(isdnbchan);
cdev_decl(isdntel);
cdev_decl(cn);
cdev_decl(ctty);
@ -227,11 +227,11 @@ struct cdevsw cdevsw[] =
cdev_scsibus_init(NSCSIBUS,scsibus), /* 40: SCSI bus */
cdev_disk_init(NRAID,raid), /* 41: RAIDframe disk driver */
cdev_svr4_net_init(NSVR4_NET,svr4_net), /* 42: svr4 net pseudo-device */
cdev_i4b_init(NI4B, i4b), /* 43: i4b main device */
cdev_i4bctl_init(NI4BCTL, i4bctl), /* 44: i4b control device */
cdev_i4brbch_init(NI4BRBCH, i4brbch), /* 45: i4b raw b-channel access */
cdev_i4btrc_init(NI4BTRC, i4btrc), /* 46: i4b trace device */
cdev_i4btel_init(NI4BTEL, i4btel), /* 47: i4b phone device */
cdev_isdn_init(NISDN, isdn), /* 43: isdn main device */
cdev_isdnctl_init(NISDNCTL, isdnctl), /* 44: isdn control device */
cdev_isdnbchan_init(NISDNBCHAN, isdnbchan), /* 45: isdn raw b-channel access */
cdev_isdntrc_init(NISDNTRC, isdntrc), /* 46: isdn trace device */
cdev_isdntel_init(NISDNTEL, isdntel), /* 47: isdn phone device */
cdev_clockctl_init(NCLOCKCTL, clockctl), /* 48: settimeofday driver */
};
int nchrdev = sizeof(cdevsw) / sizeof(cdevsw[0]);

32
sys/arch/x86_64/x86_64/conf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: conf.c,v 1.2 2002/01/12 15:19:37 manu Exp $ */
/* $NetBSD: conf.c,v 1.3 2002/03/16 16:56:01 martin Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -200,16 +200,16 @@ cdev_decl(esh_fp);
cdev_decl(scsibus);
#include "bktr.h"
#include "i4b.h"
#include "i4bctl.h"
#include "i4btrc.h"
#include "i4brbch.h"
#include "i4btel.h"
cdev_decl(i4b);
cdev_decl(i4bctl);
cdev_decl(i4btrc);
cdev_decl(i4brbch);
cdev_decl(i4btel);
#include "isdn.h"
#include "isdnctl.h"
#include "isdntrc.h"
#include "isdnbchan.h"
#include "isdntel.h"
cdev_decl(isdn);
cdev_decl(isdnctl);
cdev_decl(isdntrc);
cdev_decl(isdnbchan);
cdev_decl(isdntel);
/* open, close, read, write, ioctl, mmap */
#define cdev_vmegen_init(c,n) { \
@ -298,11 +298,11 @@ struct cdevsw cdevsw[] =
cdev_mouse_init(NWSKBD, wskbd), /* 48: keyboards */
cdev_mouse_init(NWSMOUSE,
wsmouse), /* 49: mice */
cdev_i4b_init(NI4B, i4b), /* 50: i4b main device */
cdev_i4bctl_init(NI4BCTL, i4bctl), /* 51: i4b control device */
cdev_i4brbch_init(NI4BRBCH, i4brbch), /* 52: i4b raw b-channel access */
cdev_i4btrc_init(NI4BTRC, i4btrc), /* 53: i4b trace device */
cdev_i4btel_init(NI4BTEL, i4btel), /* 54: i4b phone device */
cdev_isdn_init(NISDN, isdn), /* 50: isdn main device */
cdev_isdnctl_init(NISDNCTL, isdnctl), /* 51: isdn control device */
cdev_isdnbchan_init(NISDNBCHAN, isdnbchan), /* 52: isdn raw b-channel access */
cdev_isdntrc_init(NISDNTRC, isdntrc), /* 53: isdn trace device */
cdev_isdntel_init(NISDNTEL, isdntel), /* 54: isdn phone device */
cdev_usb_init(NUSB,usb), /* 55: USB controller */
cdev_usbdev_init(NUHID,uhid), /* 56: USB generic HID */
cdev_lpt_init(NULPT,ulpt), /* 57: USB printer */

51
sys/conf/files
View File

@ -1,4 +1,4 @@
# $NetBSD: files,v 1.501 2002/03/10 19:56:48 lukem Exp $
# $NetBSD: files,v 1.502 2002/03/16 16:56:02 martin Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
@ -833,14 +833,13 @@ define bpf_filter
# Attributes used by the ISDN subsystem
#
define isdn # the ISDN subsystem
define isdndev # the ISDN subsystem
define passive_isdn # files needed by passive cards (XXX - protocol
# specific)
define spppi4b # synchronous PPP support
# ISDN cards based on the Siemens ISAC/HSCX chipset (or lookalikes)
#
device isic: isdn, passive_isdn
device isic: isdndev, passive_isdn
file dev/ic/isic.c isic
file dev/ic/isac.c isic
@ -851,7 +850,7 @@ file dev/ic/isic_bchan.c isic
# (old) Diehl active ISDN cards
#
device daic: isdn
device daic: isdndev
file dev/ic/daic.c daic
# legitimate pseudo-devices
@ -889,13 +888,15 @@ defpseudo clockctl
# ISDN userland pseudo devices
#
defpseudo i4btrc: isdn
defpseudo i4brbch: isdn
defpseudo i4btel: isdn
defpseudo i4bipr: isdn
defpseudo i4bisppp: isdn, sppp
defpseudo i4bctl: isdn
defpseudo i4b: isdn
defpseudo isdntrc: isdndev, tty
defpseudo isdnbchan: isdndev, tty
defpseudo isdntel: isdndev, tty
defpseudo isdnctl: isdndev, tty
defpseudo isdn: isdndev, tty
# ISDN network interfaces
defpseudo irip: isdndev, ifnet
defpseudo ippp: isdndev, sppp, ifnet
# kernel sources
#
@ -1207,7 +1208,7 @@ file net/if_strip.c strip needs-count
file net/if_tokensubr.c token needs-flag
file net/if_tun.c tun needs-flag
file net/if_vlan.c vlan needs-flag
file net/if_pppoe.c pppoe needs-count
file net/if_pppoe.c pppoe needs-flag
#file net/net_osdep.c
file net/pfil.c pfil_hooks | ipfilter
file net/ppp-deflate.c ppp & ppp_deflate
@ -1217,7 +1218,7 @@ file net/raw_cb.c
file net/raw_usrreq.c
file net/route.c
file net/rtsock.c
file net/slcompress.c sl | ppp | strip | i4bipr
file net/slcompress.c sl | ppp | strip | irip
file net/zlib.c (ppp & ppp_deflate) | ipsec
file netatalk/aarp.c netatalk
file netatalk/at_control.c netatalk
@ -1458,12 +1459,12 @@ file uvm/uvm_unix.c
file uvm/uvm_user.c
file uvm/uvm_vnode.c
file netisdn/i4b_ctl.c i4bctl needs-flag
file netisdn/i4b_isppp.c i4bisppp needs-count
file netisdn/i4b_ipr.c i4bipr needs-count
file netisdn/i4b_rbch.c i4brbch needs-count
file netisdn/i4b_tel.c i4btel needs-count
file netisdn/i4b_trace.c i4btrc needs-count
file netisdn/i4b_ctl.c isdnctl needs-flag
file netisdn/i4b_isppp.c ippp needs-count
file netisdn/i4b_ipr.c irip needs-count
file netisdn/i4b_rbch.c isdnbchan needs-count
file netisdn/i4b_tel.c isdntel needs-count
file netisdn/i4b_trace.c isdntrc needs-count
file netisdn/i4b_l1l2.c passive_isdn
file netisdn/i4b_mbuf.c passive_isdn
@ -1483,11 +1484,11 @@ file netisdn/i4b_l3fsm.c passive_isdn
file netisdn/i4b_l3timer.c passive_isdn
file netisdn/i4b_l2if.c passive_isdn
file netisdn/i4b_l4if.c passive_isdn
# isdn device driver, interface to i4bd
file netisdn/i4b_i4bdrv.c i4b needs-flag
file netisdn/i4b_l4.c isdn needs-flag
file netisdn/i4b_l4mgmt.c isdn needs-flag
file netisdn/i4b_l4timer.c isdn needs-flag
# isdn device driver, interface to isdnd
file netisdn/i4b_i4bdrv.c isdn needs-flag
file netisdn/i4b_l4.c isdndev needs-flag
file netisdn/i4b_l4mgmt.c isdndev needs-flag
file netisdn/i4b_l4timer.c isdndev needs-flag
# Game adapter (joystick)
device joy

37
sys/netisdn/i4b_ctl.c
View File

@ -27,7 +27,7 @@
* i4b_ctl.c - i4b system control port driver
* ------------------------------------------
*
* $Id: i4b_ctl.c,v 1.5 2001/11/13 01:06:21 lukem Exp $
* $Id: i4b_ctl.c,v 1.6 2002/03/16 16:56:03 martin Exp $
*
* $FreeBSD$
*
@ -36,15 +36,11 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: i4b_ctl.c,v 1.5 2001/11/13 01:06:21 lukem Exp $");
__KERNEL_RCSID(0, "$NetBSD: i4b_ctl.c,v 1.6 2002/03/16 16:56:03 martin Exp $");
#include "i4bctl.h"
#include "isdnctl.h"
#if NI4BCTL > 1
#error "only 1 (one) i4bctl device allowed!"
#endif
#if NI4BCTL > 0
#if NISDNCTL > 0
#include <sys/param.h>
@ -150,10 +146,10 @@ static void *devfs_token;
#ifndef __FreeBSD__
#define PDEVSTATIC /* */
void i4bctlattach __P((void));
int i4bctlopen __P((dev_t dev, int flag, int fmt, struct proc *p));
int i4bctlclose __P((dev_t dev, int flag, int fmt, struct proc *p));
int i4bctlioctl __P((dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p));
void isdnctlattach __P((void));
int isdnctlopen __P((dev_t dev, int flag, int fmt, struct proc *p));
int isdnctlclose __P((dev_t dev, int flag, int fmt, struct proc *p));
int isdnctlioctl __P((dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p));
#endif /* !FreeBSD */
#if BSD > 199306 && defined(__FreeBSD__)
@ -208,14 +204,11 @@ dummy_i4bctlattach(struct device *parent, struct device *self, void *aux)
*---------------------------------------------------------------------------*/
PDEVSTATIC void
#ifdef __FreeBSD__
i4bctlattach(void *dummy)
isdnctlattach(void *dummy)
#else
i4bctlattach()
isdnctlattach()
#endif
{
#ifndef HACK_NO_PSEUDO_ATTACH_MSG
printf("i4bctl: ISDN system control port attached\n");
#endif
#if defined(__FreeBSD__)
#if __FreeBSD__ == 3
@ -236,7 +229,7 @@ i4bctlattach()
* i4bctlopen - device driver open routine
*---------------------------------------------------------------------------*/
PDEVSTATIC int
i4bctlopen(dev_t dev, int flag, int fmt, struct proc *p)
isdnctlopen(dev_t dev, int flag, int fmt, struct proc *p)
{
if(minor(dev))
return (ENXIO);
@ -253,7 +246,7 @@ i4bctlopen(dev_t dev, int flag, int fmt, struct proc *p)
* i4bctlclose - device driver close routine
*---------------------------------------------------------------------------*/
PDEVSTATIC int
i4bctlclose(dev_t dev, int flag, int fmt, struct proc *p)
isdnctlclose(dev_t dev, int flag, int fmt, struct proc *p)
{
openflag = 0;
return (0);
@ -263,7 +256,7 @@ i4bctlclose(dev_t dev, int flag, int fmt, struct proc *p)
* i4bctlioctl - device driver ioctl routine
*---------------------------------------------------------------------------*/
PDEVSTATIC int
i4bctlioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
isdnctlioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
{
#if DO_I4B_DEBUG
ctl_debug_t *cdbg;
@ -360,11 +353,11 @@ i4bctlioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
* i4bctlpoll - device driver poll routine
*---------------------------------------------------------------------------*/
static int
i4bctlpoll (dev_t dev, int events, struct proc *p)
isdnctlpoll (dev_t dev, int events, struct proc *p)
{
return (ENODEV);
}
#endif
#endif /* NI4BCTL > 0 */
#endif /* NISDNCTL > 0 */

60
sys/netisdn/i4b_i4bdrv.c
View File

@ -27,7 +27,7 @@
* i4b_i4bdrv.c - i4b userland interface driver
* --------------------------------------------
*
* $Id: i4b_i4bdrv.c,v 1.8 2002/01/04 12:21:26 martin Exp $
* $Id: i4b_i4bdrv.c,v 1.9 2002/03/16 16:56:03 martin Exp $
*
* $FreeBSD$
*
@ -36,18 +36,13 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: i4b_i4bdrv.c,v 1.8 2002/01/04 12:21:26 martin Exp $");
__KERNEL_RCSID(0, "$NetBSD: i4b_i4bdrv.c,v 1.9 2002/03/16 16:56:03 martin Exp $");
#include "i4b.h"
#include "i4bipr.h"
#include "i4btel.h"
#include "isdn.h"
#include "irip.h"
#include "isdntel.h"
#if NI4B > 1
#error "only 1 (one) i4b device possible!"
#endif
#if NI4B > 0
#if NISDN > 0
#include <sys/param.h>
@ -121,16 +116,16 @@ static void *devfs_token;
#ifndef __FreeBSD__
#define PDEVSTATIC /* - not static - */
PDEVSTATIC void i4battach __P((void));
PDEVSTATIC int i4bopen __P((dev_t dev, int flag, int fmt, struct proc *p));
PDEVSTATIC int i4bclose __P((dev_t dev, int flag, int fmt, struct proc *p));
PDEVSTATIC int i4bread __P((dev_t dev, struct uio *uio, int ioflag));
PDEVSTATIC int i4bioctl __P((dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p));
PDEVSTATIC void isdnattach __P((void));
PDEVSTATIC int isdnopen __P((dev_t dev, int flag, int fmt, struct proc *p));
PDEVSTATIC int isdnclose __P((dev_t dev, int flag, int fmt, struct proc *p));
PDEVSTATIC int isdnread __P((dev_t dev, struct uio *uio, int ioflag));
PDEVSTATIC int isdnioctl __P((dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p));
#ifdef OS_USES_POLL
PDEVSTATIC int i4bpoll __P((dev_t dev, int events, struct proc *p));
PDEVSTATIC int isdnpoll __P((dev_t dev, int events, struct proc *p));
#else
PDEVSTATIC int i4bselect __P((dev_t dev, int rw, struct proc *p));
PDEVSTATIC int isdnselect __P((dev_t dev, int rw, struct proc *p));
#endif
#endif /* #ifndef __FreeBSD__ */
@ -239,14 +234,11 @@ dummy_i4battach(struct device *parent, struct device *self, void *aux)
*---------------------------------------------------------------------------*/
PDEVSTATIC void
#ifdef __FreeBSD__
i4battach(void *dummy)
isdnattach(void *dummy)
#else
i4battach()
isdnattach()
#endif
{
#ifndef HACK_NO_PSEUDO_ATTACH_MSG
printf("i4b: ISDN call control device attached\n");
#endif
i4b_rdqueue.ifq_maxlen = IFQ_MAXLEN;
#if defined(__FreeBSD__)
@ -268,7 +260,7 @@ i4battach()
* i4bopen - device driver open routine
*---------------------------------------------------------------------------*/
PDEVSTATIC int
i4bopen(dev_t dev, int flag, int fmt, struct proc *p)
isdnopen(dev_t dev, int flag, int fmt, struct proc *p)
{
int x;
@ -290,7 +282,7 @@ i4bopen(dev_t dev, int flag, int fmt, struct proc *p)
* i4bclose - device driver close routine
*---------------------------------------------------------------------------*/
PDEVSTATIC int
i4bclose(dev_t dev, int flag, int fmt, struct proc *p)
isdnclose(dev_t dev, int flag, int fmt, struct proc *p)
{
int x = splnet();
openflag = 0;
@ -304,7 +296,7 @@ i4bclose(dev_t dev, int flag, int fmt, struct proc *p)
* i4bread - device driver read routine
*---------------------------------------------------------------------------*/
PDEVSTATIC int
i4bread(dev_t dev, struct uio *uio, int ioflag)
isdnread(dev_t dev, struct uio *uio, int ioflag)
{
struct mbuf *m;
int x;
@ -343,7 +335,7 @@ i4bread(dev_t dev, struct uio *uio, int ioflag)
* i4bioctl - device driver ioctl routine
*---------------------------------------------------------------------------*/
PDEVSTATIC int
i4bioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
isdnioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
{
call_desc_t *cd;
int error = 0;
@ -553,25 +545,25 @@ i4bioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
switch(mdrsp->driver)
{
#if NI4BIPR > 0
#if NIRIP > 0
case BDRV_IPR:
dlt = ipr_ret_linktab(mdrsp->driver_unit);
break;
#endif
#if NI4BISPPP > 0
#if NIPPP > 0
case BDRV_ISPPP:
dlt = i4bisppp_ret_linktab(mdrsp->driver_unit);
break;
#endif
#if NI4BTEL > 0
#if NISDNTEL > 0
case BDRV_TEL:
dlt = tel_ret_linktab(mdrsp->driver_unit);
break;
#endif
#if NIBC > 0
#if NISDNBCHAN > 0
case BDRV_IBC:
dlt = ibc_ret_linktab(mdrsp->driver_unit);
break;
@ -673,7 +665,7 @@ i4bioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
mui = (msg_updown_ind_t *)data;
#if NI4BIPR > 0
#if NIRIP > 0
if(mui->driver == BDRV_IPR)
{
drvr_link_t *dlt;
@ -916,7 +908,7 @@ i4bselect(dev_t dev, int rw, struct proc *p)
* i4bpoll - device driver poll routine
*---------------------------------------------------------------------------*/
PDEVSTATIC int
i4bpoll(dev_t dev, int events, struct proc *p)
isdnpoll(dev_t dev, int events, struct proc *p)
{
int x;
@ -1026,4 +1018,4 @@ i4bputqueue_hipri(struct mbuf *m)
}
}
#endif /* NI4B > 0 */
#endif /* NISDN > 0 */

104
sys/netisdn/i4b_ipr.c
View File

@ -27,7 +27,7 @@
* i4b_ipr.c - isdn4bsd IP over raw HDLC ISDN network driver
* ---------------------------------------------------------
*
* $Id: i4b_ipr.c,v 1.7 2001/11/13 01:06:21 lukem Exp $
* $Id: i4b_ipr.c,v 1.8 2002/03/16 16:56:03 martin Exp $
*
* $FreeBSD$
*
@ -59,11 +59,11 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: i4b_ipr.c,v 1.7 2001/11/13 01:06:21 lukem Exp $");
__KERNEL_RCSID(0, "$NetBSD: i4b_ipr.c,v 1.8 2002/03/16 16:56:03 martin Exp $");
#include "i4bipr.h"
#include "irip.h"
#if NI4BIPR > 0
#if NIRIP > 0
#ifdef __FreeBSD__
#include "opt_i4b.h"
@ -149,11 +149,11 @@ __KERNEL_RCSID(0, "$NetBSD: i4b_ipr.c,v 1.7 2001/11/13 01:06:21 lukem Exp $");
#endif
#ifdef __FreeBSD__
#define IPR_FMT "ipr%d: "
#define IPR_FMT "irip%d: "
#define IPR_ARG(sc) ((sc)->sc_if.if_unit)
#define PDEVSTATIC static
#elif defined(__bsdi__)
#define IPR_FMT "ipr%d: "
#define IPR_FMT "irip%d: "
#define IPR_ARG(sc) ((sc)->sc_if.if_unit)
#define PDEVSTATIC /* not static */
#else
@ -174,8 +174,8 @@ __KERNEL_RCSID(0, "$NetBSD: i4b_ipr.c,v 1.7 2001/11/13 01:06:21 lukem Exp $");
/* initialized by L4 */
static drvr_link_t ipr_drvr_linktab[NI4BIPR];
static isdn_link_t *isdn_linktab[NI4BIPR];
static drvr_link_t ipr_drvr_linktab[NIRIP];
static isdn_link_t *isdn_linktab[NIRIP];
struct ipr_softc {
struct ifnet sc_if; /* network-visible interface */
@ -222,7 +222,7 @@ struct ipr_softc {
#endif
#endif
} ipr_softc[NI4BIPR];
} ipr_softc[NIRIP];
enum ipr_states {
ST_IDLE, /* initialized, ready, idle */
@ -247,12 +247,12 @@ enum ipr_states {
# define IOCTL_CMD_T int
#endif
#endif
PDEVSTATIC void i4biprattach(void *);
PSEUDO_SET(i4biprattach, i4b_ipr);
static int i4biprioctl(struct ifnet *ifp, IOCTL_CMD_T cmd, caddr_t data);
PDEVSTATIC void iripattach(void *);
PSEUDO_SET(iripattach, i4b_ipr);
static int irpioctl(struct ifnet *ifp, IOCTL_CMD_T cmd, caddr_t data);
#else
PDEVSTATIC void i4biprattach __P((void));
static int i4biprioctl(struct ifnet *ifp, u_long cmd, caddr_t data);
PDEVSTATIC void iripattach __P((void));
static int iripioctl(struct ifnet *ifp, u_long cmd, caddr_t data);
#endif
#ifdef __bsdi__
@ -262,8 +262,8 @@ static void iprwatchdog(struct ifnet *ifp);
#endif
static void ipr_init_linktab(int unit);
static void ipr_tx_queue_empty(int unit);
static int i4biproutput(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, struct rtentry *rtp);
static void iprclearqueues(struct ipr_softc *sc);
static int iripoutput(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst, struct rtentry *rtp);
static void iripclearqueues(struct ipr_softc *sc);
/*===========================================================================*
* DEVICE DRIVER ROUTINES
@ -274,23 +274,15 @@ static void iprclearqueues(struct ipr_softc *sc);
*---------------------------------------------------------------------------*/
PDEVSTATIC void
#ifdef __FreeBSD__
i4biprattach(void *dummy)
iripattach(void *dummy)
#else
i4biprattach()
iripattach()
#endif
{
struct ipr_softc *sc = ipr_softc;
int i;
#ifndef HACK_NO_PSEUDO_ATTACH_MSG
#ifdef IPR_VJ
printf("i4bipr: %d IP over raw HDLC ISDN device(s) attached (VJ header compression)\n", NI4BIPR);
#else
printf("i4bipr: %d IP over raw HDLC ISDN device(s) attached\n", NI4BIPR);
#endif
#endif
for(i=0; i < NI4BIPR; sc++, i++)
for(i=0; i < NIRIP; sc++, i++)
{
ipr_init_linktab(i);
@ -299,16 +291,16 @@ i4biprattach()
sc->sc_state = ST_IDLE;
#ifdef __FreeBSD__
sc->sc_if.if_name = "ipr";
sc->sc_if.if_name = "irip";
#if __FreeBSD__ < 3
sc->sc_if.if_next = NULL;
#endif
sc->sc_if.if_unit = i;
#elif defined(__bsdi__)
sc->sc_if.if_name = "ipr";
sc->sc_if.if_name = "irip";
sc->sc_if.if_unit = i;
#else
sprintf(sc->sc_if.if_xname, "ipr%d", i);
sprintf(sc->sc_if.if_xname, "irip%d", i);
sc->sc_if.if_softc = sc;
sc->sc_unit = i;
#endif
@ -325,8 +317,8 @@ i4biprattach()
sc->sc_if.if_mtu = I4BIPRMTU;
sc->sc_if.if_type = IFT_ISDNBASIC;
sc->sc_if.if_ioctl = i4biprioctl;
sc->sc_if.if_output = i4biproutput;
sc->sc_if.if_ioctl = iripioctl;
sc->sc_if.if_output = iripoutput;
IFQ_SET_MAXLEN(&sc->sc_if.if_snd, I4BIPRMAXQLEN);
sc->sc_fastq.ifq_maxlen = I4BIPRMAXQLEN;
@ -402,7 +394,7 @@ i4biprattach()
* output a packet to the ISDN B-channel
*---------------------------------------------------------------------------*/
static int
i4biproutput(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
iripoutput(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
struct rtentry *rtp)
{
struct ipr_softc *sc;
@ -438,7 +430,7 @@ i4biproutput(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
if(!(ifp->if_flags & IFF_UP))
{
NDBGL4(L4_IPRDBG, "ipr%d: interface is DOWN!", unit);
NDBGL4(L4_IPRDBG, "irip%d: interface is DOWN!", unit);
m_freem(m);
splx(s);
sc->sc_if.if_oerrors++;
@ -454,9 +446,9 @@ i4biproutput(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
switch(sc->sc_dialresp)
{
case DSTAT_TFAIL: /* transient failure */
NDBGL4(L4_IPRDBG, "ipr%d: transient dial failure!", unit);
NDBGL4(L4_IPRDBG, "irip%d: transient dial failure!", unit);
m_freem(m);
iprclearqueues(sc);
iripclearqueues(sc);
sc->sc_dialresp = DSTAT_NONE;
splx(s);
sc->sc_if.if_oerrors++;
@ -464,9 +456,9 @@ i4biproutput(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
break;
case DSTAT_PFAIL: /* permanent failure */
NDBGL4(L4_IPRDBG, "ipr%d: permanent dial failure!", unit);
NDBGL4(L4_IPRDBG, "irip%d: permanent dial failure!", unit);
m_freem(m);
iprclearqueues(sc);
iripclearqueues(sc);
sc->sc_dialresp = DSTAT_NONE;
splx(s);
sc->sc_if.if_oerrors++;
@ -474,9 +466,9 @@ i4biproutput(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
break;
case DSTAT_INONLY: /* no dialout allowed*/
NDBGL4(L4_IPRDBG, "ipr%d: dialout not allowed failure!", unit);
NDBGL4(L4_IPRDBG, "irip%d: dialout not allowed failure!", unit);
m_freem(m);
iprclearqueues(sc);
iripclearqueues(sc);
sc->sc_dialresp = DSTAT_NONE;
splx(s);
sc->sc_if.if_oerrors++;
@ -485,8 +477,8 @@ i4biproutput(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
}
#endif
NDBGL4(L4_IPRDBG, "ipr%d: send dial request message!", unit);
NDBGL4(L4_DIALST, "ipr%d: setting dial state to ST_DIALING", unit);
NDBGL4(L4_IPRDBG, "irip%d: send dial request message!", unit);
NDBGL4(L4_DIALST, "irip%d: setting dial state to ST_DIALING", unit);
i4b_l4_dialout(BDRV_IPR, unit);
sc->sc_state = ST_DIALING;
}
@ -521,7 +513,7 @@ i4biproutput(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
) {
if(IF_QFULL(ifq))
{
NDBGL4(L4_IPRDBG, "ipr%d: send queue full!", unit);
NDBGL4(L4_IPRDBG, "irip%d: send queue full!", unit);
IF_DROP(ifq);
m_freem(m);
sc->sc_if.if_oerrors++;
@ -538,7 +530,7 @@ i4biproutput(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
}
}
NDBGL4(L4_IPRDBG, "ipr%d: added packet to send queue!", unit);
NDBGL4(L4_IPRDBG, "irip%d: added packet to send queue!", unit);
ipr_tx_queue_empty(unit);
@ -552,10 +544,10 @@ i4biproutput(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
*---------------------------------------------------------------------------*/
#ifdef __FreeBSD__
static int
i4biprioctl(struct ifnet *ifp, IOCTL_CMD_T cmd, caddr_t data)
iripioctl(struct ifnet *ifp, IOCTL_CMD_T cmd, caddr_t data)
#else
static int
i4biprioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
iripioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
#endif
{
#if defined(__FreeBSD__) || defined(__bsdi__)
@ -600,7 +592,7 @@ i4biprioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
/* empty queues */
iprclearqueues(sc);
iripclearqueues(sc);
}
if(ifr->ifr_flags & IFF_DEBUG)
@ -657,7 +649,7 @@ i4biprioctl(struct ifnet *ifp, u_long cmd, caddr_t data)
* clear the interface's send queues
*---------------------------------------------------------------------------*/
static void
iprclearqueues(struct ipr_softc *sc)
iripclearqueues(struct ipr_softc *sc)
{
int x;
struct mbuf *m;
@ -777,7 +769,7 @@ ipr_connect(int unit, void *cdp)
s = splnet();
NDBGL4(L4_DIALST, "ipr%d: setting dial state to ST_CONNECTED", unit);
NDBGL4(L4_DIALST, "irip%d: setting dial state to ST_CONNECTED", unit);
sc->sc_if.if_flags |= IFF_RUNNING;
sc->sc_state = ST_CONNECTED_W;
@ -848,7 +840,7 @@ ipr_disconnect(int unit, void *cdp)
if (cd != sc->sc_cdp)
{
NDBGL4(L4_IPRDBG, "ipr%d: channel %d not active",
NDBGL4(L4_IPRDBG, "irip%d: channel %d not active",
cd->driver_unit, cd->channelid);
return;
}
@ -885,13 +877,13 @@ ipr_dialresponse(int unit, int status, cause_t cause)
struct ipr_softc *sc = &ipr_softc[unit];
sc->sc_dialresp = status;
NDBGL4(L4_IPRDBG, "ipr%d: last=%d, this=%d",
NDBGL4(L4_IPRDBG, "irip%d: last=%d, this=%d",
unit, sc->sc_lastdialresp, sc->sc_dialresp);
if(status != DSTAT_NONE)
{
NDBGL4(L4_IPRDBG, "ipr%d: clearing queues", unit);
iprclearqueues(sc);
NDBGL4(L4_IPRDBG, "irip%d: clearing queues", unit);
iripclearqueues(sc);
}
}
@ -1082,7 +1074,7 @@ error:
if(IF_QFULL(&ipintrq))
{
NDBGL4(L4_IPRDBG, "ipr%d: ipintrq full!", unit);
NDBGL4(L4_IPRDBG, "irip%d: ipintrq full!", unit);
IF_DROP(&ipintrq);
sc->sc_if.if_ierrors++;
@ -1165,7 +1157,7 @@ ipr_tx_queue_empty(int unit)
if(IF_QFULL(isdn_linktab[unit]->tx_queue))
{
NDBGL4(L4_IPRDBG, "ipr%d: tx queue full!", unit);
NDBGL4(L4_IPRDBG, "irip%d: tx queue full!", unit);
m_freem(m);
}
else
@ -1229,4 +1221,4 @@ ipr_init_linktab(int unit)
/*===========================================================================*/
#endif /* NI4BIPR > 0 */
#endif /* NIRIP > 0 */

46
sys/netisdn/i4b_isppp.c
View File

@ -34,7 +34,7 @@
* the "cx" driver for Cronyx's HDLC-in-hardware device). This driver
* is only the glue between sppp and i4b.
*
* $Id: i4b_isppp.c,v 1.11 2002/02/10 15:29:58 martin Exp $
* $Id: i4b_isppp.c,v 1.12 2002/03/16 16:56:04 martin Exp $
*
* $FreeBSD$
*
@ -43,12 +43,12 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: i4b_isppp.c,v 1.11 2002/02/10 15:29:58 martin Exp $");
__KERNEL_RCSID(0, "$NetBSD: i4b_isppp.c,v 1.12 2002/03/16 16:56:04 martin Exp $");
#ifndef __NetBSD__
#define USE_ISPPP
#endif
#include "i4bisppp.h"
#include "ippp.h"
#ifndef USE_ISPPP
@ -116,7 +116,7 @@ __KERNEL_RCSID(0, "$NetBSD: i4b_isppp.c,v 1.11 2002/02/10 15:29:58 martin Exp $"
#include <netisdn/i4b_l4.h>
#ifdef __FreeBSD__
#define ISPPP_FMT "isp%d: "
#define ISPPP_FMT "ippp%d: "
#define ISPPP_ARG(sc) ((sc)->sc_if.if_unit)
#define PDEVSTATIC static
#define IFP2UNIT(ifp) (ifp)->if_unit
@ -144,10 +144,10 @@ __KERNEL_RCSID(0, "$NetBSD: i4b_isppp.c,v 1.11 2002/02/10 15:29:58 martin Exp $"
#endif
#ifdef __FreeBSD__
PDEVSTATIC void i4bispppattach(void *);
PSEUDO_SET(i4bispppattach, i4b_isppp);
PDEVSTATIC void ipppattach(void *);
PSEUDO_SET(ipppattach, i4b_isppp);
#else
PDEVSTATIC void i4bispppattach(void);
PDEVSTATIC void ipppattach(void);
#endif
#define I4BISPPPACCT 1 /* enable accounting messages */
@ -181,7 +181,7 @@ struct i4bisppp_softc {
struct callout_handle sc_ch;
#endif
} i4bisppp_softc[NI4BISPPP];
} i4bisppp_softc[NIPPP];
static void i4bisppp_init_linktab(int unit);
static int i4bisppp_ioctl(struct ifnet *ifp, IOCTL_CMD_T cmd, caddr_t data);
@ -205,8 +205,8 @@ time_t i4bisppp_idletime(int unit);
/* initialized by L4 */
static drvr_link_t i4bisppp_drvr_linktab[NI4BISPPP];
static isdn_link_t *isdn_linktab[NI4BISPPP];
static drvr_link_t i4bisppp_drvr_linktab[NIPPP];
static isdn_link_t *isdn_linktab[NIPPP];
enum i4bisppp_states {
ST_IDLE, /* initialized, ready, idle */
@ -223,35 +223,27 @@ enum i4bisppp_states {
*---------------------------------------------------------------------------*/
PDEVSTATIC void
#ifdef __FreeBSD__
i4bispppattach(void *dummy)
ipppattach(void *dummy)
#else
i4bispppattach()
ipppattach()
#endif
{
struct i4bisppp_softc *sc = i4bisppp_softc;
int i;
#ifndef HACK_NO_PSEUDO_ATTACH_MSG
#ifdef SPPP_VJ
printf("i4bisppp: %d ISDN SyncPPP device(s) attached (VJ header compression)\n", NI4BISPPP);
#else
printf("i4bisppp: %d ISDN SyncPPP device(s) attached\n", NI4BISPPP);
#endif
#endif
for(i = 0; i < NI4BISPPP; sc++, i++) {
for(i = 0; i < NIPPP; sc++, i++) {
i4bisppp_init_linktab(i);
sc->sc_sp.pp_if.if_softc = sc;
#ifdef __FreeBSD__
sc->sc_sp.pp_if.if_name = "isp";
sc->sc_sp.pp_if.if_name = "ippp";
#if defined(__FreeBSD_version) && __FreeBSD_version < 300001
sc->sc_sp.pp_if.if_next = NULL;
#endif
sc->sc_sp.pp_if.if_unit = i;
#else
sprintf(sc->sc_sp.pp_if.if_xname, "isp%d", i);
sprintf(sc->sc_sp.pp_if.if_xname, "ippp%d", i);
sc->sc_unit = i;
#endif
@ -412,7 +404,7 @@ i4bisppp_start(struct ifnet *ifp)
if(IF_QFULL(isdn_linktab[unit]->tx_queue))
{
NDBGL4(L4_ISPDBG, "isp%d, tx queue full!", unit);
NDBGL4(L4_ISPDBG, "ippp%d, tx queue full!", unit);
m_freem(m);
}
else
@ -585,7 +577,7 @@ i4bisppp_disconnect(int unit, void *cdp)
/* new stuff to check that the active channel is being closed */
if (cd != sc->sc_cdp)
{
NDBGL4(L4_ISPDBG, "isp%d, channel%d not active!", unit, cd->channelid);
NDBGL4(L4_ISPDBG, "ippp%d, channel%d not active!", unit, cd->channelid);
splx(s);
return;
}
@ -620,13 +612,13 @@ i4bisppp_dialresponse(int unit, int status, cause_t cause)
{
struct i4bisppp_softc *sc = &i4bisppp_softc[unit];
NDBGL4(L4_ISPDBG, "isp%d: status=%d, cause=%d", unit, status, cause);
NDBGL4(L4_ISPDBG, "ippp%d: status=%d, cause=%d", unit, status, cause);
if(status != DSTAT_NONE)
{
struct mbuf *m;
NDBGL4(L4_ISPDBG, "isp%d: clearing queues", unit);
NDBGL4(L4_ISPDBG, "ippp%d: clearing queues", unit);
#ifndef USE_ISPPP
if(!(sppp_isempty(&sc->sc_sp.pp_if)))

38
sys/netisdn/i4b_l4.c
View File

@ -27,7 +27,7 @@
* i4b_l4.c - kernel interface to userland
* -----------------------------------------
*
* $Id: i4b_l4.c,v 1.7 2002/02/14 16:46:23 drochner Exp $
* $Id: i4b_l4.c,v 1.8 2002/03/16 16:56:04 martin Exp $
*
* $FreeBSD$
*
@ -36,12 +36,12 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: i4b_l4.c,v 1.7 2002/02/14 16:46:23 drochner Exp $");
__KERNEL_RCSID(0, "$NetBSD: i4b_l4.c,v 1.8 2002/03/16 16:56:04 martin Exp $");
#include "i4b.h"
#include "i4bipr.h"
#include "isdn.h"
#include "irip.h"
#if NI4B > 0
#if NISDN > 0
#include <sys/param.h>
#include <sys/kernel.h>
@ -65,11 +65,11 @@ __KERNEL_RCSID(0, "$NetBSD: i4b_l4.c,v 1.7 2002/02/14 16:46:23 drochner Exp $");
#define NI4BISPPP 0
#include "ibc.h"
#else
#include "i4bisppp.h"
#include "ippp.h"
#endif
#include "i4brbch.h"
#include "i4btel.h"
#include "isdnbchan.h"
#include "isdntel.h"
#ifdef __FreeBSD__
#include <machine/i4b_debug.h>
@ -100,7 +100,7 @@ static void i4b_idle_check_var_unit(call_desc_t *cd);
static void i4b_l4_setup_timeout_fix_unit(call_desc_t *cd);
static void i4b_l4_setup_timeout_var_unit(call_desc_t *cd);
static time_t i4b_get_idletime(call_desc_t *cd);
#if NI4BISPPP > 0
#if NIPPP > 0
extern time_t i4bisppp_idletime(int);
#endif
@ -606,25 +606,25 @@ i4b_link_bchandrvr(call_desc_t *cd)
switch(cd->driver)
{
#if NI4BRBCH > 0
#if NISDNBCHAN > 0
case BDRV_RBCH:
cd->dlt = rbch_ret_linktab(cd->driver_unit);
break;
#endif
#if NI4BTEL > 0
#if NISDNTEL > 0
case BDRV_TEL:
cd->dlt = tel_ret_linktab(cd->driver_unit);
break;
#endif
#if NI4BIPR > 0
#if NIRIP > 0
case BDRV_IPR:
cd->dlt = ipr_ret_linktab(cd->driver_unit);
break;
#endif
#if NI4BISPPP > 0
#if NIPPP > 0
case BDRV_ISPPP:
cd->dlt = i4bisppp_ret_linktab(cd->driver_unit);
break;
@ -660,25 +660,25 @@ i4b_link_bchandrvr(call_desc_t *cd)
switch(cd->driver)
{
#if NI4BRBCH > 0
#if NISDNBCHAN > 0
case BDRV_RBCH:
rbch_set_linktab(cd->driver_unit, cd->ilt);
break;
#endif
#if NI4BTEL > 0
#if NISDNTEL > 0
case BDRV_TEL:
tel_set_linktab(cd->driver_unit, cd->ilt);
break;
#endif
#if NI4BIPR > 0
#if NIRIP > 0
case BDRV_IPR:
ipr_set_linktab(cd->driver_unit, cd->ilt);
break;
#endif
#if NI4BISPPP > 0
#if NIPPP > 0
case BDRV_ISPPP:
i4bisppp_set_linktab(cd->driver_unit, cd->ilt);
break;
@ -779,7 +779,7 @@ static time_t
i4b_get_idletime(call_desc_t *cd)
{
switch (cd->driver) {
#if NI4BISPPP > 0
#if NIPPP > 0
case BDRV_ISPPP:
return i4bisppp_idletime(cd->driver_unit);
break;
@ -1083,4 +1083,4 @@ i4b_idle_check_var_unit(call_desc_t *cd)
}
}
#endif /* NI4B > 0 */
#endif /* NISDN > 0 */

10
sys/netisdn/i4b_l4mgmt.c
View File

@ -27,7 +27,7 @@
* i4b_l4mgmt.c - layer 4 calldescriptor management utilites
* -----------------------------------------------------------
*
* $Id: i4b_l4mgmt.c,v 1.4 2001/11/13 01:06:22 lukem Exp $
* $Id: i4b_l4mgmt.c,v 1.5 2002/03/16 16:56:04 martin Exp $
*
* $FreeBSD$
*
@ -36,11 +36,11 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: i4b_l4mgmt.c,v 1.4 2001/11/13 01:06:22 lukem Exp $");
__KERNEL_RCSID(0, "$NetBSD: i4b_l4mgmt.c,v 1.5 2002/03/16 16:56:04 martin Exp $");
#include "i4b.h"
#include "isdn.h"
#if NI4B > 0
#if NISDN > 0
#include <sys/param.h>
#include <sys/kernel.h>
@ -476,4 +476,4 @@ i4b_print_cdaa(void)
#endif /* I4B_CD_DEBUG_PRINT */
#endif /* NI4BQ931 > 0 */
#endif /* NISDN > 0 */

10
sys/netisdn/i4b_l4timer.c
View File

@ -27,7 +27,7 @@
* i4b_l4timer.c - timer and timeout handling for layer 4
* --------------------------------------------------------
*
* $Id: i4b_l4timer.c,v 1.3 2001/11/13 01:06:22 lukem Exp $
* $Id: i4b_l4timer.c,v 1.4 2002/03/16 16:56:04 martin Exp $
*
* $FreeBSD$
*
@ -36,11 +36,11 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: i4b_l4timer.c,v 1.3 2001/11/13 01:06:22 lukem Exp $");
__KERNEL_RCSID(0, "$NetBSD: i4b_l4timer.c,v 1.4 2002/03/16 16:56:04 martin Exp $");
#include "i4b.h"
#include "isdn.h"
#if NI4B > 0
#if NISDN > 0
#include <sys/param.h>
#include <sys/kernel.h>
@ -109,4 +109,4 @@ T400_stop(call_desc_t *cd)
NDBGL4(L4_MSG, "cr = %d", cd->cr);
}
#endif /* NI4B > 0 */
#endif /* NISDN > 0 */

144
sys/netisdn/i4b_rbch.c
View File

@ -27,7 +27,7 @@
* i4b_rbch.c - device driver for raw B channel data
* ---------------------------------------------------
*
* $Id: i4b_rbch.c,v 1.4 2001/11/13 01:06:23 lukem Exp $
* $Id: i4b_rbch.c,v 1.5 2002/03/16 16:56:05 martin Exp $
*
* $FreeBSD$
*
@ -36,11 +36,11 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: i4b_rbch.c,v 1.4 2001/11/13 01:06:23 lukem Exp $");
__KERNEL_RCSID(0, "$NetBSD: i4b_rbch.c,v 1.5 2002/03/16 16:56:05 martin Exp $");
#include "i4brbch.h"
#include "isdnbchan.h"
#if NI4BRBCH > 0
#if NISDNBCHAN > 0
#include <sys/param.h>
#include <sys/systm.h>
@ -111,8 +111,8 @@ extern cc_t ttydefchars;
#include <sys/filio.h>
#endif
static drvr_link_t rbch_drvr_linktab[NI4BRBCH];
static isdn_link_t *isdn_linktab[NI4BRBCH];
static drvr_link_t rbch_drvr_linktab[NISDNBCHAN];
static isdn_link_t *isdn_linktab[NISDNBCHAN];
#define I4BRBCHACCT 1 /* enable accounting messages */
#define I4BRBCHACCTINTVL 2 /* accounting msg interval in secs */
@ -160,7 +160,7 @@ static struct rbch_softc {
int sc_loutb; /* last # of bytes tx'd */
int sc_fn; /* flag, first null acct */
#endif
} rbch_softc[NI4BRBCH];
} rbch_softc[NISDNBCHAN];
static void rbch_rx_data_rdy(int unit);
static void rbch_tx_queue_empty(int unit);
@ -172,16 +172,16 @@ static void rbch_clrq(int unit);
#ifndef __FreeBSD__
#define PDEVSTATIC /* - not static - */
#define IOCTL_CMD_T u_long
void i4brbchattach __P((void));
int i4brbchopen __P((dev_t dev, int flag, int fmt, struct proc *p));
int i4brbchclose __P((dev_t dev, int flag, int fmt, struct proc *p));
int i4brbchread __P((dev_t dev, struct uio *uio, int ioflag));
int i4brbchwrite __P((dev_t dev, struct uio *uio, int ioflag));
int i4brbchioctl __P((dev_t dev, IOCTL_CMD_T cmd, caddr_t arg, int flag, struct proc* pr));
void isdnbchanattach __P((void));
int isdnbchanopen __P((dev_t dev, int flag, int fmt, struct proc *p));
int isdnbchanclose __P((dev_t dev, int flag, int fmt, struct proc *p));
int isdnbchanread __P((dev_t dev, struct uio *uio, int ioflag));
int isdnbchanwrite __P((dev_t dev, struct uio *uio, int ioflag));
int isdnbchanioctl __P((dev_t dev, IOCTL_CMD_T cmd, caddr_t arg, int flag, struct proc* pr));
#ifdef OS_USES_POLL
int i4brbchpoll __P((dev_t dev, int events, struct proc *p));
int isdnbchanpoll __P((dev_t dev, int events, struct proc *p));
#else
PDEVSTATIC int i4brbchselect __P((dev_t dev, int rw, struct proc *p));
PDEVSTATIC int isdnbchanselect __P((dev_t dev, int rw, struct proc *p));
#endif
#endif
@ -189,33 +189,33 @@ PDEVSTATIC int i4brbchselect __P((dev_t dev, int rw, struct proc *p));
#define PDEVSTATIC static
#define IOCTL_CMD_T u_long
PDEVSTATIC d_open_t i4brbchopen;
PDEVSTATIC d_close_t i4brbchclose;
PDEVSTATIC d_read_t i4brbchread;
PDEVSTATIC d_read_t i4brbchwrite;
PDEVSTATIC d_ioctl_t i4brbchioctl;
PDEVSTATIC d_open_t isdnbchanopen;
PDEVSTATIC d_close_t isdnbchanclose;
PDEVSTATIC d_read_t isdnbchanread;
PDEVSTATIC d_read_t isdnbchanwrite;
PDEVSTATIC d_ioctl_t isdnbchanioctl;
#ifdef OS_USES_POLL
PDEVSTATIC d_poll_t i4brbchpoll;
#define POLLFIELD i4brbchpoll
PDEVSTATIC d_poll_t isdnbchanpoll;
#define POLLFIELD isdnbchanpoll
#else
PDEVSTATIC d_select_t i4brbchselect;
#define POLLFIELD i4brbchselect
PDEVSTATIC d_select_t isdnbchanselect;
#define POLLFIELD isdnbchanselect
#endif
#define CDEV_MAJOR 57
#if defined(__FreeBSD__) && __FreeBSD__ >= 4
static struct cdevsw i4brbch_cdevsw = {
/* open */ i4brbchopen,
/* close */ i4brbchclose,
/* read */ i4brbchread,
/* write */ i4brbchwrite,
/* ioctl */ i4brbchioctl,
static struct cdevsw isdnbchan_cdevsw = {
/* open */ isdnbchanopen,
/* close */ isdnbchanclose,
/* read */ isdnbchanread,
/* write */ isdnbchanwrite,
/* ioctl */ isdnbchanioctl,
/* poll */ POLLFIELD,
/* mmap */ nommap,
/* strategy */ nostrategy,
/* name */ "i4brbch",
/* name */ "isdnbchan",
/* maj */ CDEV_MAJOR,
/* dump */ nodump,
/* psize */ nopsize,
@ -223,15 +223,15 @@ static struct cdevsw i4brbch_cdevsw = {
/* bmaj */ -1
};
#else
static struct cdevsw i4brbch_cdevsw = {
i4brbchopen, i4brbchclose, i4brbchread, i4brbchwrite,
i4brbchioctl, nostop, noreset, nodevtotty,
POLLFIELD, nommap, NULL, "i4brbch", NULL, -1
static struct cdevsw isdnbchan_cdevsw = {
isdnbchanopen, isdnbchanclose, isdnbchanread, isdnbchanwrite,
isdnbchanioctl, nostop, noreset, nodevtotty,
POLLFIELD, nommap, NULL, "isdnbchan", NULL, -1
};
#endif
static void i4brbchattach(void *);
PSEUDO_SET(i4brbchattach, i4b_rbch);
static void isdnbchanattach(void *);
PSEUDO_SET(isdnbchanattach, i4b_rbch);
/*===========================================================================*
* DEVICE DRIVER ROUTINES
@ -241,47 +241,47 @@ PSEUDO_SET(i4brbchattach, i4b_rbch);
* initialization at kernel load time
*---------------------------------------------------------------------------*/
static void
i4brbchinit(void *unused)
isdnbchaninit(void *unused)
{
#if defined(__FreeBSD__) && __FreeBSD__ >= 4
cdevsw_add(&i4brbch_cdevsw);
cdevsw_add(&isdnbchan_cdevsw);
#else
dev_t dev = makedev(CDEV_MAJOR, 0);
cdevsw_add(&dev, &i4brbch_cdevsw, NULL);
cdevsw_add(&dev, &isdnbchan_cdevsw, NULL);
#endif
}
SYSINIT(i4brbchdev, SI_SUB_DRIVERS,
SI_ORDER_MIDDLE+CDEV_MAJOR, &i4brbchinit, NULL);
SYSINIT(isdnbchandev, SI_SUB_DRIVERS,
SI_ORDER_MIDDLE+CDEV_MAJOR, &isdnbchaninit, NULL);
#endif /* BSD > 199306 && defined(__FreeBSD__) */
#ifdef __bsdi__
int i4brbchmatch(struct device *parent, struct cfdata *cf, void *aux);
void dummy_i4brbchattach(struct device*, struct device *, void *);
int isdnbchanmatch(struct device *parent, struct cfdata *cf, void *aux);
void dummy_isdnbchanattach(struct device*, struct device *, void *);
#define CDEV_MAJOR 61
static struct cfdriver i4brbchcd =
{ NULL, "i4brbch", i4brbchmatch, dummy_i4brbchattach, DV_DULL,
static struct cfdriver isdnbchancd =
{ NULL, "isdnbchan", isdnbchanmatch, dummy_isdnbchanattach, DV_DULL,
sizeof(struct cfdriver) };
struct devsw i4brbchsw =
{ &i4brbchcd,
i4brbchopen, i4brbchclose, i4brbchread, i4brbchwrite,
i4brbchioctl, seltrue, nommap, nostrat,
struct devsw isdnbchansw =
{ &isdnbchancd,
isdnbchanopen, isdnbchanclose, isdnbchanread, isdnbchanwrite,
isdnbchanioctl, seltrue, nommap, nostrat,
nodump, nopsize, 0, nostop
};
int
i4brbchmatch(struct device *parent, struct cfdata *cf, void *aux)
isdnbchanmatch(struct device *parent, struct cfdata *cf, void *aux)
{
printf("i4brbchmatch: aux=0x%x\n", aux);
printf("isdnbchanmatch: aux=0x%x\n", aux);
return 1;
}
void
dummy_i4brbchattach(struct device *parent, struct device *self, void *aux)
dummy_isdnbchanattach(struct device *parent, struct device *self, void *aux)
{
printf("dummy_i4brbchattach: aux=0x%x\n", aux);
printf("dummy_isdnbchanattach: aux=0x%x\n", aux);
}
#endif /* __bsdi__ */
@ -290,32 +290,28 @@ dummy_i4brbchattach(struct device *parent, struct device *self, void *aux)
*---------------------------------------------------------------------------*/
PDEVSTATIC void
#ifdef __FreeBSD__
i4brbchattach(void *dummy)
isdnbchanattach(void *dummy)
#else
i4brbchattach()
isdnbchanattach()
#endif
{
int i;
#ifndef HACK_NO_PSEUDO_ATTACH_MSG
printf("i4brbch: %d raw B channel access device(s) attached\n", NI4BRBCH);
#endif
for(i=0; i < NI4BRBCH; i++)
for(i=0; i < NISDNBCHAN; i++)
{
#if defined(__FreeBSD__)
#if __FreeBSD__ == 3
#ifdef DEVFS
rbch_softc[i].devfs_token =
devfs_add_devswf(&i4brbch_cdevsw, i, DV_CHR,
devfs_add_devswf(&isdnbchan_cdevsw, i, DV_CHR,
UID_ROOT, GID_WHEEL, 0600,
"i4brbch%d", i);
"isdnbchan%d", i);
#endif
#else
make_dev(&i4brbch_cdevsw, i,
UID_ROOT, GID_WHEEL, 0600, "i4brbch%d", i);
make_dev(&isdnbchan_cdevsw, i,
UID_ROOT, GID_WHEEL, 0600, "isdnbchan%d", i);
#endif
#endif
@ -341,11 +337,11 @@ i4brbchattach()
* open rbch device
*---------------------------------------------------------------------------*/
PDEVSTATIC int
i4brbchopen(dev_t dev, int flag, int fmt, struct proc *p)
isdnbchanopen(dev_t dev, int flag, int fmt, struct proc *p)
{
int unit = minor(dev);
if(unit >= NI4BRBCH)
if(unit >= NISDNBCHAN)
return(ENXIO);
if(rbch_softc[unit].sc_devstate & ST_ISOPEN)
@ -366,7 +362,7 @@ i4brbchopen(dev_t dev, int flag, int fmt, struct proc *p)
* close rbch device
*---------------------------------------------------------------------------*/
PDEVSTATIC int
i4brbchclose(dev_t dev, int flag, int fmt, struct proc *p)
isdnbchanclose(dev_t dev, int flag, int fmt, struct proc *p)
{
int unit = minor(dev);
struct rbch_softc *sc = &rbch_softc[unit];
@ -387,7 +383,7 @@ i4brbchclose(dev_t dev, int flag, int fmt, struct proc *p)
* read from rbch device
*---------------------------------------------------------------------------*/
PDEVSTATIC int
i4brbchread(dev_t dev, struct uio *uio, int ioflag)
isdnbchanread(dev_t dev, struct uio *uio, int ioflag)
{
struct mbuf *m;
int error = 0;
@ -489,7 +485,7 @@ i4brbchread(dev_t dev, struct uio *uio, int ioflag)
* write to rbch device
*---------------------------------------------------------------------------*/
PDEVSTATIC int
i4brbchwrite(dev_t dev, struct uio * uio, int ioflag)
isdnbchanwrite(dev_t dev, struct uio * uio, int ioflag)
{
struct mbuf *m;
int error = 0;
@ -614,7 +610,7 @@ i4brbchwrite(dev_t dev, struct uio * uio, int ioflag)
* rbch device ioctl handlibg
*---------------------------------------------------------------------------*/
PDEVSTATIC int
i4brbchioctl(dev_t dev, IOCTL_CMD_T cmd, caddr_t data, int flag, struct proc *p)
isdnbchanioctl(dev_t dev, IOCTL_CMD_T cmd, caddr_t data, int flag, struct proc *p)
{
int error = 0;
int unit = minor(dev);
@ -713,7 +709,7 @@ i4brbchioctl(dev_t dev, IOCTL_CMD_T cmd, caddr_t data, int flag, struct proc *p)
* device driver poll
*---------------------------------------------------------------------------*/
PDEVSTATIC int
i4brbchpoll(dev_t dev, int events, struct proc *p)
isdnbchanpoll(dev_t dev, int events, struct proc *p)
{
int revents = 0; /* Events we found */
int s;
@ -771,7 +767,7 @@ i4brbchpoll(dev_t dev, int events, struct proc *p)
* device driver select
*---------------------------------------------------------------------------*/
PDEVSTATIC int
i4brbchselect(dev_t dev, int rw, struct proc *p)
isdnbchanselect(dev_t dev, int rw, struct proc *p)
{
int unit = minor(dev);
struct rbch_softc *sc = &rbch_softc[unit];
@ -1082,4 +1078,4 @@ rbch_init_linktab(int unit)
/*===========================================================================*/
#endif /* NI4BRBCH > 0 */
#endif /* NISDNBCHAN > 0 */

62
sys/netisdn/i4b_tel.c
View File

@ -27,7 +27,7 @@
* i4b_tel.c - device driver for ISDN telephony
* --------------------------------------------
*
* $Id: i4b_tel.c,v 1.6 2002/01/27 11:42:13 martin Exp $
* $Id: i4b_tel.c,v 1.7 2002/03/16 16:56:05 martin Exp $
*
* $FreeBSD$
*
@ -36,11 +36,11 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: i4b_tel.c,v 1.6 2002/01/27 11:42:13 martin Exp $");
__KERNEL_RCSID(0, "$NetBSD: i4b_tel.c,v 1.7 2002/03/16 16:56:05 martin Exp $");
#include "i4btel.h"
#include "isdntel.h"
#if NI4BTEL > 0
#if NISDNTEL > 0
#undef I4BTELDEBUG
@ -153,7 +153,7 @@ typedef struct {
} tel_sc_t;
static tel_sc_t tel_sc[NI4BTEL][NOFUNCS];
static tel_sc_t tel_sc[NISDNTEL][NOFUNCS];
/* forward decl */
@ -172,18 +172,18 @@ static u_char sinetab[];
#ifndef __FreeBSD__
#define PDEVSTATIC /* - not static - */
PDEVSTATIC void i4btelattach __P((void));
PDEVSTATIC int i4btelioctl __P((dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p));
PDEVSTATIC void isdntelattach __P((void));
PDEVSTATIC int isdntelioctl __P((dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p));
int i4btelopen __P((dev_t dev, int flag, int fmt, struct proc *p));
int i4btelclose __P((dev_t dev, int flag, int fmt, struct proc *p));
int i4btelread __P((dev_t dev, struct uio *uio, int ioflag));
int i4btelwrite __P((dev_t dev, struct uio * uio, int ioflag));
int isdntelopen __P((dev_t dev, int flag, int fmt, struct proc *p));
int isdntelclose __P((dev_t dev, int flag, int fmt, struct proc *p));
int isdntelread __P((dev_t dev, struct uio *uio, int ioflag));
int isdntelwrite __P((dev_t dev, struct uio * uio, int ioflag));
#ifdef OS_USES_POLL
int i4btelpoll __P((dev_t dev, int events, struct proc *p));
int isdntelpoll __P((dev_t dev, int events, struct proc *p));
#else
int i4btelsel __P((dev_t dev, int rw, struct proc *p));
int isdntelsel __P((dev_t dev, int rw, struct proc *p));
#endif
#endif /* __FreeBSD__ */
@ -233,10 +233,10 @@ static struct cdevsw i4btel_cdevsw = {
};
#endif
PDEVSTATIC void i4btelinit(void *unused);
PDEVSTATIC void i4btelattach(void *);
PDEVSTATIC void isdntelinit(void *unused);
PDEVSTATIC void isdntelattach(void *);
PSEUDO_SET(i4btelattach, i4b_tel);
PSEUDO_SET(isdntelattach, i4b_tel);
/*===========================================================================*
* DEVICE DRIVER ROUTINES
@ -246,7 +246,7 @@ PSEUDO_SET(i4btelattach, i4b_tel);
* initialization at kernel load time
*---------------------------------------------------------------------------*/
PDEVSTATIC void
i4btelinit(void *unused)
isdntelinit(void *unused)
{
#if defined(__FreeBSD__) && __FreeBSD__ >= 4
cdevsw_add(&i4btel_cdevsw);
@ -299,18 +299,14 @@ dummy_i4btelattach(struct device *parent, struct device *self, void *aux)
*---------------------------------------------------------------------------*/
PDEVSTATIC void
#ifdef __FreeBSD__
i4btelattach(void *dummy)
isdntelattach(void *dummy)
#else
i4btelattach()
isdntelattach()
#endif
{
int i, j;
#ifndef HACK_NO_PSEUDO_ATTACH_MSG
printf("i4btel: %d ISDN telephony interface device(s) attached\n", NI4BTEL);
#endif
for(i=0; i < NI4BTEL; i++)
for(i=0; i < NISDNTEL; i++)
{
for(j=0; j < NOFUNCS; j++)
{
@ -357,14 +353,14 @@ i4btelattach()
* open tel device
*---------------------------------------------------------------------------*/
PDEVSTATIC int
i4btelopen(dev_t dev, int flag, int fmt, struct proc *p)
isdntelopen(dev_t dev, int flag, int fmt, struct proc *p)
{
int unit = UNIT(dev);
int func = FUNC(dev);
tel_sc_t *sc;
if(unit >= NI4BTEL)
if(unit >= NISDNTEL)
return(ENXIO);
sc = &tel_sc[unit][func];
@ -386,7 +382,7 @@ i4btelopen(dev_t dev, int flag, int fmt, struct proc *p)
* close tel device
*---------------------------------------------------------------------------*/
PDEVSTATIC int
i4btelclose(dev_t dev, int flag, int fmt, struct proc *p)
isdntelclose(dev_t dev, int flag, int fmt, struct proc *p)
{
int unit = UNIT(dev);
int func = FUNC(dev);
@ -394,7 +390,7 @@ i4btelclose(dev_t dev, int flag, int fmt, struct proc *p)
int error = 0;
int x;
if(unit > NI4BTEL)
if(unit > NISDNTEL)
return(ENXIO);
sc = &tel_sc[unit][func];
@ -428,7 +424,7 @@ i4btelclose(dev_t dev, int flag, int fmt, struct proc *p)
* i4btelioctl - device driver ioctl routine
*---------------------------------------------------------------------------*/
PDEVSTATIC int
i4btelioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
isdntelioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
{
int unit = UNIT(dev);
int func = FUNC(dev);
@ -550,7 +546,7 @@ i4btelioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
* read from tel device
*---------------------------------------------------------------------------*/
PDEVSTATIC int
i4btelread(dev_t dev, struct uio *uio, int ioflag)
isdntelread(dev_t dev, struct uio *uio, int ioflag)
{
int unit = UNIT(dev);
int func = FUNC(dev);
@ -670,7 +666,7 @@ i4btelread(dev_t dev, struct uio *uio, int ioflag)
* write to tel device
*---------------------------------------------------------------------------*/
PDEVSTATIC int
i4btelwrite(dev_t dev, struct uio * uio, int ioflag)
isdntelwrite(dev_t dev, struct uio * uio, int ioflag)
{
int unit = UNIT(dev);
int func = FUNC(dev);
@ -833,7 +829,7 @@ tel_tone(tel_sc_t *sc)
* device driver poll
*---------------------------------------------------------------------------*/
PDEVSTATIC int
i4btelpoll(dev_t dev, int events, struct proc *p)
isdntelpoll(dev_t dev, int events, struct proc *p)
{
int revents = 0; /* Events we found */
int s;
@ -1888,4 +1884,4 @@ static u_char sinetab[8000] = { 213, 213, 213, 213, 213, 213, 213, 212,
/*===========================================================================*/
#endif /* NI4BTEL > 0 */
#endif /* NISDNTEL > 0 */

56
sys/netisdn/i4b_trace.c
View File

@ -27,7 +27,7 @@
* i4btrc - device driver for trace data read device
* ---------------------------------------------------
*
* $Id: i4b_trace.c,v 1.6 2001/11/13 01:06:23 lukem Exp $
* $Id: i4b_trace.c,v 1.7 2002/03/16 16:56:05 martin Exp $
*
* last edit-date: [Fri Jan 5 11:33:47 2001]
*
@ -35,11 +35,11 @@
*---------------------------------------------------------------------------*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: i4b_trace.c,v 1.6 2001/11/13 01:06:23 lukem Exp $");
__KERNEL_RCSID(0, "$NetBSD: i4b_trace.c,v 1.7 2002/03/16 16:56:05 martin Exp $");
#include "i4btrc.h"
#include "isdntrc.h"
#if NI4BTRC > 0
#if NISDNTRC > 0
#include <sys/param.h>
#include <sys/systm.h>
@ -69,8 +69,8 @@ __KERNEL_RCSID(0, "$NetBSD: i4b_trace.c,v 1.6 2001/11/13 01:06:23 lukem Exp $");
#include <netisdn/i4b_l1l2.h>
#include <netisdn/i4b_l2.h>
static struct ifqueue trace_queue[NI4BTRC];
static int device_state[NI4BTRC];
static struct ifqueue trace_queue[NISDNTRC];
static int device_state[NISDNTRC];
#define ST_IDLE 0x00
#define ST_ISOPEN 0x01
#define ST_WAITDATA 0x02
@ -81,29 +81,25 @@ static int txunit = -1; /* l2 bri of transmitting driver */
static int outunit = -1; /* output device for trace data */
#define PDEVSTATIC /* - not static - */
void i4btrcattach __P((void));
int i4btrcopen __P((dev_t dev, int flag, int fmt, struct proc *p));
int i4btrcclose __P((dev_t dev, int flag, int fmt, struct proc *p));
int i4btrcread __P((dev_t dev, struct uio * uio, int ioflag));
int i4btrcioctl __P((dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p));
void isdntrcattach __P((void));
int isdntrcopen __P((dev_t dev, int flag, int fmt, struct proc *p));
int isdntrcclose __P((dev_t dev, int flag, int fmt, struct proc *p));
int isdntrcread __P((dev_t dev, struct uio * uio, int ioflag));
int isdntrcioctl __P((dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p));
/*---------------------------------------------------------------------------*
* interface attach routine
*---------------------------------------------------------------------------*/
PDEVSTATIC void
#ifdef __FreeBSD__
i4btrcattach(void *dummy)
isdntrcattach(void *dummy)
#else
i4btrcattach()
isdntrcattach()
#endif
{
int i;
#ifndef HACK_NO_PSEUDO_ATTACH_MSG
printf("i4btrc: %d ISDN trace device(s) attached\n", NI4BTRC);
#endif
for(i=0; i < NI4BTRC; i++)
for(i=0; i < NISDNTRC; i++)
{
#if defined(__FreeBSD__)
@ -113,12 +109,12 @@ i4btrcattach()
devfs_token[i]
= devfs_add_devswf(&i4btrc_cdevsw, i, DV_CHR,
UID_ROOT, GID_WHEEL, 0600,
"i4btrc%d", i);
"isdntrc%d", i);
#endif
#else
make_dev(&i4btrc_cdevsw, i,
UID_ROOT, GID_WHEEL, 0600, "i4btrc%d", i);
UID_ROOT, GID_WHEEL, 0600, "isdntrc%d", i);
#endif
#endif
trace_queue[i].ifq_maxlen = IFQ_MAXLEN;
@ -172,9 +168,9 @@ isdn_layer2_trace_ind(isdn_layer2token t, i4b_trace_hdr *hdr, size_t len, unsign
/* check valid interface */
if((bri = hdr->bri) > NI4BTRC)
if((bri = hdr->bri) > NISDNTRC)
{
printf("i4b_trace: get_trace_data_from_l1 - bri > NI4BTRC!\n");
printf("i4b_trace: get_trace_data_from_l1 - bri > NISDNTRC!\n");
return(0);
}
@ -236,12 +232,12 @@ isdn_layer2_trace_ind(isdn_layer2token t, i4b_trace_hdr *hdr, size_t len, unsign
* open trace device
*---------------------------------------------------------------------------*/
PDEVSTATIC int
i4btrcopen(dev_t dev, int flag, int fmt, struct proc *p)
isdntrcopen(dev_t dev, int flag, int fmt, struct proc *p)
{
int x;
int unit = minor(dev);
if(unit >= NI4BTRC)
if(unit >= NISDNTRC)
return(ENXIO);
if(device_state[unit] & ST_ISOPEN)
@ -264,7 +260,7 @@ i4btrcopen(dev_t dev, int flag, int fmt, struct proc *p)
* close trace device
*---------------------------------------------------------------------------*/
PDEVSTATIC int
i4btrcclose(dev_t dev, int flag, int fmt, struct proc *p)
isdntrcclose(dev_t dev, int flag, int fmt, struct proc *p)
{
int bri = minor(dev);
int x;
@ -304,7 +300,7 @@ i4btrcclose(dev_t dev, int flag, int fmt, struct proc *p)
* read from trace device
*---------------------------------------------------------------------------*/
PDEVSTATIC int
i4btrcread(dev_t dev, struct uio * uio, int ioflag)
isdntrcread(dev_t dev, struct uio * uio, int ioflag)
{
struct mbuf *m;
int x;
@ -360,7 +356,7 @@ i4btrcpoll(dev_t dev, int events, struct proc *p)
* device driver ioctl routine
*---------------------------------------------------------------------------*/
PDEVSTATIC int
i4btrcioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
isdntrcioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
{
int error = 0;
int bri = minor(dev);
@ -378,12 +374,12 @@ i4btrcioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
case I4B_TRC_SETA:
tsa = (i4b_trace_setupa_t *)data;
if(tsa->rxunit >= 0 && tsa->rxunit < NI4BTRC)
if(tsa->rxunit >= 0 && tsa->rxunit < NISDNTRC)
rxunit = tsa->rxunit;
else
error = EINVAL;
if(tsa->txunit >= 0 && tsa->txunit < NI4BTRC)
if(tsa->txunit >= 0 && tsa->txunit < NISDNTRC)
txunit = tsa->txunit;
else
error = EINVAL;
@ -424,4 +420,4 @@ i4btrcioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct proc *p)
return(error);
}
#endif /* NI4BTRC > 0 */
#endif /* NISDNTRC > 0 */

12
sys/sys/conf.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: conf.h,v 1.99 2002/03/15 17:29:06 manu Exp $ */
/* $NetBSD: conf.h,v 1.100 2002/03/16 16:56:06 martin Exp $ */
/*-
* Copyright (c) 1990, 1993
@ -445,19 +445,19 @@ extern struct cdevsw cdevsw[];
#define cdev_wdog_init(c,n) cdev__oci_init(c,n)
/* open, close, ioctl */
#define cdev_i4bctl_init(c,n) cdev__oci_init(c,n)
#define cdev_isdnctl_init(c,n) cdev__oci_init(c,n)
/* open, close, read, write, ioctl, poll */
#define cdev_i4brbch_init(c,n) cdev__ocrwip_init(c,n)
#define cdev_isdnbchan_init(c,n) cdev__ocrwip_init(c,n)
/* open, close, read, write, ioctl, poll */
#define cdev_i4btel_init(c,n) cdev__ocrwip_init(c,n)
#define cdev_isdntel_init(c,n) cdev__ocrwip_init(c,n)
/* open, close, read, ioctl */
#define cdev_i4btrc_init(c,n) cdev__ocri_init(c,n)
#define cdev_isdntrc_init(c,n) cdev__ocri_init(c,n)
/* open, close, read, ioctl, poll */
#define cdev_i4b_init(c,n) cdev__ocrip_init(c,n)
#define cdev_isdn_init(c,n) cdev__ocrip_init(c,n)
/* open, close, ioctl, mmap */
#define cdev_pci_init(c,n) cdev__ocim_init(c,n)