Make my ALLDEVS kernel compile (basically, LINT minus a lot of options).

This involves fixing a few things I broke last time.
This commit is contained in:
Garrett Wollman 1994-10-21 01:19:28 +00:00
parent 09f7992adf
commit 091b0456f4
10 changed files with 30 additions and 29 deletions

View File

@ -11,7 +11,7 @@
* this software for any purpose. It is provided "as is"
* without express or implied warranty.
*
* $Id: mse.c,v 1.5 1994/08/02 07:39:39 davidg Exp $
* $Id: mse.c,v 1.6 1994/08/13 03:50:10 wollman Exp $
*/
/*
* Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
@ -45,10 +45,10 @@
#include "mse.h"
#if NMSE > 0
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
#include <sys/user.h>
#include <sys/buf.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/ioctl.h>
#include <sys/tty.h>

View File

@ -8,7 +8,7 @@
* of this software, nor does the author assume any responsibility
* for damages incurred with its use.
*
* $Id: ctx.c,v 1.1 1994/10/01 17:59:41 davidg Exp $
* $Id: ctx.c,v 1.2 1994/10/19 01:58:55 wollman Exp $
*/
/*
@ -119,10 +119,11 @@
#include <sys/uio.h>
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/devconf.h>
#include "isa.h"
#include "isa_device.h"
#include "ctxreg.h"
#include <i386/isa/isa.h>
#include <i386/isa/isa_device.h>
#include <i386/isa/ctxreg.h>
#include <machine/ioctl_ctx.h>
int waitvb(short);

View File

@ -6,7 +6,7 @@
*
* Questions, comments, bug reports and fixes to kimmel@cs.umass.edu.
*
* $Id: if_el.c,v 1.5 1994/08/13 03:50:04 wollman Exp $
* $Id: if_el.c,v 1.6 1994/10/19 01:58:59 wollman Exp $
*/
/* Except of course for the portions of code lifted from other FreeBSD
* drivers (mainly elread, elget and el_ioctl)
@ -84,7 +84,7 @@ void elintr(int);
int el_ioctl(struct ifnet *,int,caddr_t);
int el_probe(struct isa_device *);
void el_start(struct ifnet *);
void el_reset(int,int);
void el_reset(int);
void el_watchdog(int);
static void el_stop(int);
@ -238,7 +238,7 @@ int el_attach(struct isa_device *idev)
}
/* This routine resets the interface. */
void el_reset(int unit,int uban)
void el_reset(int unit)
{
int s;
@ -827,6 +827,6 @@ void el_watchdog(int unit)
log(LOG_ERR,"el%d: device timeout\n",unit);
sc->arpcom.ac_if.if_oerrors++;
el_reset(unit,0);
el_reset(unit);
}
#endif

View File

@ -11,7 +11,7 @@
* this software for any purpose. It is provided "as is"
* without express or implied warranty.
*
* $Id: mse.c,v 1.5 1994/08/02 07:39:39 davidg Exp $
* $Id: mse.c,v 1.6 1994/08/13 03:50:10 wollman Exp $
*/
/*
* Driver for the Logitech and ATI Inport Bus mice for use with 386bsd and
@ -45,10 +45,10 @@
#include "mse.h"
#if NMSE > 0
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/proc.h>
#include <sys/user.h>
#include <sys/buf.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/ioctl.h>
#include <sys/tty.h>

View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94
* $Id: vfs_syscalls.c,v 1.13 1994/10/11 20:40:12 sos Exp $
* $Id: vfs_syscalls.c,v 1.14 1994/10/15 02:53:26 phk Exp $
*/
#include <sys/param.h>
@ -337,10 +337,6 @@ sync(p, uap, retval)
vfs_unbusy(mp);
}
}
#ifdef DIAGNOSTIC
if (syncprt)
vfs_bufstats();
#endif /* DIAGNOSTIC */
return (0);
}

