Don't `extern' function declarations. While we're there, remove trailing

blank lines and white space.
This commit is contained in:
simonb 2000-03-28 02:58:44 +00:00
parent ea6aa0dc3c
commit ef89d70178
15 changed files with 105 additions and 107 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: ecoff_machdep.h,v 1.16 1999/04/24 08:10:34 simonb Exp $ */
/* $NetBSD: ecoff_machdep.h,v 1.17 2000/03/28 02:58:44 simonb Exp $ */
/*
* Copyright (c) 1997 Jonathan Stone
@ -71,7 +71,7 @@
#ifdef _KERNEL
struct proc;
struct exec_package;
extern void cpu_exec_ecoff_setregs __P((
void cpu_exec_ecoff_setregs __P((
struct proc *, struct exec_package *, u_long));
#endif /* _KERNEL */
@ -122,5 +122,3 @@ struct ecoff_extsym {
unsigned :1;
unsigned es_symauxindex:20;
};

View File

@ -1,4 +1,4 @@
/* $NetBSD: float.h,v 1.10 1998/02/18 10:37:04 mycroft Exp $ */
/* $NetBSD: float.h,v 1.11 2000/03/28 02:58:45 simonb Exp $ */
/*
* Copyright (c) 1989, 1993
@ -41,7 +41,7 @@
#include <sys/cdefs.h>
__BEGIN_DECLS
extern int __flt_rounds __P((void));
int __flt_rounds __P((void));
__END_DECLS
#define FLT_RADIX 2 /* b */

View File

@ -1,4 +1,4 @@
/* $NetBSD: intr.h,v 1.1 1998/03/26 12:46:33 jonathan Exp $ */
/* $NetBSD: intr.h,v 1.2 2000/03/28 02:58:45 simonb Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@ -39,8 +39,7 @@
*/
/* handle i/o device interrupts */
extern int (*mips_hardware_intr) __P((u_int mask, u_int pc,
u_int statusReg, u_int causeReg));
int (*mips_hardware_intr) __P((u_int mask, u_int pc,
u_int statusReg, u_int causeReg));
#endif /* __MIPS_INTR_H */

