diff options
77 files changed, 338 insertions, 135 deletions
diff --git a/sys/amd64/include/md_var.h b/sys/amd64/include/md_var.h index ad8ba37..6bc5808 100644 --- a/sys/amd64/include/md_var.h +++ b/sys/amd64/include/md_var.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: $ + * $Id: md_var.h,v 1.1 1995/03/16 18:11:43 bde Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -64,5 +64,6 @@ int fill_regs __P((struct proc *p, struct reg *regs)); int mvesp __P((void)); void setconf __P((void)); void userconfig __P((void)); +void vm_bounce_init __P((void)); #endif /* !_MACHINE_MD_VAR_H_ */ diff --git a/sys/amd64/isa/isa.c b/sys/amd64/isa/isa.c index de23f0b..6afc959 100644 --- a/sys/amd64/isa/isa.c +++ b/sys/amd64/isa/isa.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 - * $Id: isa.c,v 1.40 1995/03/16 17:31:18 se Exp $ + * $Id: isa.c,v 1.41 1995/03/25 05:54:33 swallace Exp $ */ /* @@ -137,6 +137,8 @@ static inthand_t *slowintr[ICU_LEN] = { }; static void config_isadev __P((struct isa_device *isdp, u_int *mp)); +static void config_isadev_c __P((struct isa_device *isdp, u_int *mp, + int reconfig)); static void conflict __P((struct isa_device *dvp, struct isa_device *tmpdvp, int item, char const *whatnot, char const *reason, char const *format)); @@ -366,8 +368,6 @@ isa_configure() { */ -static void config_isadev_c(); - static void config_isadev(isdp, mp) struct isa_device *isdp; diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c index f9defd0..03e561c 100644 --- a/sys/dev/cy/cy.c +++ b/sys/dev/cy/cy.c @@ -27,7 +27,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: cy.c,v 1.3 1995/02/25 20:09:12 pst Exp $ + * $Id: cy.c,v 1.4 1995/02/28 00:20:52 pst Exp $ */ /* @@ -88,6 +88,8 @@ #include <i386/isa/isa_device.h> #include <i386/isa/ic/cd1400.h> +#else +#include <machine/clock.h> #define RxFifoThreshold 3 /* 3 characters (out of 12) in the receive * FIFO before an interrupt is generated */ diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c index f9defd0..03e561c 100644 --- a/sys/dev/cy/cy_isa.c +++ b/sys/dev/cy/cy_isa.c @@ -27,7 +27,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: cy.c,v 1.3 1995/02/25 20:09:12 pst Exp $ + * $Id: cy.c,v 1.4 1995/02/28 00:20:52 pst Exp $ */ /* @@ -88,6 +88,8 @@ #include <i386/isa/isa_device.h> #include <i386/isa/ic/cd1400.h> +#else +#include <machine/clock.h> #define RxFifoThreshold 3 /* 3 characters (out of 12) in the receive * FIFO before an interrupt is generated */ diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c index 18dbcb4..4f2175f 100644 --- a/sys/dev/ep/if_ep.c +++ b/sys/dev/ep/if_ep.c @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: if_ep.c,v 1.20 1995/03/23 06:53:38 davidg Exp $ + * $Id: if_ep.c,v 1.21 1995/03/23 07:31:08 gibbs Exp $ */ /* @@ -79,6 +79,10 @@ #include <net/bpfdesc.h> #endif +#if defined(__FreeBSD__) +#include <machine/clock.h> +#endif + #include <i386/isa/isa.h> #include <i386/isa/isa_device.h> #include <i386/isa/icu.h> diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c index 7bb5a2f..095725f 100644 --- a/sys/dev/ie/if_ie.c +++ b/sys/dev/ie/if_ie.c @@ -43,7 +43,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_ie.c,v 1.20 1994/12/22 21:56:09 wollman Exp $ + * $Id: if_ie.c,v 1.21 1995/03/19 14:28:45 davidg Exp $ */ /* @@ -137,6 +137,8 @@ iomem, and to make 16-pointers, we subtract iomem and and with 0xffff. #include <netns/ns_if.h> #endif +#include <machine/clock.h> + #include <i386/isa/isa.h> #include <i386/isa/isa_device.h> #include <i386/isa/ic/i82586.h> diff --git a/sys/dev/joy/joy.c b/sys/dev/joy/joy.c index 5fae0d7..942b45a 100644 --- a/sys/dev/joy/joy.c +++ b/sys/dev/joy/joy.c @@ -32,9 +32,9 @@ #include <errno.h> -#include <sys/types.h> +#include <sys/param.h> +#include <sys/systm.h> -#include <machine/cpufunc.h> #include <machine/joystick.h> #include <i386/isa/isa.h> @@ -158,7 +158,7 @@ joyread (dev_t dev, struct uio *uio, int flag) state >>= 4; c.b1 = ~state & 1; c.b2 = ~(state >> 1) & 1; - return uiomove (&c, sizeof(struct joystick), uio); + return uiomove ((caddr_t)&c, sizeof(struct joystick), uio); } int joyioctl (dev_t dev, int cmd, caddr_t data, int flag, struct proc *p) { diff --git a/sys/dev/lnc/if_lnc.c b/sys/dev/lnc/if_lnc.c index b482f5f..305b7fc 100644 --- a/sys/dev/lnc/if_lnc.c +++ b/sys/dev/lnc/if_lnc.c @@ -128,6 +128,11 @@ struct lnc_softc { } lnc_softc[NLNC]; /* Function prototypes */ +int bicc_probe(struct isa_device *); +int depca_probe(struct isa_device *); +int lance_probe(int); +int ne2100_probe(struct isa_device *); +int pcnet_probe(int); void lnc_init(int); void lnc_start(struct ifnet *); int lnc_ioctl(struct ifnet *, int, caddr_t); diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c index d04f08e..338fabf 100644 --- a/sys/dev/mcd/mcd.c +++ b/sys/dev/mcd/mcd.c @@ -40,7 +40,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: mcd.c,v 1.38 1995/02/22 02:12:10 ache Exp $ + * $Id: mcd.c,v 1.39 1995/02/23 17:40:16 ache Exp $ */ static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; @@ -52,6 +52,7 @@ static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; #include <sys/conf.h> #include <sys/file.h> #include <sys/buf.h> +#include <sys/proc.h> #include <sys/stat.h> #include <sys/uio.h> #include <sys/ioctl.h> @@ -61,6 +62,10 @@ static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; #include <sys/disklabel.h> #include <sys/devconf.h> +#include <machine/clock.h> + +#include <i386/i386/cons.h> + #include <i386/isa/isa.h> #include <i386/isa/isa_device.h> #include <i386/isa/mcdreg.h> diff --git a/sys/dev/mse/mse.c b/sys/dev/mse/mse.c index f8e7cc0..de7b26d 100644 --- a/sys/dev/mse/mse.c +++ b/sys/dev/mse/mse.c @@ -11,7 +11,7 @@ * this software for any purpose. It is provided "as is" * without express or implied warranty. * - * $Id: mse.c,v 1.8 1994/10/23 21:27:31 wollman Exp $ + * $Id: mse.c,v 1.9 1994/11/08 05:41:34 jkh Exp $ */ /* * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and @@ -57,6 +57,8 @@ #include <sys/uio.h> #include <sys/devconf.h> +#include <machine/clock.h> + #include <i386/isa/isa_device.h> #include <i386/isa/icu.h> diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c index 5232de1..6c20b26 100644 --- a/sys/fs/fdescfs/fdesc_vnops.c +++ b/sys/fs/fdescfs/fdesc_vnops.c @@ -35,7 +35,7 @@ * * @(#)fdesc_vnops.c 8.9 (Berkeley) 1/21/94 * - * $Id: fdesc_vnops.c,v 1.6 1994/10/02 17:47:51 phk Exp $ + * $Id: fdesc_vnops.c,v 1.7 1994/10/06 21:06:42 davidg Exp $ */ /* @@ -59,6 +59,7 @@ #include <sys/buf.h> #include <sys/dirent.h> #include <sys/socketvar.h> +#include <sys/tty.h> #include <miscfs/fdesc/fdesc.h> #define cttyvp(p) ((p)->p_flag & P_CONTROLT ? (p)->p_session->s_ttyvp : NULL) diff --git a/sys/fs/portalfs/portal_vnops.c b/sys/fs/portalfs/portal_vnops.c index b25b543..56f52fb 100644 --- a/sys/fs/portalfs/portal_vnops.c +++ b/sys/fs/portalfs/portal_vnops.c @@ -35,7 +35,7 @@ * * @(#)portal_vnops.c 8.8 (Berkeley) 1/21/94 * - * $Id: portal_vnops.c,v 1.3 1994/08/20 03:48:52 davidg Exp $ + * $Id: portal_vnops.c,v 1.4 1994/09/21 03:47:05 wollman Exp $ */ /* @@ -70,9 +70,7 @@ portal_closefd(p, fd) int fd; { int error; - struct { - int fd; - } ua; + struct close_args ua; int rc; ua.fd = fd; diff --git a/sys/gnu/ext2fs/ext2_bmap.c b/sys/gnu/ext2fs/ext2_bmap.c index bb875f5..1bc8455 100644 --- a/sys/gnu/ext2fs/ext2_bmap.c +++ b/sys/gnu/ext2fs/ext2_bmap.c @@ -36,10 +36,11 @@ * SUCH DAMAGE. * * @(#)ufs_bmap.c 8.6 (Berkeley) 1/21/94 - * $Id: ufs_bmap.c,v 1.5 1995/01/09 16:05:25 davidg Exp $ + * $Id: ufs_bmap.c,v 1.6 1995/03/04 03:24:45 davidg Exp $ */ #include <sys/param.h> +#include <sys/systm.h> #include <sys/buf.h> #include <sys/proc.h> #include <sys/vnode.h> @@ -53,8 +54,6 @@ #include <ufs/ufs/ufsmount.h> #include <ufs/ufs/ufs_extern.h> -int ufs_bmaparray __P((struct vnode *, daddr_t, daddr_t *, struct indir *, int *, int *)); - /* * Bmap converts a the logical block number of a file to its physical block * number on the disk. The conversion is done by using the logical block diff --git a/sys/gnu/fs/ext2fs/ext2_bmap.c b/sys/gnu/fs/ext2fs/ext2_bmap.c index bb875f5..1bc8455 100644 --- a/sys/gnu/fs/ext2fs/ext2_bmap.c +++ b/sys/gnu/fs/ext2fs/ext2_bmap.c @@ -36,10 +36,11 @@ * SUCH DAMAGE. * * @(#)ufs_bmap.c 8.6 (Berkeley) 1/21/94 - * $Id: ufs_bmap.c,v 1.5 1995/01/09 16:05:25 davidg Exp $ + * $Id: ufs_bmap.c,v 1.6 1995/03/04 03:24:45 davidg Exp $ */ #include <sys/param.h> +#include <sys/systm.h> #include <sys/buf.h> #include <sys/proc.h> #include <sys/vnode.h> @@ -53,8 +54,6 @@ #include <ufs/ufs/ufsmount.h> #include <ufs/ufs/ufs_extern.h> -int ufs_bmaparray __P((struct vnode *, daddr_t, daddr_t *, struct indir *, int *, int *)); - /* * Bmap converts a the logical block number of a file to its physical block * number on the disk. The conversion is done by using the logical block diff --git a/sys/gnu/i386/isa/nic3008.c b/sys/gnu/i386/isa/nic3008.c index bb9f57e..084ff3f 100644 --- a/sys/gnu/i386/isa/nic3008.c +++ b/sys/gnu/i386/isa/nic3008.c @@ -1,6 +1,6 @@ -static char nic38_id[] = "@(#)$Id: nic3008.c,v 1.2 1995/02/15 11:59:40 jkh Exp $"; +static char nic38_id[] = "@(#)$Id: nic3008.c,v 1.3 1995/03/19 14:28:35 davidg Exp $"; /******************************************************************************* - * II - Version 0.1 $Revision: 1.2 $ $State: Exp $ + * II - Version 0.1 $Revision: 1.3 $ $State: Exp $ * * Copyright 1994 Dietmar Friede ******************************************************************************* @@ -10,6 +10,9 @@ static char nic38_id[] = "@(#)$Id: nic3008.c,v 1.2 1995/02/15 11:59:40 jkh E * ******************************************************************************* * $Log: nic3008.c,v $ + * Revision 1.3 1995/03/19 14:28:35 davidg + * Removed redundant newlines that were in some panic strings. + * * Revision 1.2 1995/02/15 11:59:40 jkh * Fix a few more nits. Should compile better now! :_) * @@ -40,6 +43,7 @@ static char nic38_id[] = "@(#)$Id: nic3008.c,v 1.2 1995/02/15 11:59:40 jkh E #include "ioctl.h" #include "kernel.h" #include "systm.h" +#include <sys/proc.h> #include "i386/isa/isa_device.h" #include "gnu/i386/isa/nic3008.h" @@ -817,8 +821,11 @@ b_intr(int mb, int c, struct nic_softc * sc) { chan->state = IDLE; ctrl->o_len = 0; - timeout(isdn_start_out, (void *)chan->ctrl, - hz/5); + /* + * XXX the chan->ctrl arg is very bogus. + * Don't just use a cast to "fix" it. + */ + timeout(isdn_start_out, chan->ctrl, hz / 5); break; } break; diff --git a/sys/gnu/i386/isa/nic3009.c b/sys/gnu/i386/isa/nic3009.c index c4e7a13..af84c50 100644 --- a/sys/gnu/i386/isa/nic3009.c +++ b/sys/gnu/i386/isa/nic3009.c @@ -1,6 +1,6 @@ -static char nic39_id[] = "@(#)$Id: nic3009.c,v 1.3 1995/02/15 11:59:41 jkh Exp $"; +static char nic39_id[] = "@(#)$Id: nic3009.c,v 1.4 1995/02/16 08:06:21 jkh Exp $"; /******************************************************************************* - * II - Version 0.1 $Revision: 1.3 $ $State: Exp $ + * II - Version 0.1 $Revision: 1.4 $ $State: Exp $ * * Copyright 1994 Dietmar Friede ******************************************************************************* @@ -10,6 +10,9 @@ static char nic39_id[] = "@(#)$Id: nic3009.c,v 1.3 1995/02/15 11:59:41 jkh E * ******************************************************************************* * $Log: nic3009.c,v $ + * Revision 1.4 1995/02/16 08:06:21 jkh + * Fix a few bogons introduced when config lost the 3 char limitation. + * * Revision 1.3 1995/02/15 11:59:41 jkh * Fix a few more nits. Should compile better now! :_) * @@ -43,6 +46,7 @@ static char nic39_id[] = "@(#)$Id: nic3009.c,v 1.3 1995/02/15 11:59:41 jkh E #include "ioctl.h" #include "kernel.h" #include "systm.h" +#include "proc.h" #include "i386/isa/isa_device.h" #include "gnu/i386/isa/nic3009.h" @@ -1116,7 +1120,11 @@ up_intr(unsigned unit, struct nnic_softc * sc) { chan->state = IDLE; ctrl->o_len = 0; - timeout(isdn_start_out,(void *)chan->ctrl,hz/5); + /* + * XXX the chan->ctrl arg is very bogus. + * Don't just use a cast to "fix" it. + */ + timeout(isdn_start_out, chan->ctrl, hz / 5); } break; diff --git a/sys/gnu/isdn/iispy.c b/sys/gnu/isdn/iispy.c index a88159b..7d17076 100644 --- a/sys/gnu/isdn/iispy.c +++ b/sys/gnu/isdn/iispy.c @@ -1,6 +1,6 @@ -static char _ispyid[] = "@(#)$Id: iispy.c,v 1.1 1995/02/14 15:00:29 jkh Exp $"; +static char _ispyid[] = "@(#)$Id: iispy.c,v 1.2 1995/02/15 06:28:27 jkh Exp $"; /******************************************************************************* - * II - Version 0.1 $Revision: 1.1 $ $State: Exp $ + * II - Version 0.1 $Revision: 1.2 $ $State: Exp $ * * Copyright 1994 Dietmar Friede ******************************************************************************* @@ -10,6 +10,9 @@ static char _ispyid[] = "@(#)$Id: iispy.c,v 1.1 1995/02/14 15:00:29 jkh Exp * ******************************************************************************* * $Log: iispy.c,v $ + * Revision 1.2 1995/02/15 06:28:27 jkh + * Fix up include paths, nuke some warnings. + * * Revision 1.1 1995/02/14 15:00:29 jkh * An ISDN driver that supports the EDSS1 and the 1TR6 ISDN interfaces. * EDSS1 is the "Euro-ISDN", 1TR6 is the soon obsolete german ISDN Interface. @@ -38,8 +41,6 @@ static char _ispyid[] = "@(#)$Id: iispy.c,v 1.1 1995/02/14 15:00:29 jkh Exp #include "gnu/isdn/isdn_ioctl.h" -int ispyattach(); - int nispy = NISPY; int ispy_applnr; static int next_if =0; diff --git a/sys/gnu/isdn/iitel.c b/sys/gnu/isdn/iitel.c index 1d801e1..f751963 100644 --- a/sys/gnu/isdn/iitel.c +++ b/sys/gnu/isdn/iitel.c @@ -1,6 +1,6 @@ -static char _itelid[] = "@(#)$Id: iitel.c,v 1.1 1995/02/14 15:00:30 jkh Exp $"; +static char _itelid[] = "@(#)$Id: iitel.c,v 1.2 1995/02/15 06:28:27 jkh Exp $"; /******************************************************************************* - * II - Version 0.1 $Revision: 1.1 $ $State: Exp $ + * II - Version 0.1 $Revision: 1.2 $ $State: Exp $ * * Copyright 1994 Dietmar Friede ******************************************************************************* @@ -10,6 +10,9 @@ static char _itelid[] = "@(#)$Id: iitel.c,v 1.1 1995/02/14 15:00:30 jkh Exp * ******************************************************************************* * $Log: iitel.c,v $ + * Revision 1.2 1995/02/15 06:28:27 jkh + * Fix up include paths, nuke some warnings. + * * Revision 1.1 1995/02/14 15:00:30 jkh * An ISDN driver that supports the EDSS1 and the 1TR6 ISDN interfaces. * EDSS1 is the "Euro-ISDN", 1TR6 is the soon obsolete german ISDN Interface. @@ -38,8 +41,6 @@ static char _itelid[] = "@(#)$Id: iitel.c,v 1.1 1995/02/14 15:00:30 jkh Exp #include "gnu/isdn/isdn_ioctl.h" -int itelattach(); - int nitel = NITEL; static int applnr[NITEL]; static int next_if =0; diff --git a/sys/gnu/isdn/iitty.c b/sys/gnu/isdn/iitty.c index a58793b..03d5f72 100644 --- a/sys/gnu/isdn/iitty.c +++ b/sys/gnu/isdn/iitty.c @@ -1,6 +1,6 @@ -static char _ittyid[] = "@(#)$Id: iitty.c,v 1.3 1995/02/25 20:08:52 pst Exp $"; +static char _ittyid[] = "@(#)$Id: iitty.c,v 1.4 1995/02/28 00:20:30 pst Exp $"; /******************************************************************************* - * II - Version 0.1 $Revision: 1.3 $ $State: Exp $ + * II - Version 0.1 $Revision: 1.4 $ $State: Exp $ * * Copyright 1994 Dietmar Friede ******************************************************************************* @@ -10,6 +10,18 @@ static char _ittyid[] = "@(#)$Id: iitty.c,v 1.3 1995/02/25 20:08:52 pst Exp * ******************************************************************************* * $Log: iitty.c,v $ + * Revision 1.4 1995/02/28 00:20:30 pst + * Incorporate bde's code-review comments. + * + * (a) bring back ttselect, now that we have xxxdevtotty() it isn't dangerous. + * (b) remove all of the wrappers that have been replaced by ttselect + * (c) fix formatting in syscons.c and definition in syscons.h + * (d) add cxdevtotty + * + * NOT DONE: + * (e) make pcvt work... it was already broken...when someone fixes pcvt to + * link properly, just rename get_pccons to xxxdevtotty and we're done + * * Revision 1.3 1995/02/25 20:08:52 pst * (a) remove the pointer to each driver's tty structure array from cdevsw * (b) add a function callback vector to tty drivers that will return a pointer @@ -53,7 +65,7 @@ static char _ittyid[] = "@(#)$Id: iitty.c,v 1.3 1995/02/25 20:08:52 pst Exp #include "gnu/isdn/isdn_ioctl.h" -int ityattach(), ityparam(); +int ityparam(); void itystart(); int nity = NITY; diff --git a/sys/gnu/isdn/isdn.c b/sys/gnu/isdn/isdn.c index e71c91b..035c4fb 100644 --- a/sys/gnu/isdn/isdn.c +++ b/sys/gnu/isdn/isdn.c @@ -1,6 +1,6 @@ -static char _isdnid[] = "@(#)$Id: isdn.c,v 1.1 1995/02/14 15:00:33 jkh Exp $"; +static char _isdnid[] = "@(#)$Id: isdn.c,v 1.2 1995/02/15 06:28:29 jkh Exp $"; /******************************************************************************* - * II - Version 0.1 $Revision: 1.1 $ $State: Exp $ + * II - Version 0.1 $Revision: 1.2 $ $State: Exp $ * * Copyright 1994 Dietmar Friede ******************************************************************************* @@ -10,6 +10,9 @@ static char _isdnid[] = "@(#)$Id: isdn.c,v 1.1 1995/02/14 15:00:33 jkh Exp $ * ******************************************************************************* * $Log: isdn.c,v $ + * Revision 1.2 1995/02/15 06:28:29 jkh + * Fix up include paths, nuke some warnings. + * * Revision 1.1 1995/02/14 15:00:33 jkh * An ISDN driver that supports the EDSS1 and the 1TR6 ISDN interfaces. * EDSS1 is the "Euro-ISDN", 1TR6 is the soon obsolete german ISDN Interface. @@ -44,6 +47,7 @@ static char _isdnid[] = "@(#)$Id: isdn.c,v 1.1 1995/02/14 15:00:33 jkh Exp $ #include "ioctl.h" #include "kernel.h" #include "systm.h" +#include "proc.h" #include "gnu/isdn/isdn_ioctl.h" @@ -51,14 +55,12 @@ isdn_appl_t isdn_appl[N_ISDN_APPL]; isdn_ctrl_t isdn_ctrl[N_ISDN_CTRL]; int Isdn_Appl, Isdn_Ctrl, Isdn_Typ; -int isdn_input(), isdn_output(); int ii_input(), ii_out(), ii_connect(), ii_disconnect(); int ity_input(), ity_out(), ity_connect(), ity_disconnect(); int itel_input(), itel_out(), itel_connect(), itel_disconnect(); int ispy_input(); int isdn_stat(); -void isdn_disconnect(); static int o_flags, r_flags, bufind[TYPNR]; static char buffer[TYPNR][257]; static u_char appl_list[TYPNR]; diff --git a/sys/gnu/isdn/isdn_ioctl.h b/sys/gnu/isdn/isdn_ioctl.h index ff49486..e0475d1 100644 --- a/sys/gnu/isdn/isdn_ioctl.h +++ b/sys/gnu/isdn/isdn_ioctl.h @@ -1,4 +1,4 @@ -static char _isdn_ioctl_id[] = "@(#)$Id: isdn_ioctl.h,v 1.1 1995/01/25 14:06:18 jkr Exp jkr $"; +static char _isdn_ioctl_id[] = "@(#)$Id: isdn_ioctl.h,v 1.1 1995/02/14 15:00:35 jkh Exp $"; /******************************************************************************* * II - Version 0.1 $Revision: 1.1 $ $State: Exp $ * @@ -10,6 +10,15 @@ static char _isdn_ioctl_id[] = "@(#)$Id: isdn_ioctl.h,v 1.1 1995/01/25 14:06 * ******************************************************************************* * $Log: isdn_ioctl.h,v $ + * Revision 1.1 1995/02/14 15:00:35 jkh + * An ISDN driver that supports the EDSS1 and the 1TR6 ISDN interfaces. + * EDSS1 is the "Euro-ISDN", 1TR6 is the soon obsolete german ISDN Interface. + * Obtained from: Dietmar Friede <dfriede@drnhh.neuhaus.de> and + * Juergen Krause <jkr@saarlink.de> + * + * This is only one part - the rest to follow in a couple of hours. + * This part is a benign import, since it doesn't affect anything else. + * * ******************************************************************************/ @@ -134,3 +143,33 @@ typedef struct #define ISDN_HANGUP _IOWR('I',4,int) #define ISDN_SET_PARAM _IOWR('I',8,isdn_param) #define ISDN_GET_PARAM _IOWR('I',9,isdn_param) + +#ifdef KERNEL + +/* XXX should be elsewhere. */ + +/* From isdn.c. */ +void isdn_accept_con_ind __P((int an, int cn, char serv, char serv_add, + char subadr, char nl, char *num)); +void isdn_conn_ind __P((int an, int cn, int dial)); +int isdn_ctrl_attach __P((int n)); +void isdn_disconn_ind __P((int an)); +void isdn_disconnect __P((int an, int rea)); +void isdn_info __P((int an, int typ, int len, char *data)); +int isdn_input __P((int an, int len, char *buf, int dir)); +int isdn_msg __P((int an)); +int isdn_output __P((int an)); + +/* From if_ii.c. */ +int iiattach __P((int ap)); + +/* From iispy.c. */ +int ispyattach __P((int ap)); + +/* From iitel.c. */ +int itelattach __P((int ap)); + +/* From iitty.c. */ +int ityattach __P((int ap)); + +#endif /* KERNEL */ diff --git a/sys/i386/eisa/aha1742.c b/sys/i386/eisa/aha1742.c index 1511eeb..ebbd4bb 100644 --- a/sys/i386/eisa/aha1742.c +++ b/sys/i386/eisa/aha1742.c @@ -14,7 +14,7 @@ * * commenced: Sun Sep 27 18:14:01 PDT 1992 * - * $Id: aha1742.c,v 1.28 1995/03/23 07:31:07 gibbs Exp $ + * $Id: aha1742.c,v 1.29 1995/03/23 09:00:18 rgrimes Exp $ */ #include <sys/types.h> @@ -29,6 +29,7 @@ #include <sys/buf.h> #include <sys/proc.h> #include <sys/user.h> +#include <machine/clock.h> #include <i386/isa/isa.h> #include <i386/isa/isa_device.h> #else diff --git a/sys/i386/i386/conf.c b/sys/i386/i386/conf.c index 5767354..ebbf58a 100644 --- a/sys/i386/i386/conf.c +++ b/sys/i386/i386/conf.c @@ -42,7 +42,7 @@ * SUCH DAMAGE. * * from: @(#)conf.c 5.8 (Berkeley) 5/12/91 - * $Id: conf.c,v 1.77 1995/03/05 22:24:59 joerg Exp $ + * $Id: conf.c,v 1.78 1995/03/27 19:39:58 ache Exp $ */ #include <sys/param.h> @@ -419,14 +419,6 @@ d_ttycv_t pcdevtotty; #define scdevtotty nxdevtotty #endif /* NSC > 0, NVT > 0 */ -/* controlling TTY */ -d_open_t cttyopen; -d_rdwr_t cttyread; -d_rdwr_t cttywrite; -d_ioctl_t cttyioctl; -d_select_t cttyselect; -d_ttycv_t cttydevtotty; - /* /dev/mem */ d_open_t mmopen; d_close_t mmclose; diff --git a/sys/i386/include/md_var.h b/sys/i386/include/md_var.h index ad8ba37..6bc5808 100644 --- a/sys/i386/include/md_var.h +++ b/sys/i386/include/md_var.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: $ + * $Id: md_var.h,v 1.1 1995/03/16 18:11:43 bde Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -64,5 +64,6 @@ int fill_regs __P((struct proc *p, struct reg *regs)); int mvesp __P((void)); void setconf __P((void)); void userconfig __P((void)); +void vm_bounce_init __P((void)); #endif /* !_MACHINE_MD_VAR_H_ */ diff --git a/sys/i386/isa/aha1542.c b/sys/i386/isa/aha1542.c index a57736c..6082396 100644 --- a/sys/i386/isa/aha1542.c +++ b/sys/i386/isa/aha1542.c @@ -12,7 +12,7 @@ * on the understanding that TFS is not responsible for the correct * functioning of this software in any circumstances. * - * $Id: aha1542.c,v 1.40 1995/01/19 12:33:10 dufault Exp $ + * $Id: aha1542.c,v 1.41 1995/01/31 11:41:36 dufault Exp $ */ /* @@ -31,6 +31,7 @@ #include <sys/buf.h> #include <sys/proc.h> #include <sys/user.h> +#include <machine/clock.h> #include <i386/isa/isa_device.h> #endif /* KERNEL */ #include <scsi/scsi_all.h> diff --git a/sys/i386/isa/aha1742.c b/sys/i386/isa/aha1742.c index 1511eeb..ebbd4bb 100644 --- a/sys/i386/isa/aha1742.c +++ b/sys/i386/isa/aha1742.c @@ -14,7 +14,7 @@ * * commenced: Sun Sep 27 18:14:01 PDT 1992 * - * $Id: aha1742.c,v 1.28 1995/03/23 07:31:07 gibbs Exp $ + * $Id: aha1742.c,v 1.29 1995/03/23 09:00:18 rgrimes Exp $ */ #include <sys/types.h> @@ -29,6 +29,7 @@ #include <sys/buf.h> #include <sys/proc.h> #include <sys/user.h> +#include <machine/clock.h> #include <i386/isa/isa.h> #include <i386/isa/isa_device.h> #else diff --git a/sys/i386/isa/aic6360.c b/sys/i386/isa/aic6360.c index c54a979..4d648db 100644 --- a/sys/i386/isa/aic6360.c +++ b/sys/i386/isa/aic6360.c @@ -31,7 +31,7 @@ */ /* - * $Id: aic6360.c,v 1.5 1994/11/16 02:45:36 bde Exp $ + * $Id: aic6360.c,v 1.6 1995/03/01 22:30:47 dufault Exp $ * * Acknowledgements: Many of the algorithms used in this driver are * inspired by the work of Julian Elischer (julian@tfs.com) and @@ -137,6 +137,7 @@ #ifdef __FreeBSD__ #include <sys/devconf.h> +#include <machine/clock.h> #include <i386/isa/isa_device.h> #include <sys/kernel.h> diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c index f9defd0..03e561c 100644 --- a/sys/i386/isa/cy.c +++ b/sys/i386/isa/cy.c @@ -27,7 +27,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: cy.c,v 1.3 1995/02/25 20:09:12 pst Exp $ + * $Id: cy.c,v 1.4 1995/02/28 00:20:52 pst Exp $ */ /* @@ -88,6 +88,8 @@ #include <i386/isa/isa_device.h> #include <i386/isa/ic/cd1400.h> +#else +#include <machine/clock.h> #define RxFifoThreshold 3 /* 3 characters (out of 12) in the receive * FIFO before an interrupt is generated */ diff --git a/sys/i386/isa/ft.c b/sys/i386/isa/ft.c index 2e778aa..81a00f6 100644 --- a/sys/i386/isa/ft.c +++ b/sys/i386/isa/ft.c @@ -17,7 +17,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * ft.c - QIC-40/80 floppy tape driver - * $Id: ft.c,v 1.15 1994/12/04 03:10:09 jkh Exp $ + * $Id: ft.c,v 1.16 1995/03/26 19:28:22 rgrimes Exp $ * * 06/07/94 v0.9 ++sg * Tape stuck on segment problem should be gone. Re-wrote buffering @@ -77,7 +77,8 @@ #include <sys/ftape.h> #include <sys/devconf.h> -#include <machine/cpufunc.h> +#include <machine/clock.h> + #include <i386/isa/isa_device.h> #include <i386/isa/fdreg.h> #include <i386/isa/fdc.h> diff --git a/sys/i386/isa/gpib.c b/sys/i386/isa/gpib.c index 4b5410c..34e83bb 100644 --- a/sys/i386/isa/gpib.c +++ b/sys/i386/isa/gpib.c @@ -35,7 +35,7 @@ #include "kernel.h" #include "malloc.h" - +#include <machine/clock.h> #include "i386/isa/gpibreg.h" #include "i386/isa/gpib.h" diff --git a/sys/i386/isa/if_el.c b/sys/i386/isa/if_el.c index fee5127..6a60e6a 100644 --- a/sys/i386/isa/if_el.c +++ b/sys/i386/isa/if_el.c @@ -6,7 +6,7 @@ * * Questions, comments, bug reports and fixes to kimmel@cs.umass.edu. * - * $Id: if_el.c,v 1.9 1994/11/24 14:29:17 davidg Exp $ + * $Id: if_el.c,v 1.10 1994/12/22 21:56:06 wollman Exp $ */ /* Except of course for the portions of code lifted from other FreeBSD * drivers (mainly elread, elget and el_ioctl) @@ -54,6 +54,8 @@ #include <net/bpfdesc.h> #endif +#include <machine/clock.h> + #include <i386/isa/isa.h> #include <i386/isa/isa_device.h> #include <i386/isa/icu.h> diff --git a/sys/i386/isa/if_ep.c b/sys/i386/isa/if_ep.c index 18dbcb4..4f2175f 100644 --- a/sys/i386/isa/if_ep.c +++ b/sys/i386/isa/if_ep.c @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: if_ep.c,v 1.20 1995/03/23 06:53:38 davidg Exp $ + * $Id: if_ep.c,v 1.21 1995/03/23 07:31:08 gibbs Exp $ */ /* @@ -79,6 +79,10 @@ #include <net/bpfdesc.h> #endif +#if defined(__FreeBSD__) +#include <machine/clock.h> +#endif + #include <i386/isa/isa.h> #include <i386/isa/isa_device.h> #include <i386/isa/icu.h> diff --git a/sys/i386/isa/if_ie.c b/sys/i386/isa/if_ie.c index 7bb5a2f..095725f 100644 --- a/sys/i386/isa/if_ie.c +++ b/sys/i386/isa/if_ie.c @@ -43,7 +43,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: if_ie.c,v 1.20 1994/12/22 21:56:09 wollman Exp $ + * $Id: if_ie.c,v 1.21 1995/03/19 14:28:45 davidg Exp $ */ /* @@ -137,6 +137,8 @@ iomem, and to make 16-pointers, we subtract iomem and and with 0xffff. #include <netns/ns_if.h> #endif +#include <machine/clock.h> + #include <i386/isa/isa.h> #include <i386/isa/isa_device.h> #include <i386/isa/ic/i82586.h> diff --git a/sys/i386/isa/if_le.c b/sys/i386/isa/if_le.c index f54b0ab..3a8f4ce 100644 --- a/sys/i386/isa/if_le.c +++ b/sys/i386/isa/if_le.c @@ -21,9 +21,12 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: if_le.c,v 1.10 1994/11/24 14:29:24 davidg Exp $ + * $Id: if_le.c,v 1.12 1994/12/22 21:56:11 wollman Exp $ * * $Log: if_le.c,v $ + * Revision 1.12 1994/12/22 21:56:11 wollman + * Move ARP interface initialization into if_ether.c:arp_ifinit(). + * * Revision 1.10 1994/11/24 14:29:24 davidg * Moved conversion of ether_type to host byte order out of ethernet drivers * and into ether_input(). It was silly to have bpf want this one way and @@ -110,6 +113,8 @@ #include <netns/ns_if.h> #endif +#include <machine/clock.h> + #include <i386/isa/isa.h> #include <i386/isa/isa_device.h> #include <i386/isa/icu.h> @@ -833,7 +838,6 @@ le_multi_op( #define LEMAC_32K_MODE(mbase) (((mbase) >= 0x14) && ((mbase) <= 0x1F)) #define LEMAC_2K_MODE(mbase) ( (mbase) >= 0x40) -static int lemac_probe(le_softc_t *sc, const le_board_t *bd, int *msize); static void lemac_init(int unit); static void lemac_start(struct ifnet *ifp); static void lemac_reset(IF_RESET_ARGS); @@ -1353,7 +1357,6 @@ lemac_init_adapmem( * Start of DEPCA (DE200/DE201/DE202/DE422 etal) support. * */ -static int depca_probe(le_softc_t *sc, const le_board_t *bd, int *msize); static void depca_intr(le_softc_t *sc); static int lance_init_adapmem(le_softc_t *sc); static int lance_init_ring(le_softc_t *sc, ln_ring_t *rp, lance_ring_t *ri, diff --git a/sys/i386/isa/if_lnc.c b/sys/i386/isa/if_lnc.c index b482f5f..305b7fc 100644 --- a/sys/i386/isa/if_lnc.c +++ b/sys/i386/isa/if_lnc.c @@ -128,6 +128,11 @@ struct lnc_softc { } lnc_softc[NLNC]; /* Function prototypes */ +int bicc_probe(struct isa_device *); +int depca_probe(struct isa_device *); +int lance_probe(int); +int ne2100_probe(struct isa_device *); +int pcnet_probe(int); void lnc_init(int); void lnc_start(struct ifnet *); int lnc_ioctl(struct ifnet *, int, caddr_t); diff --git a/sys/i386/isa/if_ze.c b/sys/i386/isa/if_ze.c index 408ffe4..7c8719e 100644 --- a/sys/i386/isa/if_ze.c +++ b/sys/i386/isa/if_ze.c @@ -47,7 +47,7 @@ */ /* - * $Id: if_ze.c,v 1.11 1995/02/17 02:22:51 phk Exp $ + * $Id: if_ze.c,v 1.12 1995/02/26 05:14:48 bde Exp $ */ #include "ze.h" @@ -85,6 +85,8 @@ #include <net/bpfdesc.h> #endif +#include <machine/clock.h> + #include <i386/isa/isa.h> #include <i386/isa/isa_device.h> #include <i386/isa/icu.h> diff --git a/sys/i386/isa/if_zp.c b/sys/i386/isa/if_zp.c index c8310fe..b1469f9 100644 --- a/sys/i386/isa/if_zp.c +++ b/sys/i386/isa/if_zp.c @@ -35,7 +35,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * From: if_ep.c,v 1.9 1994/01/25 10:46:29 deraadt Exp $ - * $Id: if_zp.c,v 1.1 1995/02/17 02:22:52 phk Exp $ + * $Id: if_zp.c,v 1.2 1995/02/26 05:14:49 bde Exp $ */ /*- * TODO: @@ -175,6 +175,14 @@ enum memtype { COMMON, ATTRIBUTE }; #include <net/bpfdesc.h> #endif +#if defined(__FreeBSD__) +#include <machine/clock.h> +#endif + +#if defined(__FreeBSD__) && defined(ZP_DEBUG) +#include <i386/i386/cons.h> +#endif + #include <i386/isa/isa.h> #include <i386/isa/isa_device.h> #include <i386/isa/icu.h> diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c index de23f0b..6afc959 100644 --- a/sys/i386/isa/isa.c +++ b/sys/i386/isa/isa.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 - * $Id: isa.c,v 1.40 1995/03/16 17:31:18 se Exp $ + * $Id: isa.c,v 1.41 1995/03/25 05:54:33 swallace Exp $ */ /* @@ -137,6 +137,8 @@ static inthand_t *slowintr[ICU_LEN] = { }; static void config_isadev __P((struct isa_device *isdp, u_int *mp)); +static void config_isadev_c __P((struct isa_device *isdp, u_int *mp, + int reconfig)); static void conflict __P((struct isa_device *dvp, struct isa_device *tmpdvp, int item, char const *whatnot, char const *reason, char const *format)); @@ -366,8 +368,6 @@ isa_configure() { */ -static void config_isadev_c(); - static void config_isadev(isdp, mp) struct isa_device *isdp; diff --git a/sys/i386/isa/isa_device.h b/sys/i386/isa/isa_device.h index fbad210..579f06d 100644 --- a/sys/i386/isa/isa_device.h +++ b/sys/i386/isa/isa_device.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)isa_device.h 7.1 (Berkeley) 5/9/91 - * $Id: isa_device.h,v 1.18 1995/03/12 13:23:10 ugen Exp $ + * $Id: isa_device.h,v 1.19 1995/03/16 17:31:19 se Exp $ */ #ifndef _I386_ISA_ISA_DEVICE_H_ @@ -126,6 +126,7 @@ inthand_t IDTVEC(intr4), IDTVEC(intr5), IDTVEC(intr6), IDTVEC(intr7), IDTVEC(intr8), IDTVEC(intr9), IDTVEC(intr10), IDTVEC(intr11), IDTVEC(intr12), IDTVEC(intr13), IDTVEC(intr14), IDTVEC(intr15); + void isa_configure __P((void)); void isa_defaultirq __P((void)); void isa_dmacascade __P((unsigned chan)); @@ -133,6 +134,7 @@ void isa_dmadone __P((int, caddr_t, int, int)); void isa_dmastart __P((int, caddr_t, unsigned, unsigned)); int isa_irq_pending __P((struct isa_device *dvp)); int isa_nmi __P((int cd)); +void reconfig_isadev __P((struct isa_device *isdp, u_int *mp)); int register_intr __P((int intr, int device_id, u_int flags, inthand2_t *handler, u_int *maskptr, int unit)); int unregister_intr __P((int intr, inthand2_t *handler)); diff --git a/sys/i386/isa/joy.c b/sys/i386/isa/joy.c index 5fae0d7..942b45a 100644 --- a/sys/i386/isa/joy.c +++ b/sys/i386/isa/joy.c @@ -32,9 +32,9 @@ #include <errno.h> -#include <sys/types.h> +#include <sys/param.h> +#include <sys/systm.h> -#include <machine/cpufunc.h> #include <machine/joystick.h> #include <i386/isa/isa.h> @@ -158,7 +158,7 @@ joyread (dev_t dev, struct uio *uio, int flag) state >>= 4; c.b1 = ~state & 1; c.b2 = ~(state >> 1) & 1; - return uiomove (&c, sizeof(struct joystick), uio); + return uiomove ((caddr_t)&c, sizeof(struct joystick), uio); } int joyioctl (dev_t dev, int cmd, caddr_t data, int flag, struct proc *p) { diff --git a/sys/i386/isa/matcd.c b/sys/i386/isa/matcd.c index 8b600b1..8deca46 100644 --- a/sys/i386/isa/matcd.c +++ b/sys/i386/isa/matcd.c @@ -189,6 +189,7 @@ static char MATCDCOPYRIGHT[] = "Matsushita CD-ROM driver, Copr. 1994,1995 Frank #include "i386/isa/isa.h" #include "i386/isa/isa_device.h" #include "ioctl.h" +#include "proc.h" #include "stat.h" #include "uio.h" @@ -391,6 +392,12 @@ static void draincmd(int port,int cdrive,int ldrive); static int get_error(int port, int ldrive, int cdrive); static int chk_error(int errnum); static int msf_to_blk(unsigned char * cd); + int docmd(char *cmd, int ldrive, int cdrive, int controller, + int port); + int get_stat(int port, int ldrive); + int matcd_eject(int ldrive, int cdrive, int controller); + int media_chk(struct matcd_data *cd, int errnum, int ldrive); + int waitforit(int timelimit, int state, int port, char *where); #ifdef FULLDRIVER static int matcd_playtracks(int ldrive, int cdrive, int controller, struct ioc_play_track *pt); diff --git a/sys/i386/isa/mcd.c b/sys/i386/isa/mcd.c index d04f08e..338fabf 100644 --- a/sys/i386/isa/mcd.c +++ b/sys/i386/isa/mcd.c @@ -40,7 +40,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: mcd.c,v 1.38 1995/02/22 02:12:10 ache Exp $ + * $Id: mcd.c,v 1.39 1995/02/23 17:40:16 ache Exp $ */ static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; @@ -52,6 +52,7 @@ static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; #include <sys/conf.h> #include <sys/file.h> #include <sys/buf.h> +#include <sys/proc.h> #include <sys/stat.h> #include <sys/uio.h> #include <sys/ioctl.h> @@ -61,6 +62,10 @@ static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; #include <sys/disklabel.h> #include <sys/devconf.h> +#include <machine/clock.h> + +#include <i386/i386/cons.h> + #include <i386/isa/isa.h> #include <i386/isa/isa_device.h> #include <i386/isa/mcdreg.h> diff --git a/sys/i386/isa/mse.c b/sys/i386/isa/mse.c index f8e7cc0..de7b26d 100644 --- a/sys/i386/isa/mse.c +++ b/sys/i386/isa/mse.c @@ -11,7 +11,7 @@ * this software for any purpose. It is provided "as is" * without express or implied warranty. * - * $Id: mse.c,v 1.8 1994/10/23 21:27:31 wollman Exp $ + * $Id: mse.c,v 1.9 1994/11/08 05:41:34 jkh Exp $ */ /* * Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and @@ -57,6 +57,8 @@ #include <sys/uio.h> #include <sys/devconf.h> +#include <machine/clock.h> + #include <i386/isa/isa_device.h> #include <i386/isa/icu.h> diff --git a/sys/i386/isa/ncr5380.c b/sys/i386/isa/ncr5380.c index cba446b..8cb2392 100644 --- a/sys/i386/isa/ncr5380.c +++ b/sys/i386/isa/ncr5380.c @@ -47,6 +47,9 @@ #include <sys/proc.h> #include <sys/user.h> #include <sys/devconf.h> + +#include <machine/clock.h> + #include <i386/isa/isa_device.h> #include <i386/isa/ic/ncr5380.h> #include <i386/isa/ic/ncr53400.h> diff --git a/sys/i386/isa/pcic.c b/sys/i386/isa/pcic.c index 4c5977a..887e357 100644 --- a/sys/i386/isa/pcic.c +++ b/sys/i386/isa/pcic.c @@ -40,6 +40,7 @@ #if defined(__FreeBSD__) #include <sys/systm.h> #include <sys/kernel.h> +#include <machine/clock.h> #endif #include <i386/isa/isa.h> #include <i386/isa/isa_device.h> diff --git a/sys/i386/isa/seagate.c b/sys/i386/isa/seagate.c index 0a99049..16f5c04 100644 --- a/sys/i386/isa/seagate.c +++ b/sys/i386/isa/seagate.c @@ -46,7 +46,7 @@ * delays, device flags, polling mode, generic cleanup * vak 950115 Added request-sense ops * - * $Id: seagate.c,v 1.3 1994/06/16 13:26:14 sean Exp $ + * $Id: seagate.c,v 1.5 1995/01/10 11:41:28 jkh Exp $ */ /* @@ -109,6 +109,9 @@ #include <sys/proc.h> #include <sys/user.h> #include <sys/devconf.h> + +#include <machine/clock.h> + #include <i386/isa/isa_device.h> #include <scsi/scsi_all.h> diff --git a/sys/i386/isa/sound/dev_table.h b/sys/i386/isa/sound/dev_table.h index fbba133..91df56e 100644 --- a/sys/i386/isa/sound/dev_table.h +++ b/sys/i386/isa/sound/dev_table.h @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: dev_table.h,v 1.9 1995/02/13 22:49:03 jkh Exp $ + * $Id: dev_table.h,v 1.12 1995/03/12 23:33:50 swallace Exp $ */ #ifndef _DEV_TABLE_H_ @@ -336,6 +336,8 @@ struct sound_timer_operations { extern int num_sound_cards; long sndtable_init(long mem_start); +int sndtable_probe(int unit, struct address_info *hw_config); +int sndtable_init_card(int unit, struct address_info *hw_config); int sndtable_get_cardcount (void); struct address_info *sound_getconf(int card_type); void sound_chconf(int card_type, int ioaddr, int irq, int dma); diff --git a/sys/i386/isa/sound/sb16_dsp.c b/sys/i386/isa/sound/sb16_dsp.c index bf956a2..e88dacc 100644 --- a/sys/i386/isa/sound/sb16_dsp.c +++ b/sys/i386/isa/sound/sb16_dsp.c @@ -79,7 +79,6 @@ static void sb16_dsp_halt (int dev); static int dsp_set_speed (int); static int dsp_set_stereo (int); static void dsp_cleanup (void); -int sb_reset_dsp (void); static struct audio_operations sb16_dsp_operations = { diff --git a/sys/i386/isa/sound/sound_calls.h b/sys/i386/isa/sound/sound_calls.h index 5bb43d0..3618f29 100644 --- a/sys/i386/isa/sound/sound_calls.h +++ b/sys/i386/isa/sound/sound_calls.h @@ -1,13 +1,15 @@ /* * DMA buffer calls * - * $Id: sound_calls.h,v 1.7 1994/10/01 02:17:10 swallace Exp $ + * $Id: sound_calls.h,v 1.10 1995/03/12 23:34:06 swallace Exp $ */ #ifndef _MACHINE_ISA_SOUND_H_ #define _MACHINE_ISA_SOUND_H_ int DMAbuf_open(int dev, int mode); +int DMAbuf_output_ready(int dev); +int DMAbuf_input_ready(int dev); int DMAbuf_release(int dev, int mode); int DMAbuf_getwrbuffer(int dev, char **buf, int *size); int DMAbuf_getrdbuffer(int dev, char **buf, int *len); @@ -160,6 +162,7 @@ long attach_adlib_card(long mem_start, struct address_info *hw_config); int probe_adlib(struct address_info *hw_config); /* From pas_card.c */ +void mix_write(unsigned char data, int ioaddr); long attach_pas_card(long mem_start, struct address_info *hw_config); int probe_pas(struct address_info *hw_config); int pas_set_intr(int mask); diff --git a/sys/i386/isa/wd7000.c b/sys/i386/isa/wd7000.c index ca35f92..60ace17 100644 --- a/sys/i386/isa/wd7000.c +++ b/sys/i386/isa/wd7000.c @@ -65,8 +65,8 @@ #include <scsi/scsiconf.h> #include <sys/devconf.h> +#include <machine/clock.h> #include <machine/cpu.h> -#include <machine/cpufunc.h> #include <i386/isa/isa_device.h> diff --git a/sys/i386/isa/wt.c b/sys/i386/isa/wt.c index 7d6c94f..cee9dbc 100644 --- a/sys/i386/isa/wt.c +++ b/sys/i386/isa/wt.c @@ -19,7 +19,7 @@ * the original CMU copyright notice. * * Version 1.3, Thu Nov 11 12:09:13 MSK 1993 - * $Id: wt.c,v 1.13 1994/10/25 08:57:39 swallace Exp $ + * $Id: wt.c,v 1.14 1995/01/09 17:55:10 joerg Exp $ * */ @@ -61,9 +61,12 @@ #include <sys/malloc.h> #include <sys/ioctl.h> #include <sys/mtio.h> +#include <sys/proc.h> #include <sys/devconf.h> #include <vm/vm_param.h> +#include <machine/clock.h> + #include <i386/isa/isa_device.h> #include <i386/isa/wtreg.h> diff --git a/sys/isa/joy.c b/sys/isa/joy.c index 5fae0d7..942b45a 100644 --- a/sys/isa/joy.c +++ b/sys/isa/joy.c @@ -32,9 +32,9 @@ #include <errno.h> -#include <sys/types.h> +#include <sys/param.h> +#include <sys/systm.h> -#include <machine/cpufunc.h> #include <machine/joystick.h> #include <i386/isa/isa.h> @@ -158,7 +158,7 @@ joyread (dev_t dev, struct uio *uio, int flag) state >>= 4; c.b1 = ~state & 1; c.b2 = ~(state >> 1) & 1; - return uiomove (&c, sizeof(struct joystick), uio); + return uiomove ((caddr_t)&c, sizeof(struct joystick), uio); } int joyioctl (dev_t dev, int cmd, caddr_t data, int flag, struct proc *p) { diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index b0efc5a..28b6c71 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)init_main.c 8.9 (Berkeley) 1/21/94 - * $Id: init_main.c,v 1.18 1995/02/20 22:23:09 davidg Exp $ + * $Id: init_main.c,v 1.19 1995/03/16 18:12:27 bde Exp $ */ #include <sys/param.h> @@ -58,8 +58,11 @@ #include <sys/buf.h> #include <sys/clist.h> #include <sys/device.h> +#include <sys/msg.h> #include <sys/protosw.h> #include <sys/reboot.h> +#include <sys/sem.h> +#include <sys/shm.h> #include <sys/user.h> #include <ufs/ufs/quota.h> diff --git a/sys/kern/kern_descrip.c b/sys/kern/kern_descrip.c index f89a055..77d76b7 100644 --- a/sys/kern/kern_descrip.c +++ b/sys/kern/kern_descrip.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)kern_descrip.c 8.6 (Berkeley) 4/19/94 - * $Id: kern_descrip.c,v 1.7 1994/12/12 12:27:39 bde Exp $ + * $Id: kern_descrip.c,v 1.8 1995/02/20 19:42:33 guido Exp $ */ #include <sys/param.h> @@ -330,9 +330,6 @@ finishdup(fdp, old, new, retval) /* * Close a file descriptor. */ -struct close_args { - int fd; -}; /* ARGSUSED */ int close(p, uap, retval) diff --git a/sys/miscfs/fdesc/fdesc_vnops.c b/sys/miscfs/fdesc/fdesc_vnops.c index 5232de1..6c20b26 100644 --- a/sys/miscfs/fdesc/fdesc_vnops.c +++ b/sys/miscfs/fdesc/fdesc_vnops.c @@ -35,7 +35,7 @@ * * @(#)fdesc_vnops.c 8.9 (Berkeley) 1/21/94 * - * $Id: fdesc_vnops.c,v 1.6 1994/10/02 17:47:51 phk Exp $ + * $Id: fdesc_vnops.c,v 1.7 1994/10/06 21:06:42 davidg Exp $ */ /* @@ -59,6 +59,7 @@ #include <sys/buf.h> #include <sys/dirent.h> #include <sys/socketvar.h> +#include <sys/tty.h> #include <miscfs/fdesc/fdesc.h> #define cttyvp(p) ((p)->p_flag & P_CONTROLT ? (p)->p_session->s_ttyvp : NULL) diff --git a/sys/miscfs/portal/portal_vnops.c b/sys/miscfs/portal/portal_vnops.c index b25b543..56f52fb 100644 --- a/sys/miscfs/portal/portal_vnops.c +++ b/sys/miscfs/portal/portal_vnops.c @@ -35,7 +35,7 @@ * * @(#)portal_vnops.c 8.8 (Berkeley) 1/21/94 * - * $Id: portal_vnops.c,v 1.3 1994/08/20 03:48:52 davidg Exp $ + * $Id: portal_vnops.c,v 1.4 1994/09/21 03:47:05 wollman Exp $ */ /* @@ -70,9 +70,7 @@ portal_closefd(p, fd) int fd; { int error; - struct { - int fd; - } ua; + struct close_args ua; int rc; ua.fd = fd; diff --git a/sys/netiso/iso_snpac.h b/sys/netiso/iso_snpac.h index 180a438..429ac37 100644 --- a/sys/netiso/iso_snpac.h +++ b/sys/netiso/iso_snpac.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)iso_snpac.h 8.1 (Berkeley) 6/10/93 - * $Id: iso_snpac.h,v 1.2 1994/08/02 07:50:47 davidg Exp $ + * $Id: iso_snpac.h,v 1.3 1994/08/21 06:14:21 paul Exp $ */ #ifndef _NETISO_ISO_SNPAC_H_ @@ -113,6 +113,8 @@ struct llinfo_llc { #ifdef KERNEL struct llinfo_llc llinfo_llc; /* head for linked lists */ +int iso_snparesolve __P((struct ifnet *ifp, struct sockaddr_iso *dest, + caddr_t snpa, int *snpa_len)); #endif /* KERNEL */ #endif diff --git a/sys/scsi/ch.c b/sys/scsi/ch.c index 6fd5bef..a4cd115e 100644 --- a/sys/scsi/ch.c +++ b/sys/scsi/ch.c @@ -2,7 +2,7 @@ * Written by grefen@????? * Based on scsi drivers by Julian Elischer (julian@tfs.com) * - * $Id: ch.c,v 1.15 1995/03/04 20:50:45 dufault Exp $ + * $Id: ch.c,v 1.16 1995/03/15 14:22:04 dufault Exp $ */ #include <sys/types.h> @@ -24,7 +24,13 @@ #include <scsi/scsiconf.h> #include <sys/devconf.h> -static errval ch_mode_sense(u_int32, u_int32); +errval ch_getelem __P((u_int32 unit, short *stat, int type, u_int32 from, + void *data, u_int32 flags)); +errval ch_move __P((u_int32 unit, short *stat, u_int32 chm, u_int32 from, + u_int32 to, u_int32 flags)); +static errval ch_mode_sense __P((u_int32 unit, u_int32 flags)); +errval ch_position __P((u_int32 unit, short *stat, u_int32 chm, u_int32 to, + u_int32 flags)); #define CHRETRIES 2 @@ -278,7 +284,7 @@ ch_getelem(unit, stat, type, from, data, flags) u_int32 unit, from, flags; int type; short *stat; - char *data; + void *data; /* XXX `struct untagged *' - see chio.h */ { struct scsi_read_element_status scsi_cmd; char elbuf[32]; diff --git a/sys/scsi/scsi_base.c b/sys/scsi/scsi_base.c index 4cae78d..4b571e0 100644 --- a/sys/scsi/scsi_base.c +++ b/sys/scsi/scsi_base.c @@ -8,7 +8,7 @@ * file. * * Written by Julian Elischer (julian@dialix.oz.au) - * $Id: scsi_base.c,v 1.23 1995/03/15 14:44:01 dufault Exp $ + * $Id: scsi_base.c,v 1.24 1995/03/21 11:21:01 dufault Exp $ */ #define SPLSD splbio @@ -542,7 +542,8 @@ retry: break; } #ifdef BOUNCE_BUFFERS - vm_bounce_kva_alloc_free(xs->data, (datalen + PAGE_SIZE - 1)/PAGE_SIZE, 0); + vm_bounce_kva_alloc_free((vm_offset_t) xs->data, + (datalen + PAGE_SIZE - 1)/PAGE_SIZE); #else free(xs->data, M_TEMP); #endif diff --git a/sys/sys/bio.h b/sys/sys/bio.h index b0b3677..43e9306 100644 --- a/sys/sys/bio.h +++ b/sys/sys/bio.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)buf.h 8.7 (Berkeley) 1/21/94 - * $Id: buf.h,v 1.14 1995/03/25 08:55:02 davidg Exp $ + * $Id: buf.h,v 1.15 1995/03/26 23:29:06 davidg Exp $ */ #ifndef _SYS_BUF_H_ @@ -245,6 +245,10 @@ void pbgetvp __P((struct vnode *, struct buf *)); void pbrelvp __P((struct buf *)); void reassignbuf __P((struct buf *, struct vnode *)); struct buf *trypbuf __P((void)); +void vm_bounce_alloc __P((struct buf *)); +void vm_bounce_free __P((struct buf *)); +vm_offset_t vm_bounce_kva_alloc __P((int)); +void vm_bounce_kva_alloc_free __P((vm_offset_t, int)); __END_DECLS #endif #endif /* !_SYS_BUF_H_ */ diff --git a/sys/sys/buf.h b/sys/sys/buf.h index b0b3677..43e9306 100644 --- a/sys/sys/buf.h +++ b/sys/sys/buf.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)buf.h 8.7 (Berkeley) 1/21/94 - * $Id: buf.h,v 1.14 1995/03/25 08:55:02 davidg Exp $ + * $Id: buf.h,v 1.15 1995/03/26 23:29:06 davidg Exp $ */ #ifndef _SYS_BUF_H_ @@ -245,6 +245,10 @@ void pbgetvp __P((struct vnode *, struct buf *)); void pbrelvp __P((struct buf *)); void reassignbuf __P((struct buf *, struct vnode *)); struct buf *trypbuf __P((void)); +void vm_bounce_alloc __P((struct buf *)); +void vm_bounce_free __P((struct buf *)); +vm_offset_t vm_bounce_kva_alloc __P((int)); +void vm_bounce_kva_alloc_free __P((vm_offset_t, int)); __END_DECLS #endif #endif /* !_SYS_BUF_H_ */ diff --git a/sys/sys/msg.h b/sys/sys/msg.h index 8f559a9..48e7c5b 100644 --- a/sys/sys/msg.h +++ b/sys/sys/msg.h @@ -1,4 +1,4 @@ -/* $Id: msg.h,v 1.1 1994/09/13 14:47:34 dfr Exp $ */ +/* $Id: msg.h,v 1.2 1994/09/17 13:24:27 davidg Exp $ */ /* $NetBSD: msg.h,v 1.4 1994/06/29 06:44:43 cgd Exp $ */ /* @@ -142,6 +142,8 @@ struct msqid_ds *msqids; /* MSGMNI msqid_ds struct's */ #define MSG_LOCKED 01000 /* Is this msqid_ds locked? */ +void msginit __P((void)); + #endif /* KERNEL */ #ifndef KERNEL diff --git a/sys/sys/sem.h b/sys/sys/sem.h index c931dcd..ef08f4e 100644 --- a/sys/sys/sem.h +++ b/sys/sys/sem.h @@ -1,4 +1,4 @@ -/* $Id: sem.h,v 1.1 1994/09/13 14:47:35 dfr Exp $ */ +/* $Id: sem.h,v 1.2 1994/09/17 13:24:28 davidg Exp $ */ /* $NetBSD: sem.h,v 1.5 1994/06/29 06:45:15 cgd Exp $ */ /* @@ -163,6 +163,8 @@ typedef enum { SEM_CONFIG_FREEZE, /* Freeze the semaphore facility. */ SEM_CONFIG_THAW /* Thaw the semaphore facility. */ } semconfig_ctl_t; + +void seminit __P((void)); #endif /* KERNEL */ #ifndef KERNEL diff --git a/sys/sys/snoop.h b/sys/sys/snoop.h index 1c6f73d..82d5849 100644 --- a/sys/sys/snoop.h +++ b/sys/sys/snoop.h @@ -13,8 +13,8 @@ * Snoop stuff. */ -#ifndef SNOOP_H -#define SNOOP_H +#ifndef _SNOOP_H_ +#define _SNOOP_H_ #define SNOOP_MINLEN (4*1024) /* This should be power of 2. * 4K tested to be the minimum @@ -68,4 +68,18 @@ struct snoop { #define SNP_TTYCLOSE -2 #define SNP_DETACH -3 -#endif +#ifdef KERNEL +/* XXX several wrong storage classes and types here. */ +int snpclose __P((dev_t dev, int flag)); +int snp_detach __P((struct snoop *snp)); +int snpdown __P((struct snoop *snp)); +int snpin __P((struct snoop *snp, char *buf, int n)); +int snpinc __P((struct snoop *snp, char c)); +int snpioctl __P((dev_t dev, int cmd, caddr_t data, int flag)); +int snpopen __P((dev_t dev, int flag, int mode, struct proc *p)); +int snpread __P((dev_t dev, struct uio *uio, int flag)); +int snpselect __P((dev_t dev, int rw, struct proc *p)); +int snpwrite __P((dev_t dev, struct uio *uio, int flag)); +#endif /* KERNEL */ + +#endif /* _SNOOP_H_ */ diff --git a/sys/sys/systm.h b/sys/sys/systm.h index f837e43..ad6f608 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)systm.h 8.4 (Berkeley) 2/23/94 - * $Id: systm.h,v 1.15 1995/03/16 18:16:32 bde Exp $ + * $Id: systm.h,v 1.16 1995/03/17 06:15:26 phk Exp $ */ #ifndef _SYS_SYSTM_H_ @@ -199,6 +199,10 @@ void untimeout(timeout_func_t, void *); void logwakeup __P((void)); /* Syscalls that are called internally. */ +struct close_args { + int fd; +}; +int close __P((struct proc *, struct close_args *uap, int *retval)); struct execve_args { char *fname; char **argv; diff --git a/sys/sys/tty.h b/sys/sys/tty.h index 959fad5..a80bce0 100644 --- a/sys/sys/tty.h +++ b/sys/sys/tty.h @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)tty.h 8.6 (Berkeley) 1/21/94 - * $Id: tty.h,v 1.12 1995/02/28 00:21:11 pst Exp $ + * $Id: tty.h,v 1.13 1995/03/16 18:16:33 bde Exp $ */ #ifndef _SYS_TTY_H_ @@ -237,6 +237,15 @@ int ttywait __P((struct tty *tp)); int ttywflush __P((struct tty *tp)); struct tty *ttymalloc __P((void)); void ttyfree __P((struct tty *)); + +/* From tty_tty.c. */ +int cttyioctl __P((dev_t dev, int cmd, caddr_t addr, int flag, + struct proc *p)); +int cttyopen __P((dev_t dev, int flag, int mode, struct proc *p)); +int cttyread __P((dev_t dev, struct uio *uio, int flag)); +int cttyselect __P((dev_t dev, int flag, struct proc *p)); +int cttywrite __P((dev_t dev, struct uio *uio, int flag)); + #endif /* KERNEL */ #endif /* !_SYS_TTY_H_ */ diff --git a/sys/ufs/ffs/ffs_extern.h b/sys/ufs/ffs/ffs_extern.h index b4986ab..43e7bbe 100644 --- a/sys/ufs/ffs/ffs_extern.h +++ b/sys/ufs/ffs/ffs_extern.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ffs_extern.h 8.3 (Berkeley) 4/16/94 - * $Id: ffs_extern.h,v 1.4 1994/08/18 22:35:53 wollman Exp $ + * $Id: ffs_extern.h,v 1.5 1994/09/22 19:38:32 wollman Exp $ */ struct buf; @@ -60,6 +60,7 @@ int ffs_bmap __P((struct vop_bmap_args *)); void ffs_clrblock __P((struct fs *, u_char *, daddr_t)); int ffs_fhtovp __P((struct mount *, struct fid *, struct mbuf *, struct vnode **, int *, struct ucred **)); +int ffs_flushfiles __P((struct mount *, int, struct proc *)); void ffs_fragacct __P((struct fs *, int, long [], int)); int ffs_fsync __P((struct vop_fsync_args *)); int ffs_init __P((void)); diff --git a/sys/ufs/ffs/ffs_vfsops.c b/sys/ufs/ffs/ffs_vfsops.c index aeb074f..6776049 100644 --- a/sys/ufs/ffs/ffs_vfsops.c +++ b/sys/ufs/ffs/ffs_vfsops.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ffs_vfsops.c 8.8 (Berkeley) 4/18/94 - * $Id: ffs_vfsops.c,v 1.13 1995/03/16 18:16:41 bde Exp $ + * $Id: ffs_vfsops.c,v 1.14 1995/03/18 18:03:29 davidg Exp $ */ #include <sys/param.h> @@ -61,7 +61,6 @@ #include <ufs/ffs/ffs_extern.h> int ffs_sbupdate __P((struct ufsmount *, int)); -int ffs_flushfiles __P((struct mount *, int, struct proc *)); int ffs_reload __P((struct mount *,struct ucred *,struct proc *)); int ffs_oldfscompat __P((struct fs *)); diff --git a/sys/ufs/lfs/lfs_alloc.c b/sys/ufs/lfs/lfs_alloc.c index 3606484..9e3d1ed 100644 --- a/sys/ufs/lfs/lfs_alloc.c +++ b/sys/ufs/lfs/lfs_alloc.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs_alloc.c 8.4 (Berkeley) 1/4/94 - * $Id: lfs_alloc.c,v 1.5 1994/10/10 01:04:48 phk Exp $ + * $Id: lfs_alloc.c,v 1.6 1995/03/19 14:29:16 davidg Exp $ */ #include <sys/param.h> @@ -48,6 +48,7 @@ #include <ufs/ufs/quota.h> #include <ufs/ufs/inode.h> #include <ufs/ufs/ufsmount.h> +#include <ufs/ufs/ufs_extern.h> #include <ufs/lfs/lfs.h> #include <ufs/lfs/lfs_extern.h> diff --git a/sys/ufs/lfs/lfs_balloc.c b/sys/ufs/lfs/lfs_balloc.c index fbf9bbe..e51d830 100644 --- a/sys/ufs/lfs/lfs_balloc.c +++ b/sys/ufs/lfs/lfs_balloc.c @@ -31,9 +31,10 @@ * SUCH DAMAGE. * * @(#)lfs_balloc.c 8.1 (Berkeley) 6/11/93 - * $Id: lfs_balloc.c,v 1.3 1995/01/09 16:05:20 davidg Exp $ + * $Id: lfs_balloc.c,v 1.4 1995/03/04 03:24:43 davidg Exp $ */ #include <sys/param.h> +#include <sys/systm.h> #include <sys/buf.h> #include <sys/proc.h> #include <sys/vnode.h> @@ -45,6 +46,7 @@ #include <ufs/ufs/quota.h> #include <ufs/ufs/inode.h> #include <ufs/ufs/ufsmount.h> +#include <ufs/ufs/ufs_extern.h> #include <ufs/lfs/lfs.h> #include <ufs/lfs/lfs_extern.h> diff --git a/sys/ufs/lfs/lfs_extern.h b/sys/ufs/lfs/lfs_extern.h index 59f19a6..9a1fb4a 100644 --- a/sys/ufs/lfs/lfs_extern.h +++ b/sys/ufs/lfs/lfs_extern.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs_extern.h 8.2 (Berkeley) 4/16/94 - * $Id: lfs_extern.h,v 1.3 1994/08/21 07:16:09 paul Exp $ + * $Id: lfs_extern.h,v 1.4 1994/09/22 19:38:34 wollman Exp $ */ #ifndef _UFS_LFS_LFS_EXTERN_H_ @@ -57,7 +57,9 @@ int lfs_close __P((struct vop_close_args *)); int lfs_create __P((struct vop_create_args *)); int lfs_fhtovp __P((struct mount *, struct fid *, struct mbuf *, struct vnode **, int *, struct ucred **)); +void lfs_free_buffer __P((caddr_t, int)); int lfs_fsync __P((struct vop_fsync_args *)); +int lfs_gatherblock __P((struct segment *, struct buf *, int *)); int lfs_getattr __P((struct vop_getattr_args *)); struct dinode * lfs_ifind __P((struct lfs *, ino_t, struct dinode *)); @@ -86,6 +88,7 @@ int lfs_sync __P((struct mount *, int, struct ucred *, struct proc *)); int lfs_truncate __P((struct vop_truncate_args *)); int lfs_unmount __P((struct mount *, int, struct proc *)); int lfs_update __P((struct vop_update_args *)); +void lfs_updatemeta __P((struct segment *)); int lfs_valloc __P((struct vop_valloc_args *)); int lfs_vcreate __P((struct mount *, ino_t, struct vnode **)); int lfs_vfree __P((struct vop_vfree_args *)); @@ -95,6 +98,9 @@ int lfs_vptofh __P((struct vnode *, struct fid *)); int lfs_vref __P((struct vnode *)); void lfs_vunref __P((struct vnode *)); int lfs_write __P((struct vop_write_args *)); +int lfs_writeinode __P((struct lfs *, struct segment *, struct inode *)); +int lfs_writeseg __P((struct lfs *, struct segment *)); +void lfs_writesuper __P((struct lfs *)); #ifdef DEBUG void lfs_dump_dinode __P((struct dinode *)); void lfs_dump_super __P((struct lfs *)); diff --git a/sys/ufs/lfs/lfs_segment.c b/sys/ufs/lfs/lfs_segment.c index 09d5a56..1e00f8f 100644 --- a/sys/ufs/lfs/lfs_segment.c +++ b/sys/ufs/lfs/lfs_segment.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs_segment.c 8.5 (Berkeley) 1/4/94 - * $Id: lfs_segment.c,v 1.7 1995/01/09 16:05:22 davidg Exp $ + * $Id: lfs_segment.c,v 1.8 1995/03/19 14:29:18 davidg Exp $ */ #include <sys/param.h> @@ -146,7 +146,6 @@ lfs_alloc_buffer(int size) { void lfs_callback __P((struct buf *)); void lfs_gather __P((struct lfs *, struct segment *, struct vnode *, int (*) __P((struct lfs *, struct buf *)))); -int lfs_gatherblock __P((struct segment *, struct buf *, int *)); void lfs_iset __P((struct inode *, daddr_t, time_t)); int lfs_match_data __P((struct lfs *, struct buf *)); int lfs_match_dindir __P((struct lfs *, struct buf *)); @@ -155,11 +154,7 @@ int lfs_match_tindir __P((struct lfs *, struct buf *)); void lfs_newseg __P((struct lfs *)); void lfs_shellsort __P((struct buf **, daddr_t *, register int)); void lfs_supercallback __P((struct buf *)); -void lfs_updatemeta __P((struct segment *)); void lfs_writefile __P((struct lfs *, struct segment *, struct vnode *)); -int lfs_writeinode __P((struct lfs *, struct segment *, struct inode *)); -int lfs_writeseg __P((struct lfs *, struct segment *)); -void lfs_writesuper __P((struct lfs *)); void lfs_writevnodes __P((struct lfs *fs, struct mount *mp, struct segment *sp, int dirops)); diff --git a/sys/ufs/lfs/lfs_syscalls.c b/sys/ufs/lfs/lfs_syscalls.c index 73c5045..32e2f02 100644 --- a/sys/ufs/lfs/lfs_syscalls.c +++ b/sys/ufs/lfs/lfs_syscalls.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)lfs_syscalls.c 8.5 (Berkeley) 4/20/94 - * $Id: lfs_syscalls.c,v 1.5 1995/01/04 23:46:33 gibbs Exp $ + * $Id: lfs_syscalls.c,v 1.6 1995/01/09 16:05:23 davidg Exp $ */ #include <sys/param.h> @@ -65,6 +65,8 @@ if (sp->sum_bytes_left < (s)) { \ (void) lfs_writeseg(fs, sp); \ } struct buf *lfs_fakebuf __P((struct vnode *, int, size_t, caddr_t)); +int lfs_fastvget __P((struct mount *, ino_t, daddr_t, struct vnode **, + struct dinode *)); /* * lfs_markv: diff --git a/sys/ufs/lfs/lfs_vnops.c b/sys/ufs/lfs/lfs_vnops.c index e76d0b5..0a90fe7 100644 --- a/sys/ufs/lfs/lfs_vnops.c +++ b/sys/ufs/lfs/lfs_vnops.c @@ -31,13 +31,14 @@ * SUCH DAMAGE. * * @(#)lfs_vnops.c 8.5 (Berkeley) 12/30/93 - * $Id: lfs_vnops.c,v 1.5 1994/09/22 19:38:39 wollman Exp $ + * $Id: lfs_vnops.c,v 1.6 1995/01/04 23:46:34 gibbs Exp $ */ #include <sys/param.h> #include <sys/systm.h> #include <sys/namei.h> #include <sys/resourcevar.h> +#include <sys/signalvar.h> #include <sys/kernel.h> #include <sys/file.h> #include <sys/stat.h> diff --git a/sys/ufs/ufs/ufs_bmap.c b/sys/ufs/ufs/ufs_bmap.c index bb875f5..1bc8455 100644 --- a/sys/ufs/ufs/ufs_bmap.c +++ b/sys/ufs/ufs/ufs_bmap.c @@ -36,10 +36,11 @@ * SUCH DAMAGE. * * @(#)ufs_bmap.c 8.6 (Berkeley) 1/21/94 - * $Id: ufs_bmap.c,v 1.5 1995/01/09 16:05:25 davidg Exp $ + * $Id: ufs_bmap.c,v 1.6 1995/03/04 03:24:45 davidg Exp $ */ #include <sys/param.h> +#include <sys/systm.h> #include <sys/buf.h> #include <sys/proc.h> #include <sys/vnode.h> @@ -53,8 +54,6 @@ #include <ufs/ufs/ufsmount.h> #include <ufs/ufs/ufs_extern.h> -int ufs_bmaparray __P((struct vnode *, daddr_t, daddr_t *, struct indir *, int *, int *)); - /* * Bmap converts a the logical block number of a file to its physical block * number on the disk. The conversion is done by using the logical block diff --git a/sys/ufs/ufs/ufs_extern.h b/sys/ufs/ufs/ufs_extern.h index b2ae74d..8ff0d94 100644 --- a/sys/ufs/ufs/ufs_extern.h +++ b/sys/ufs/ufs/ufs_extern.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)ufs_extern.h 8.3 (Berkeley) 4/16/94 - * $Id: ufs_extern.h,v 1.5 1994/10/27 20:45:13 jkh Exp $ + * $Id: ufs_extern.h,v 1.6 1994/11/14 13:50:15 bde Exp $ */ #ifndef _UFS_UFS_EXTERN_H_ @@ -57,6 +57,9 @@ int ufs_abortop __P((struct vop_abortop_args *)); int ufs_access __P((struct vop_access_args *)); int ufs_advlock __P((struct vop_advlock_args *)); int ufs_bmap __P((struct vop_bmap_args *)); +int ufs_bmaparray __P((struct vnode *, daddr_t, daddr_t *, struct indir *, + int *, int *)); + int ufs_check_export __P((struct mount *, struct ufid *, struct mbuf *, struct vnode **, int *exflagsp, struct ucred **)); int ufs_checkpath __P((struct inode *, struct inode *, struct ucred *)); diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c index 77dc039..c8c97fe 100644 --- a/sys/vm/vm_glue.c +++ b/sys/vm/vm_glue.c @@ -59,7 +59,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $Id: vm_glue.c,v 1.16 1995/02/20 17:26:21 davidg Exp $ + * $Id: vm_glue.c,v 1.17 1995/02/21 12:06:06 davidg Exp $ */ #include <sys/param.h> @@ -67,6 +67,7 @@ #include <sys/proc.h> #include <sys/resourcevar.h> #include <sys/buf.h> +#include <sys/shm.h> #include <sys/user.h> #include <sys/kernel.h> |
