1) cleaned up after Garrett - fixed more redundant declarations, changed
use of timeout_t -> timeout_func_t in aha1542 and aha1742 drivers. 2) fix a bug in the portalfs that was uncovered by better prototyping - specifically, the time must be converted from timeval to timespec before storing in va_atime. 3) fixed/added some miscellaneous prototypes
This commit is contained in:
dg
parent
255b8baf81
commit
c97639b923
@ -23,7 +23,7 @@
|
||||
* any improvements or extensions that they make and grant Carnegie the
|
||||
* rights to redistribute these changes.
|
||||
*
|
||||
* $Id: db_sym.c,v 1.4 1994/01/03 07:54:10 davidg Exp $
|
||||
* $Id: db_sym.c,v 1.5 1994/08/13 03:49:23 wollman Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -315,10 +315,10 @@ db_printsym(off, strategy)
|
||||
|
||||
boolean_t
|
||||
db_line_at_pc( sym, filename, linenum, pc)
|
||||
int sym;
|
||||
int filename;
|
||||
int linenum;
|
||||
int pc;
|
||||
db_sym_t sym;
|
||||
char **filename;
|
||||
int *linenum;
|
||||
db_expr_t pc;
|
||||
{
|
||||
return X_db_line_at_pc( db_last_symtab, sym, filename, linenum, pc);
|
||||
}
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
* any improvements or extensions that they make and grant Carnegie the
|
||||
* rights to redistribute these changes.
|
||||
*
|
||||
* $Id: db_sym.h,v 1.3 1993/11/07 17:39:25 wollman Exp $
|
||||
* $Id: db_sym.h,v 1.4 1994/08/18 22:34:26 wollman Exp $
|
||||
*/
|
||||
|
||||
#ifndef _DDB_DB_SYM_H_
|
||||
@ -96,7 +96,7 @@ extern int db_eqname(/* char*, char*, char */);
|
||||
|
||||
extern void db_printsym(/* db_expr_t, db_strategy_t */);
|
||||
/* print closest symbol to a value */
|
||||
extern boolean_t db_line_at_pc(int, int, int, int);
|
||||
extern boolean_t db_line_at_pc(db_sym_t, char **, int *, db_expr_t);
|
||||
extern int X_db_sym_nymargs(db_symtab_t *, db_sym_t, int *, char **);
|
||||
|
||||
#endif /* _DDB_DB_SYM_H_ */
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: syscons.c,v 1.50 1994/08/17 08:51:59 sos Exp $
|
||||
* $Id: syscons.c,v 1.51 1994/08/17 19:32:23 sos Exp $
|
||||
*/
|
||||
|
||||
#include "sc.h"
|
||||
@ -198,9 +198,6 @@ static int scrn_saver = 0; /* screen saver routine */
|
||||
static long scrn_time_stamp;
|
||||
static u_char scr_map[256];
|
||||
|
||||
extern int hz;
|
||||
extern struct timeval time;
|
||||
|
||||
/* function prototypes */
|
||||
int pcprobe(struct isa_device *dev);
|
||||
int pcattach(struct isa_device *dev);
|
||||
|
||||
@ -36,7 +36,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)cd9660_vfsops.c 8.3 (Berkeley) 1/31/94
|
||||
* $Id$
|
||||
* $Id: cd9660_vfsops.c,v 1.3 1994/08/02 07:41:33 davidg Exp $
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
@ -58,8 +58,6 @@
|
||||
#include <isofs/cd9660/iso.h>
|
||||
#include <isofs/cd9660/cd9660_node.h>
|
||||
|
||||
extern int enodev ();
|
||||
|
||||
struct vfsops cd9660_vfsops = {
|
||||
cd9660_mount,
|
||||
cd9660_start,
|
||||
@ -87,7 +85,6 @@ int
|
||||
cd9660_mountroot()
|
||||
{
|
||||
register struct mount *mp;
|
||||
extern struct vnode *rootvp;
|
||||
struct proc *p = curproc; /* XXX */
|
||||
struct iso_mnt *imp;
|
||||
register struct fs *fs;
|
||||
@ -229,7 +226,6 @@ iso_mountfs(devvp, mp, p, argp)
|
||||
int error = EINVAL, i, size;
|
||||
int needclose = 0;
|
||||
int ronly = (mp->mnt_flag & MNT_RDONLY) != 0;
|
||||
extern struct vnode *rootvp;
|
||||
int j;
|
||||
int iso_bsize;
|
||||
int iso_blknum;
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
*
|
||||
* @(#)null_vnops.c 8.1 (Berkeley) 6/10/93
|
||||
*
|
||||
* $Id$
|
||||
* $Id: null_vnops.c,v 1.2 1994/08/02 07:45:06 davidg Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -207,7 +207,6 @@ null_bypass(ap)
|
||||
<other random data follows, presumably>
|
||||
} */ *ap;
|
||||
{
|
||||
extern int (**null_vnodeop_p)(); /* not extern, really "forward" */
|
||||
register struct vnode **this_vp_p;
|
||||
int error;
|
||||
struct vnode *old_vps[VDESC_MAX_VPS];
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
*
|
||||
* @(#)portal_vnops.c 8.8 (Berkeley) 1/21/94
|
||||
*
|
||||
* $Id: portal_vnops.c,v 1.4 1992/05/30 10:05:24 jsp Exp jsp $
|
||||
* $Id: portal_vnops.c,v 1.2 1994/05/25 09:08:21 rgrimes Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -431,7 +431,8 @@ portal_getattr(ap)
|
||||
vap->va_fsid = vp->v_mount->mnt_stat.f_fsid.val[0];
|
||||
vap->va_size = DEV_BSIZE;
|
||||
vap->va_blocksize = DEV_BSIZE;
|
||||
microtime(&vap->va_atime);
|
||||
microtime((struct timeval *)&vap->va_atime);
|
||||
TIMEVAL_TO_TIMESPEC((struct timeval *)&vap->va_atime, (struct timespec *)&vap->va_atime);
|
||||
vap->va_mtime = vap->va_atime;
|
||||
vap->va_ctime = vap->va_ctime;
|
||||
vap->va_gen = 0;
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)umap_vnops.c 8.3 (Berkeley) 1/5/94
|
||||
* $Id$
|
||||
* $Id: umap_vnops.c,v 1.3 1994/08/02 07:45:37 davidg Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -66,7 +66,6 @@ umap_bypass(ap)
|
||||
<other random data follows, presumably>
|
||||
} */ *ap;
|
||||
{
|
||||
extern int (**umap_vnodeop_p)(); /* not extern, really "forward" */
|
||||
struct ucred **credpp = 0, *credp = 0;
|
||||
struct ucred *savecredp = 0, *savecompcredp = 0;
|
||||
struct ucred *compcredp = 0;
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
*
|
||||
* commenced: Sun Sep 27 18:14:01 PDT 1992
|
||||
*
|
||||
* $Id: aha1742.c,v 1.16 1994/05/25 08:58:13 rgrimes Exp $
|
||||
* $Id: aha1742.c,v 1.17 1994/08/13 03:49:54 wollman Exp $
|
||||
*/
|
||||
|
||||
#include <sys/types.h>
|
||||
@ -51,10 +51,6 @@ int Debugger();
|
||||
#define NAHB 1
|
||||
#endif /* kernel */
|
||||
|
||||
#ifndef NetBSD
|
||||
typedef timeout_func_t timeout_t;
|
||||
#endif
|
||||
|
||||
typedef unsigned long int physaddr;
|
||||
#include <sys/kernel.h>
|
||||
|
||||
@ -274,7 +270,7 @@ int ahb_attach();
|
||||
int ahb_init __P((int unit));
|
||||
int ahbintr();
|
||||
int32 ahb_scsi_cmd();
|
||||
void ahb_timeout(caddr_t);
|
||||
void ahb_timeout __P((caddr_t));
|
||||
void ahb_done();
|
||||
struct ecb *cheat;
|
||||
void ahb_free_ecb();
|
||||
@ -628,7 +624,7 @@ ahbintr(unit)
|
||||
if ((ahb_debug & AHB_SHOWECBS) && ecb)
|
||||
printf("<int ecb(%x)>", ecb);
|
||||
#endif /*AHBDEBUG */
|
||||
untimeout((timeout_t)ahb_timeout, (caddr_t)ecb);
|
||||
untimeout((timeout_func_t)ahb_timeout, (caddr_t)ecb);
|
||||
ahb_done(unit, ecb, ((stat == AHB_ECB_OK) ? SUCCESS : FAIL));
|
||||
}
|
||||
}
|
||||
@ -993,7 +989,7 @@ ahb_scsi_cmd(xs)
|
||||
if (!(flags & SCSI_NOMASK)) {
|
||||
s = splbio();
|
||||
ahb_send_immed(unit, xs->sc_link->target, AHB_TARG_RESET);
|
||||
timeout((timeout_t)ahb_timeout, (caddr_t)ecb, (xs->timeout * hz) / 1000);
|
||||
timeout((timeout_func_t)ahb_timeout, (caddr_t)ecb, (xs->timeout * hz) / 1000);
|
||||
splx(s);
|
||||
return (SUCCESSFULLY_QUEUED);
|
||||
} else {
|
||||
@ -1122,7 +1118,7 @@ ahb_scsi_cmd(xs)
|
||||
if (!(flags & SCSI_NOMASK)) {
|
||||
s = splbio();
|
||||
ahb_send_mbox(unit, OP_START_ECB, xs->sc_link->target, ecb);
|
||||
timeout((timeout_t)ahb_timeout, (caddr_t)ecb, (xs->timeout * hz) / 1000);
|
||||
timeout((timeout_func_t)ahb_timeout, (caddr_t)ecb, (xs->timeout * hz) / 1000);
|
||||
splx(s);
|
||||
SC_DEBUG(xs->sc_link, SDEV_DB3, ("cmd_sent\n"));
|
||||
return (SUCCESSFULLY_QUEUED);
|
||||
@ -1199,7 +1195,7 @@ ahb_timeout(caddr_t arg1)
|
||||
printf("\n");
|
||||
ahb_send_mbox(unit, OP_ABORT_ECB, ecb->xs->sc_link->target, ecb);
|
||||
/* 2 secs for the abort */
|
||||
timeout((timeout_t)ahb_timeout, (caddr_t)ecb, 2 * hz);
|
||||
timeout((timeout_func_t)ahb_timeout, (caddr_t)ecb, 2 * hz);
|
||||
ecb->flags = ECB_ABORTED;
|
||||
}
|
||||
splx(s);
|
||||
|
||||
@ -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.30 1994/08/18 23:36:37 phk Exp $
|
||||
* $Id: aha1542.c,v 1.31 1994/08/19 21:02:05 ats Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -43,10 +43,6 @@
|
||||
#define NAHA 1
|
||||
#endif /*KERNEL */
|
||||
|
||||
#if !defined(NetBSD) && !defined(__FreeBSD__)
|
||||
typedef timeout_func_t timeout_t;
|
||||
#endif
|
||||
|
||||
/************************** board definitions *******************************/
|
||||
|
||||
/*
|
||||
@ -688,7 +684,7 @@ ahaintr(unit)
|
||||
#endif /*AHADEBUG */
|
||||
}
|
||||
if (ccb) {
|
||||
untimeout((timeout_t)aha_timeout, (caddr_t)ccb);
|
||||
untimeout((timeout_func_t)aha_timeout, (caddr_t)ccb);
|
||||
aha_done(unit, ccb);
|
||||
}
|
||||
aha->aha_mbx.mbi[i].stat = AHA_MBI_FREE;
|
||||
@ -1220,7 +1216,7 @@ aha_scsi_cmd(xs)
|
||||
bcopy(xs->cmd, &ccb->scsi_cmd, ccb->scsi_cmd_length);
|
||||
if (!(flags & SCSI_NOMASK)) {
|
||||
s = splbio(); /* stop instant timeouts */
|
||||
timeout((timeout_t)aha_timeout, (caddr_t)ccb, (xs->timeout * hz) / 1000);
|
||||
timeout((timeout_func_t)aha_timeout, (caddr_t)ccb, (xs->timeout * hz) / 1000);
|
||||
aha_startmbx(ccb->mbx);
|
||||
/*
|
||||
* Usually return SUCCESSFULLY QUEUED
|
||||
@ -1281,7 +1277,7 @@ aha_poll(unit, xs, ccb)
|
||||
* because we are polling,
|
||||
* take out the timeout entry aha_timeout made
|
||||
*/
|
||||
untimeout((timeout_t)aha_timeout, (caddr_t)ccb);
|
||||
untimeout((timeout_func_t)aha_timeout, (caddr_t)ccb);
|
||||
count = 2000;
|
||||
while (count) {
|
||||
/*
|
||||
@ -1475,7 +1471,7 @@ aha_timeout(caddr_t arg1)
|
||||
printf("\n");
|
||||
aha_abortmbx(ccb->mbx);
|
||||
/* 4 secs for the abort */
|
||||
timeout((timeout_t)aha_timeout, (caddr_t)ccb, 4 * hz);
|
||||
timeout((timeout_func_t)aha_timeout, (caddr_t)ccb, 4 * hz);
|
||||
ccb->flags = CCB_ABORTED;
|
||||
} splx(s);
|
||||
}
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
*
|
||||
* commenced: Sun Sep 27 18:14:01 PDT 1992
|
||||
*
|
||||
* $Id: aha1742.c,v 1.16 1994/05/25 08:58:13 rgrimes Exp $
|
||||
* $Id: aha1742.c,v 1.17 1994/08/13 03:49:54 wollman Exp $
|
||||
*/
|
||||
|
||||
#include <sys/types.h>
|
||||
@ -51,10 +51,6 @@ int Debugger();
|
||||
#define NAHB 1
|
||||
#endif /* kernel */
|
||||
|
||||
#ifndef NetBSD
|
||||
typedef timeout_func_t timeout_t;
|
||||
#endif
|
||||
|
||||
typedef unsigned long int physaddr;
|
||||
#include <sys/kernel.h>
|
||||
|
||||
@ -274,7 +270,7 @@ int ahb_attach();
|
||||
int ahb_init __P((int unit));
|
||||
int ahbintr();
|
||||
int32 ahb_scsi_cmd();
|
||||
void ahb_timeout(caddr_t);
|
||||
void ahb_timeout __P((caddr_t));
|
||||
void ahb_done();
|
||||
struct ecb *cheat;
|
||||
void ahb_free_ecb();
|
||||
@ -628,7 +624,7 @@ ahbintr(unit)
|
||||
if ((ahb_debug & AHB_SHOWECBS) && ecb)
|
||||
printf("<int ecb(%x)>", ecb);
|
||||
#endif /*AHBDEBUG */
|
||||
untimeout((timeout_t)ahb_timeout, (caddr_t)ecb);
|
||||
untimeout((timeout_func_t)ahb_timeout, (caddr_t)ecb);
|
||||
ahb_done(unit, ecb, ((stat == AHB_ECB_OK) ? SUCCESS : FAIL));
|
||||
}
|
||||
}
|
||||
@ -993,7 +989,7 @@ ahb_scsi_cmd(xs)
|
||||
if (!(flags & SCSI_NOMASK)) {
|
||||
s = splbio();
|
||||
ahb_send_immed(unit, xs->sc_link->target, AHB_TARG_RESET);
|
||||
timeout((timeout_t)ahb_timeout, (caddr_t)ecb, (xs->timeout * hz) / 1000);
|
||||
timeout((timeout_func_t)ahb_timeout, (caddr_t)ecb, (xs->timeout * hz) / 1000);
|
||||
splx(s);
|
||||
return (SUCCESSFULLY_QUEUED);
|
||||
} else {
|
||||
@ -1122,7 +1118,7 @@ ahb_scsi_cmd(xs)
|
||||
if (!(flags & SCSI_NOMASK)) {
|
||||
s = splbio();
|
||||
ahb_send_mbox(unit, OP_START_ECB, xs->sc_link->target, ecb);
|
||||
timeout((timeout_t)ahb_timeout, (caddr_t)ecb, (xs->timeout * hz) / 1000);
|
||||
timeout((timeout_func_t)ahb_timeout, (caddr_t)ecb, (xs->timeout * hz) / 1000);
|
||||
splx(s);
|
||||
SC_DEBUG(xs->sc_link, SDEV_DB3, ("cmd_sent\n"));
|
||||
return (SUCCESSFULLY_QUEUED);
|
||||
@ -1199,7 +1195,7 @@ ahb_timeout(caddr_t arg1)
|
||||
printf("\n");
|
||||
ahb_send_mbox(unit, OP_ABORT_ECB, ecb->xs->sc_link->target, ecb);
|
||||
/* 2 secs for the abort */
|
||||
timeout((timeout_t)ahb_timeout, (caddr_t)ecb, 2 * hz);
|
||||
timeout((timeout_func_t)ahb_timeout, (caddr_t)ecb, 2 * hz);
|
||||
ecb->flags = ECB_ABORTED;
|
||||
}
|
||||
splx(s);
|
||||
|
||||
@ -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.1 1994/08/12 06:51:10 davidg Exp $
|
||||
* $Id: if_le.c,v 1.2 1994/08/12 11:42:37 davidg Exp $
|
||||
*
|
||||
* $Log: if_le.c,v $
|
||||
* Revision 1.2 1994/08/12 11:42:37 davidg
|
||||
* Added conditionals to make this compile cleanly in FreeBSD 2.0.
|
||||
*
|
||||
* Revision 1.1 1994/08/12 06:51:10 davidg
|
||||
* New ethernet device driver from Matt Thomas:
|
||||
*
|
||||
@ -783,7 +786,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);
|
||||
#if __FreeBSD__ > 1
|
||||
@ -800,10 +802,10 @@ static int lemac_read_eeprom(le_softc_t *sc);
|
||||
static void lemac_init_adapmem(le_softc_t *sc);
|
||||
|
||||
static const le_mcbits_t lemac_allmulti_mctbl[16] = {
|
||||
0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
|
||||
0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
|
||||
0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
|
||||
0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU, 0xFFFFFFFFU,
|
||||
0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU,
|
||||
0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU,
|
||||
0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU,
|
||||
0xFFFFU, 0xFFFFU, 0xFFFFU, 0xFFFFU,
|
||||
};
|
||||
/*
|
||||
* An IRQ mapping table. Less space than switch statement.
|
||||
@ -1318,7 +1320,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,
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* from: @(#)isa_device.h 7.1 (Berkeley) 5/9/91
|
||||
* $Id: isa_device.h,v 1.5 1994/01/04 20:06:30 nate Exp $
|
||||
* $Id: isa_device.h,v 1.6 1994/08/18 05:09:33 davidg Exp $
|
||||
*/
|
||||
|
||||
#ifndef _I386_ISA_ISA_DEVICE_H_
|
||||
@ -93,10 +93,6 @@ struct isa_driver {
|
||||
extern char eintrnames[]; /* end of intrnames[] */
|
||||
extern u_long intrcnt[]; /* counts for for each device and stray */
|
||||
extern char intrnames[]; /* string table containing device names */
|
||||
u_long *intr_countp[]; /* indirectors into intrcnt[] */
|
||||
inthand2_t *intr_handler[]; /* C entry points of intr handlers */
|
||||
u_int intr_mask[]; /* sets of intrs masked during handling of 1 */
|
||||
int intr_unit[]; /* cookies to pass to intr handlers */
|
||||
|
||||
extern struct isa_device isa_devtab_bio[], isa_devtab_tty[], isa_devtab_net[],
|
||||
isa_devtab_null[], isa_biotab_wdc[], isa_biotab_fdc[];
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: syscons.c,v 1.50 1994/08/17 08:51:59 sos Exp $
|
||||
* $Id: syscons.c,v 1.51 1994/08/17 19:32:23 sos Exp $
|
||||
*/
|
||||
|
||||
#include "sc.h"
|
||||
@ -198,9 +198,6 @@ static int scrn_saver = 0; /* screen saver routine */
|
||||
static long scrn_time_stamp;
|
||||
static u_char scr_map[256];
|
||||
|
||||
extern int hz;
|
||||
extern struct timeval time;
|
||||
|
||||
/* function prototypes */
|
||||
int pcprobe(struct isa_device *dev);
|
||||
int pcattach(struct isa_device *dev);
|
||||
|
||||
@ -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.7 1994/05/27 04:02:10 rgrimes Exp $
|
||||
* $Id: wt.c,v 1.8 1994/08/13 03:50:20 wollman Exp $
|
||||
*
|
||||
*/
|
||||
|
||||
@ -166,9 +166,6 @@ static int wtreadfm (wtinfo_t *t);
|
||||
static int wtwritefm (wtinfo_t *t);
|
||||
static int wtpoll (wtinfo_t *t, int mask, int bits);
|
||||
|
||||
/* XXX */
|
||||
extern void DELAY (int usec);
|
||||
|
||||
/*
|
||||
* Probe for the presence of the device.
|
||||
*/
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* $Id: syscons.c,v 1.50 1994/08/17 08:51:59 sos Exp $
|
||||
* $Id: syscons.c,v 1.51 1994/08/17 19:32:23 sos Exp $
|
||||
*/
|
||||
|
||||
#include "sc.h"
|
||||
@ -198,9 +198,6 @@ static int scrn_saver = 0; /* screen saver routine */
|
||||
static long scrn_time_stamp;
|
||||
static u_char scr_map[256];
|
||||
|
||||
extern int hz;
|
||||
extern struct timeval time;
|
||||
|
||||
/* function prototypes */
|
||||
int pcprobe(struct isa_device *dev);
|
||||
int pcattach(struct isa_device *dev);
|
||||
|
||||
@ -36,7 +36,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)cd9660_vfsops.c 8.3 (Berkeley) 1/31/94
|
||||
* $Id$
|
||||
* $Id: cd9660_vfsops.c,v 1.3 1994/08/02 07:41:33 davidg Exp $
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
@ -58,8 +58,6 @@
|
||||
#include <isofs/cd9660/iso.h>
|
||||
#include <isofs/cd9660/cd9660_node.h>
|
||||
|
||||
extern int enodev ();
|
||||
|
||||
struct vfsops cd9660_vfsops = {
|
||||
cd9660_mount,
|
||||
cd9660_start,
|
||||
@ -87,7 +85,6 @@ int
|
||||
cd9660_mountroot()
|
||||
{
|
||||
register struct mount *mp;
|
||||
extern struct vnode *rootvp;
|
||||
struct proc *p = curproc; /* XXX */
|
||||
struct iso_mnt *imp;
|
||||
register struct fs *fs;
|
||||
@ -229,7 +226,6 @@ iso_mountfs(devvp, mp, p, argp)
|
||||
int error = EINVAL, i, size;
|
||||
int needclose = 0;
|
||||
int ronly = (mp->mnt_flag & MNT_RDONLY) != 0;
|
||||
extern struct vnode *rootvp;
|
||||
int j;
|
||||
int iso_bsize;
|
||||
int iso_blknum;
|
||||
|
||||
@ -630,7 +630,6 @@ _lkm_dev(lkmtp, cmd)
|
||||
struct lkm_dev *args = lkmtp->private.lkm_dev;
|
||||
int i;
|
||||
int err = 0;
|
||||
extern int nblkdev, nchrdev; /* from conf.c */
|
||||
|
||||
switch(cmd) {
|
||||
case LKM_E_LOAD:
|
||||
|
||||
@ -36,7 +36,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)vfs_lookup.c 8.4 (Berkeley) 2/16/94
|
||||
* $Id: vfs_lookup.c,v 1.2 1994/08/02 07:43:25 davidg Exp $
|
||||
* $Id: vfs_lookup.c,v 1.3 1994/08/18 22:35:08 wollman Exp $
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
@ -106,10 +106,10 @@ namei(ndp)
|
||||
MALLOC(cnp->cn_pnbuf, caddr_t, MAXPATHLEN, M_NAMEI, M_WAITOK);
|
||||
if (ndp->ni_segflg == UIO_SYSSPACE)
|
||||
error = copystr(ndp->ni_dirp, cnp->cn_pnbuf,
|
||||
MAXPATHLEN, &ndp->ni_pathlen);
|
||||
MAXPATHLEN, (u_int *)&ndp->ni_pathlen);
|
||||
else
|
||||
error = copyinstr(ndp->ni_dirp, cnp->cn_pnbuf,
|
||||
MAXPATHLEN, &ndp->ni_pathlen);
|
||||
MAXPATHLEN, (u_int *)&ndp->ni_pathlen);
|
||||
if (error) {
|
||||
free(cnp->cn_pnbuf, M_NAMEI);
|
||||
ndp->ni_vp = NULL;
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
*
|
||||
* @(#)null_vnops.c 8.1 (Berkeley) 6/10/93
|
||||
*
|
||||
* $Id$
|
||||
* $Id: null_vnops.c,v 1.2 1994/08/02 07:45:06 davidg Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -207,7 +207,6 @@ null_bypass(ap)
|
||||
<other random data follows, presumably>
|
||||
} */ *ap;
|
||||
{
|
||||
extern int (**null_vnodeop_p)(); /* not extern, really "forward" */
|
||||
register struct vnode **this_vp_p;
|
||||
int error;
|
||||
struct vnode *old_vps[VDESC_MAX_VPS];
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
*
|
||||
* @(#)portal_vnops.c 8.8 (Berkeley) 1/21/94
|
||||
*
|
||||
* $Id: portal_vnops.c,v 1.4 1992/05/30 10:05:24 jsp Exp jsp $
|
||||
* $Id: portal_vnops.c,v 1.2 1994/05/25 09:08:21 rgrimes Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -431,7 +431,8 @@ portal_getattr(ap)
|
||||
vap->va_fsid = vp->v_mount->mnt_stat.f_fsid.val[0];
|
||||
vap->va_size = DEV_BSIZE;
|
||||
vap->va_blocksize = DEV_BSIZE;
|
||||
microtime(&vap->va_atime);
|
||||
microtime((struct timeval *)&vap->va_atime);
|
||||
TIMEVAL_TO_TIMESPEC((struct timeval *)&vap->va_atime, (struct timespec *)&vap->va_atime);
|
||||
vap->va_mtime = vap->va_atime;
|
||||
vap->va_ctime = vap->va_ctime;
|
||||
vap->va_gen = 0;
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)umap_vnops.c 8.3 (Berkeley) 1/5/94
|
||||
* $Id$
|
||||
* $Id: umap_vnops.c,v 1.3 1994/08/02 07:45:37 davidg Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -66,7 +66,6 @@ umap_bypass(ap)
|
||||
<other random data follows, presumably>
|
||||
} */ *ap;
|
||||
{
|
||||
extern int (**umap_vnodeop_p)(); /* not extern, really "forward" */
|
||||
struct ucred **credpp = 0, *credp = 0;
|
||||
struct ucred *savecredp = 0, *savecompcredp = 0;
|
||||
struct ucred *compcredp = 0;
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
*
|
||||
* @(#)bpf.c 8.2 (Berkeley) 3/28/94
|
||||
*
|
||||
* $Id$
|
||||
* $Id: bpf.c,v 1.2 1994/08/02 07:45:51 davidg Exp $
|
||||
*/
|
||||
|
||||
#include "bpfilter.h"
|
||||
@ -121,17 +121,13 @@ bpfilterattach(n)
|
||||
}
|
||||
#endif
|
||||
|
||||
static int bpf_allocbufs __P((struct bpf_d *));
|
||||
static int bpf_allocbufs __P((struct bpf_d *));
|
||||
static void bpf_freed __P((struct bpf_d *));
|
||||
static void bpf_freed __P((struct bpf_d *));
|
||||
static void bpf_ifname __P((struct ifnet *, struct ifreq *));
|
||||
static void bpf_ifname __P((struct ifnet *, struct ifreq *));
|
||||
static void bpf_mcopy __P((const void *, void *, u_int));
|
||||
static int bpf_movein __P((struct uio *, int,
|
||||
struct mbuf **, struct sockaddr *, int *));
|
||||
static int bpf_setif __P((struct bpf_d *, struct ifreq *));
|
||||
static int bpf_setif __P((struct bpf_d *, struct ifreq *));
|
||||
static inline void
|
||||
bpf_wakeup __P((struct bpf_d *));
|
||||
static void catchpacket __P((struct bpf_d *, u_char *, u_int,
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
* file.
|
||||
*
|
||||
* Written by Julian Elischer (julian@dialix.oz.au)
|
||||
* $Id: scsi_base.c,v 1.8 1994/05/19 22:21:05 jkh Exp $
|
||||
* $Id: scsi_base.c,v 1.9 1994/05/25 09:13:20 rgrimes Exp $
|
||||
*/
|
||||
|
||||
#define SPLSD splbio
|
||||
@ -42,8 +42,6 @@ int Debugger();
|
||||
#endif /* NDDB > 0 */
|
||||
#endif
|
||||
|
||||
void sc_print_addr __P((struct scsi_link *sc_link));
|
||||
|
||||
struct scsi_xfer *next_free_xs;
|
||||
|
||||
/*
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)lfs_alloc.c 8.4 (Berkeley) 1/4/94
|
||||
* $Id$
|
||||
* $Id: lfs_alloc.c,v 1.2 1994/08/02 07:54:29 davidg Exp $
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
@ -157,7 +157,6 @@ lfs_vcreate(mp, ino, vpp)
|
||||
ino_t ino;
|
||||
struct vnode **vpp;
|
||||
{
|
||||
extern int (**lfs_vnodeop_p)();
|
||||
struct inode *ip;
|
||||
struct ufsmount *ump;
|
||||
int error, i;
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)lfs_bio.c 8.4 (Berkeley) 12/30/93
|
||||
* $Id$
|
||||
* $Id: lfs_bio.c,v 1.3 1994/08/02 07:54:31 davidg Exp $
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
@ -167,7 +167,6 @@ lfs_check(vp, blkno)
|
||||
struct vnode *vp;
|
||||
daddr_t blkno;
|
||||
{
|
||||
extern int lfs_allclean_wakeup;
|
||||
int error;
|
||||
|
||||
error = 0;
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)lfs_segment.c 8.5 (Berkeley) 1/4/94
|
||||
* $Id$
|
||||
* $Id: lfs_segment.c,v 1.3 1994/08/02 07:54:36 davidg Exp $
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
@ -84,8 +84,6 @@ 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 *));
|
||||
int lfs_vref __P((struct vnode *));
|
||||
void lfs_vunref __P((struct vnode *));
|
||||
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 *));
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
* SUCH DAMAGE.
|
||||
*
|
||||
* @(#)lfs_vfsops.c 8.7 (Berkeley) 4/16/94
|
||||
* $Id$
|
||||
* $Id: lfs_vfsops.c,v 1.3 1994/08/02 07:54:38 davidg Exp $
|
||||
*/
|
||||
|
||||
#include <sys/param.h>
|
||||
@ -193,7 +193,6 @@ lfs_mountfs(devvp, mp, p)
|
||||
struct mount *mp;
|
||||
struct proc *p;
|
||||
{
|
||||
extern struct vnode *rootvp;
|
||||
register struct lfs *fs;
|
||||
register struct ufsmount *ump;
|
||||
struct vnode *vp;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user