View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)vfs_syscalls.c 8.13 (Berkeley) 4/15/94
* $Id: vfs_syscalls.c,v 1.13 1994/10/11 20:40:12 sos Exp $
* $Id: vfs_syscalls.c,v 1.14 1994/10/15 02:53:26 phk Exp $
*/
#include <sys/param.h>
@ -337,10 +337,6 @@ sync(p, uap, retval)
vfs_unbusy(mp);
}
}
#ifdef DIAGNOSTIC
if (syncprt)
vfs_bufstats();
#endif /* DIAGNOSTIC */
return (0);
}

View File

@ -2,7 +2,7 @@
* Written by grefen@?????
* Based on scsi drivers by Julian Elischer (julian@tfs.com)
*
* $Id: ch.c,v 1.8 1994/01/29 10:30:36 rgrimes Exp $
* $Id: ch.c,v 1.9 1994/10/19 00:09:44 wollman Exp $
*/
#include <sys/types.h>
@ -17,6 +17,7 @@
#include <sys/proc.h>
#include <sys/user.h>
#include <sys/chio.h>
#include <sys/malloc.h>
#include <scsi/scsi_all.h>
#include <scsi/scsi_changer.h>
@ -88,7 +89,7 @@ static int
ch_externalize(struct proc *p, struct kern_devconf *kdc, void *userp,
size_t len)
{
return scsi_externalize(sd_data[kdc->kdc_unit]->sc_link, userp, &len);
return scsi_externalize(ch_data[kdc->kdc_unit].sc_link, userp, &len);
}
static struct kern_devconf kdc_ch_template = {

View File

@ -31,7 +31,7 @@
* SUCH DAMAGE.
*
* @(#)vnode.h 8.7 (Berkeley) 2/4/94
* $Id: vnode.h,v 1.11 1994/10/05 09:48:39 davidg Exp $
* $Id: vnode.h,v 1.12 1994/10/08 22:23:00 phk Exp $
*/
#ifndef _SYS_VNODE_H_
@ -200,9 +200,7 @@ extern int vttoif_tab[];
#define VREF(vp) vref(vp)
void holdrele __P((struct vnode *));
void vattr_null __P((struct vattr *));
void vhold __P((struct vnode *));
void vref __P((struct vnode *));
#else
#define HOLDRELE(vp) (vp)->v_holdcnt-- /* decrease buf or page ref */
#define VATTR_NULL(vap) (*(vap) = va_null) /* initialize a vattr */

View File

@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)ufs_vnops.c 8.10 (Berkeley) 4/1/94
* $Id: ufs_vnops.c,v 1.10 1994/10/08 06:57:29 phk Exp $
* $Id: ufs_vnops.c,v 1.11 1994/10/15 04:14:23 ache Exp $
*/
#include <sys/param.h>
@ -1523,6 +1523,9 @@ ufs_lock(ap)
struct vnode *a_vp;
} */ *ap;
{
#ifdef DIAGNOSTIC
struct proc *p = curproc; /* XXX */
#endif
register struct vnode *vp = ap->a_vp;
register struct inode *ip;
@ -1575,6 +1578,8 @@ ufs_unlock(ap)
register struct inode *ip = VTOI(ap->a_vp);
#ifdef DIAGNOSTIC
struct proc *p = curproc; /* XXX */
if ((ip->i_flag & IN_LOCKED) == 0) {
vprint("ufs_unlock: unlocked inode", ap->a_vp);
panic("ufs_unlock NOT LOCKED");

View File

@ -61,7 +61,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
* $Id: vm_page.h,v 1.7 1994/10/05 09:48:44 davidg Exp $
* $Id: vm_page.h,v 1.8 1994/10/17 10:43:56 davidg Exp $
*/
/*
@ -261,6 +261,10 @@ vm_page_hold(mem)
mem->hold_count++;
}
#ifdef DIAGNOSTIC
#include <sys/systm.h> /* make GCC shut up */
#endif
static inline void
vm_page_unhold(mem)
vm_page_t mem;