View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.h,v 1.28 2000/03/27 05:30:40 nisimura Exp $ */
/* $NetBSD: locore.h,v 1.29 2000/03/28 02:58:46 simonb Exp $ */
/*
* Copyright 1996 The Board of Trustees of The Leland Stanford
@ -50,64 +50,64 @@
* only to print them by name in stack tracebacks
*/
extern u_int32_t mips_read_causereg __P((void));
extern u_int32_t mips_read_statusreg __P((void));
extern void mips_idle __P((void));
u_int32_t mips_read_causereg __P((void));
u_int32_t mips_read_statusreg __P((void));
void mips_idle __P((void));
extern void mips1_ConfigCache __P((void));
extern void mips1_FlushCache __P((void));
extern void mips1_FlushDCache __P((vaddr_t addr, vsize_t len));
extern void mips1_FlushICache __P((vaddr_t addr, vsize_t len));
extern void mips1_ForceCacheUpdate __P((void));
extern void mips1_SetPID __P((int pid));
void mips1_ConfigCache __P((void));
void mips1_FlushCache __P((void));
void mips1_FlushDCache __P((vaddr_t addr, vsize_t len));
void mips1_FlushICache __P((vaddr_t addr, vsize_t len));
void mips1_ForceCacheUpdate __P((void));
void mips1_SetPID __P((int pid));
extern void mips1_TBIA __P((int));
extern void mips1_TBIAP __P((int));
extern void mips1_TBIS __P((vaddr_t));
void mips1_TBIA __P((int));
void mips1_TBIAP __P((int));
void mips1_TBIS __P((vaddr_t));
extern int mips1_TLBUpdate __P((u_int, /*pt_entry_t*/ u_int));
extern void mips1_TLBWriteIndexed __P((u_int index, u_int high,
u_int low));
extern void mips1_wbflush __P((void));
extern void mips1_proc_trampoline __P((void));
extern void mips1_cpu_switch_resume __P((void));
int mips1_TLBUpdate __P((u_int, /*pt_entry_t*/ u_int));
void mips1_TLBWriteIndexed __P((u_int index, u_int high,
u_int low));
void mips1_wbflush __P((void));
void mips1_proc_trampoline __P((void));
void mips1_cpu_switch_resume __P((void));
extern void mips3_ConfigCache __P((void));
extern void mips3_FlushCache __P((void));
extern void mips3_FlushDCache __P((vaddr_t addr, vaddr_t len));
extern void mips3_FlushICache __P((vaddr_t addr, vaddr_t len));
extern void mips3_ForceCacheUpdate __P((void));
extern void mips3_HitFlushDCache __P((vaddr_t, int));
extern void mips3_SetPID __P((int pid));
extern void mips3_TLBFlush __P((int numtlb));
extern void mips3_TLBFlushAddr __P( /* XXX Really pte highpart ? */
(vaddr_t addr));
extern int mips3_TLBUpdate __P((u_int, /*pt_entry_t*/ u_int));
void mips3_ConfigCache __P((void));
void mips3_FlushCache __P((void));
void mips3_FlushDCache __P((vaddr_t addr, vaddr_t len));
void mips3_FlushICache __P((vaddr_t addr, vaddr_t len));
void mips3_ForceCacheUpdate __P((void));
void mips3_HitFlushDCache __P((vaddr_t, int));
void mips3_SetPID __P((int pid));
void mips3_TLBFlush __P((int numtlb));
void mips3_TLBFlushAddr __P( /* XXX Really pte highpart ? */
(vaddr_t addr));
int mips3_TLBUpdate __P((u_int, /*pt_entry_t*/ u_int));
struct tlb;
extern void mips3_TLBRead __P((int, struct tlb *));
void mips3_TLBRead __P((int, struct tlb *));
#if 0
extern void mips3_TLBWriteIndexedVPS __P((u_int index, struct tlb *tlb));
extern void mips3_TLBWriteIndexed __P((u_int index, u_int high,
u_int lo0, u_int lo1));
void mips3_TLBWriteIndexedVPS __P((u_int index, struct tlb *tlb));
void mips3_TLBWriteIndexed __P((u_int index, u_int high,
u_int lo0, u_int lo1));
#endif
extern void mips3_wbflush __P((void));
extern void mips3_proc_trampoline __P((void));
extern void mips3_cpu_switch_resume __P((void));
void mips3_wbflush __P((void));
void mips3_proc_trampoline __P((void));
void mips3_cpu_switch_resume __P((void));
extern void mips3_SetWIRED __P((int));
void mips3_SetWIRED __P((int));
extern void mips5200_FlushCache __P((void));
extern void mips5200_FlushDCache __P((vaddr_t addr, vaddr_t len));
extern void mips5200_HitFlushDCache __P((vaddr_t, int));
extern void mips5200_FlushICache __P((vaddr_t addr, vaddr_t len));
void mips5200_FlushCache __P((void));
void mips5200_FlushDCache __P((vaddr_t addr, vaddr_t len));
void mips5200_HitFlushDCache __P((vaddr_t, int));
void mips5200_FlushICache __P((vaddr_t addr, vaddr_t len));
extern u_int32_t mips3_cycle_count __P((void));
extern u_int32_t mips3_write_count __P((u_int32_t));
extern u_int32_t mips3_read_compare __P((void));
extern u_int32_t mips3_read_config __P((void));
extern void mips3_write_compare __P((u_int32_t));
extern void mips3_write_xcontext_upper __P((u_int32_t));
extern void mips3_clearBEV __P((void));
u_int32_t mips3_cycle_count __P((void));
u_int32_t mips3_write_count __P((u_int32_t));
u_int32_t mips3_read_compare __P((void));
u_int32_t mips3_read_config __P((void));
void mips3_write_compare __P((u_int32_t));
void mips3_write_xcontext_upper __P((u_int32_t));
void mips3_clearBEV __P((void));
/*
* A vector with an entry for each mips-ISA-level dependent

View File

@ -1,4 +1,4 @@
/* $NetBSD: proc.h,v 1.9 1999/01/14 18:45:45 castor Exp $ */
/* $NetBSD: proc.h,v 1.10 2000/03/28 02:58:46 simonb Exp $ */
/*
* Copyright (c) 1992, 1993
@ -63,7 +63,7 @@ struct frame {
#ifdef _KERNEL
/* kernel single-step emulation */
extern int mips_singlestep __P((struct proc *p));
int mips_singlestep __P((struct proc *p));
#endif /* _KERNEL */
#endif /* _MIPS_PROC_H_ */

View File

@ -1,4 +1,4 @@
/* $NetBSD: profile.h,v 1.12 1998/09/11 16:46:31 jonathan Exp $ */
/* $NetBSD: profile.h,v 1.13 2000/03/28 02:58:46 simonb Exp $ */
/*
* Copyright (c) 1992, 1993
@ -46,8 +46,9 @@
* Declare non-profiled _splhigh() /_splx() entrypoints for _mcount.
* see MCOUNT_ENTER and MCOUNT_EXIT.
*/
#define _KERNEL_MCOUNT_DECL \
extern int _splhigh __P((void)); extern int _splx __P((int));
#define _KERNEL_MCOUNT_DECL \
int _splhigh __P((void)); \
int _splx __P((int));
#else /* !_KERNEL */
/* Make __mcount static. */
#define _KERNEL_MCOUNT_DECL static

View File

@ -1,4 +1,4 @@
/* $NetBSD: db_interface.c,v 1.25 2000/02/18 00:02:43 mycroft Exp $ */
/* $NetBSD: db_interface.c,v 1.26 2000/03/28 02:58:48 simonb Exp $ */
/*
* Mach Operating System
@ -57,10 +57,10 @@ void db_halt_cmd __P((db_expr_t, int, db_expr_t, char *));
void db_tlbdump_cmd __P((db_expr_t, int, db_expr_t, char *));
void db_kvtophys_cmd __P((db_expr_t, int, db_expr_t, char *));
extern void kdbpoke __P((vaddr_t addr, int newval));
extern vaddr_t MachEmulateBranch __P((struct frame *, vaddr_t, unsigned, int));
void kdbpoke __P((vaddr_t addr, int newval));
vaddr_t MachEmulateBranch __P((struct frame *, vaddr_t, unsigned, int));
extern paddr_t kvtophys __P((vaddr_t));
paddr_t kvtophys __P((vaddr_t));
#ifdef DDB_TRACE
int
@ -318,7 +318,7 @@ db_tlbdump_cmd(addr, have_addr, count, modif)
u_int32_t tlb_lo;
} tlb;
int i;
extern void mips1_TLBRead __P((int, struct mips1_tlb *));
void mips1_TLBRead __P((int, struct mips1_tlb *));
for (i = 0; i < mips_num_tlb_entries; i++) {
mips1_TLBRead(i, &tlb);

View File

@ -1,4 +1,4 @@
/* $NetBSD: db_trace.c,v 1.8 1999/04/24 08:10:39 simonb Exp $ */
/* $NetBSD: db_trace.c,v 1.9 2000/03/28 02:58:48 simonb Exp $ */
/*
* Mach Operating System
@ -38,8 +38,8 @@
#include <ddb/db_variables.h>
#include <ddb/db_sym.h>
extern int __start __P((void)); /* lowest kernel code address */
extern vaddr_t getreg_val __P((db_expr_t regno));
int __start __P((void)); /* lowest kernel code address */
vaddr_t getreg_val __P((db_expr_t regno));
#define REG_ARG(i) (4+i)
#define SAVES_RA(x) isa_spill((x),31)
@ -54,7 +54,7 @@ extern vaddr_t getreg_val __P((db_expr_t regno));
((int *)(&((struct mips_kernel_state *)0)->sp) - (int *)0): \
-1)
extern db_sym_t localsym __P((db_sym_t sym, boolean_t isreg, int *lex_level));
db_sym_t localsym __P((db_sym_t sym, boolean_t isreg, int *lex_level));
/*
* Machine register set.
@ -68,7 +68,7 @@ int print_exception_frame __P((register struct mips_saved_state *fp,
unsigned epc));
/*XXX*/
extern void stacktrace_subr __P((int a0, int a1, int a2, int a3,
void stacktrace_subr __P((int a0, int a1, int a2, int a3,
u_int pc, u_int sp, u_int fp, u_int ra,
void (*)(const char*, ...)));

View File

@ -1,4 +1,4 @@
/* $NetBSD: fpemu.c,v 1.3 1999/12/22 04:54:16 jun Exp $ */
/* $NetBSD: fpemu.c,v 1.4 2000/03/28 02:58:48 simonb Exp $ */
/*
* Copyright (c) 1999 Shuichiro URATA. All rights reserved.
@ -65,7 +65,7 @@ void bcemul_swl __P((u_int32_t inst, struct frame *frame, u_int32_t cause));
void bcemul_swr __P((u_int32_t inst, struct frame *frame, u_int32_t cause));
extern struct proc *fpcurproc;
extern vaddr_t MachEmulateBranch __P((struct frame *, vaddr_t, unsigned, int));
vaddr_t MachEmulateBranch __P((struct frame *, vaddr_t, unsigned, int));
static __inline void
send_sigsegv(vaddr, exccode, frame, cause)

View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.S,v 1.91 2000/03/28 00:24:04 nisimura Exp $ */
/* $NetBSD: locore.S,v 1.92 2000/03/28 02:58:48 simonb Exp $ */
/*
* Copyright (c) 1992, 1993
@ -100,8 +100,8 @@ _C_LABEL(kernel_text):
#ifdef __GP_SUPPORT__
la gp, _C_LABEL(_gp)
#endif
#ifdef R3900_CACHE_DISABLE
#ifdef R3900_CACHE_DISABLE
li t0, ~(R3900_CONFIG_ICE|R3900_CONFIG_DCE)
mfc0 t1, R3900_COP_0_CONFIG
and t1, t0, t1
@ -109,7 +109,7 @@ _C_LABEL(kernel_text):
mtc0 t1, R3900_COP_0_CONFIG
nop
#endif /* R3900_CACHE_DISABLE */
#ifdef NOFPU /* No FPU; avoid touching FPU registers */
li t0, 0 # Disable interrupts and
mtc0 t0, MIPS_COP_0_STATUS # the fp coprocessor
@ -117,10 +117,10 @@ _C_LABEL(kernel_text):
li t0, 0x00018c2 # XXX, KSEG0 is uncached
mtc0 t0, MIPS_COP_0_CONFIG
#endif /* HPCMIPS_L1CACHE_DISABLE */
#else
#else
li t0, MIPS_SR_COP_1_BIT # Disable interrupts, and
mtc0 t0, MIPS_COP_0_STATUS # enable the fp coprocessor
#endif
#endif
nop
nop
mfc0 t0, MIPS_COP_0_PRID # read product revision ID
@ -130,9 +130,9 @@ _C_LABEL(kernel_text):
nop
#ifdef NOFPU /* No FPU; avoid touching FPU registers */
add t1, zero, zero
#else
#else
cfc1 t1, MIPS_FPU_ID # read FPU ID register
#endif
#endif
sw t0, _C_LABEL(cpu_id) # save PRID register
sw t1, _C_LABEL(fpu_id) # save FPU ID register
jal _C_LABEL(mach_init) # mach_init(a0, a1, a2, a3)

View File

@ -1,4 +1,4 @@
/* $NetBSD: mips_machdep.c,v 1.74 2000/03/28 02:53:18 simonb Exp $ */
/* $NetBSD: mips_machdep.c,v 1.75 2000/03/28 02:58:49 simonb Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -52,7 +52,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: mips_machdep.c,v 1.74 2000/03/28 02:53:18 simonb Exp $");
__KERNEL_RCSID(0, "$NetBSD: mips_machdep.c,v 1.75 2000/03/28 02:58:49 simonb Exp $");
#include "opt_compat_netbsd.h"
#include "opt_compat_ultrix.h"
@ -307,7 +307,7 @@ mips3_vector_init()
#endif
#ifdef arc /* XXX */
{
extern void machine_ConfigCache __P((void));
void machine_ConfigCache __P((void));
machine_ConfigCache();
}

View File

@ -1,4 +1,4 @@
/* $NetBSD: mips_mcclock.c,v 1.8 1999/12/03 02:56:37 nisimura Exp $ */
/* $NetBSD: mips_mcclock.c,v 1.9 2000/03/28 02:58:49 simonb Exp $ */
/*
* Copyright (c) 1997 Jonathan Stone (hereinafter referred to as the author)
@ -34,13 +34,13 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: mips_mcclock.c,v 1.8 1999/12/03 02:56:37 nisimura Exp $");
__KERNEL_RCSID(0, "$NetBSD: mips_mcclock.c,v 1.9 2000/03/28 02:58:49 simonb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/device.h>
#include <dev/ic/mc146818reg.h>
#include <dev/ic/mc146818reg.h>
#include <dev/dec/mcclockvar.h>
#include <dev/dec/mcclock_pad32.h>
@ -52,7 +52,7 @@ unsigned mips_mc_cpuspeed __P((void *, int, int (*)(void *, int)));
int mips_mcclock_tickloop __P((void *, int));
unsigned mips_mcclock_to_mhz __P((unsigned iters));
extern u_int mips_read_causereg __P((void));
u_int mips_read_causereg __P((void));
/*

View File

@ -1,4 +1,4 @@
/* $NetBSD: process_machdep.c,v 1.12 2000/01/09 08:01:54 shin Exp $ */
/* $NetBSD: process_machdep.c,v 1.13 2000/03/28 02:58:50 simonb Exp $ */
/*
* Copyright (c) 1994 Adam Glass
@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: process_machdep.c,v 1.12 2000/01/09 08:01:54 shin Exp $");
__KERNEL_RCSID(0, "$NetBSD: process_machdep.c,v 1.13 2000/03/28 02:58:50 simonb Exp $");
/*
* This file may seem a bit stylized, but that so that it's easier to port.
@ -81,7 +81,7 @@ __KERNEL_RCSID(0, "$NetBSD: process_machdep.c,v 1.12 2000/01/09 08:01:54 shin Ex
extern struct proc *fpcurproc; /* trap.c */
#if !defined(NOFPU) && !defined(SOFTFLOAT)
extern void savefpregs __P((struct proc *));
void savefpregs __P((struct proc *));
#endif
int

View File

@ -1,4 +1,4 @@
/* $NetBSD: trap.c,v 1.122 2000/03/28 00:55:33 simonb Exp $ */
/* $NetBSD: trap.c,v 1.123 2000/03/28 02:58:50 simonb Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.122 2000/03/28 00:55:33 simonb Exp $");
__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.123 2000/03/28 02:58:50 simonb Exp $");
#include "opt_cputype.h" /* which mips CPU levels do we support? */
#include "opt_inet.h"
@ -180,9 +180,9 @@ void interrupt __P((unsigned, unsigned, unsigned));
void ast __P((unsigned));
void dealfpu __P((unsigned, unsigned, unsigned));
extern void MachEmulateFP __P((unsigned));
extern void MachFPInterrupt __P((unsigned, unsigned, unsigned,
struct frame *));
void MachEmulateFP __P((unsigned));
void MachFPInterrupt __P((unsigned, unsigned, unsigned,
struct frame *));
/*
* Other forward declarations.
@ -408,7 +408,7 @@ trap(status, cause, vaddr, opc, frame)
struct proc *p = curproc;
vm_prot_t ftype;
extern struct proc *fpcurproc;
extern void fswintrberr __P((void));
void fswintrberr __P((void));
uvmexp.traps++;
type = TRAPTYPE(cause);
@ -1136,7 +1136,7 @@ extern char mips3_UserGenException[];
extern char mips3_KernIntr[];
extern char mips3_UserIntr[];
extern char mips3_SystemCall[];
extern int main __P((void*));
int main __P((void*));
/*
* stack trace code, also useful to DDB one day

View File

@ -1,4 +1,4 @@
/* $NetBSD: vm_machdep.c,v 1.50 2000/03/26 20:42:31 kleink Exp $ */
/* $NetBSD: vm_machdep.c,v 1.51 2000/03/28 02:58:50 simonb Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -43,7 +43,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.50 2000/03/26 20:42:31 kleink Exp $");
__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.51 2000/03/28 02:58:50 simonb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -69,12 +69,12 @@ __KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.50 2000/03/26 20:42:31 kleink Exp $
/* XXX will be declared in mips/include/cpu.h XXX */
extern struct proc *fpcurproc;
extern paddr_t kvtophys __P((vaddr_t)); /* XXX */
paddr_t kvtophys __P((vaddr_t)); /* XXX */
/*
* Finish a fork operation, with process p2 nearly set up.
* Copy and update the pcb and trap frame, making the child ready to run.
*
*
* Rig the child's kernel stack so that it will start out in
* proc_trampoline() and call child_return() with p2 as an
* argument. This causes the newly-created child process to go
@ -206,7 +206,7 @@ void
cpu_exit(p)
struct proc *p;
{
extern void switch_exit __P((struct proc *));
void switch_exit __P((struct proc *));
if (fpcurproc == p)
fpcurproc = (struct proc *)0;
@ -315,7 +315,7 @@ extern vm_map_t phys_map;
/*
* Map a user I/O request into kernel virtual address space.
* Note: the pages are already locked by uvm_vslock(), so we
* do not need to pass an access_type to pmap_enter().
* do not need to pass an access_type to pmap_enter().
*/
void
vmapbuf(bp, len)