From c02d890ef95a198c0fe58c9624bb6c183e9324f8 Mon Sep 17 00:00:00 2001 From: briggs Date: Sun, 5 May 1996 06:54:09 +0000 Subject: [PATCH] Move a few prototypes into machine/cpu.h. --- sys/arch/mac68k/include/cpu.h | 27 ++++++++++++++++++++++++- sys/arch/mac68k/mac68k/fpu.c | 3 +-- sys/arch/mac68k/mac68k/machdep.c | 8 +------- sys/arch/mac68k/mac68k/pmap.c | 7 +------ sys/arch/mac68k/mac68k/pmap_bootstrap.c | 3 +-- sys/arch/mac68k/mac68k/trap.c | 6 +----- sys/arch/mac68k/mac68k/vm_machdep.c | 4 +--- 7 files changed, 32 insertions(+), 26 deletions(-) diff --git a/sys/arch/mac68k/include/cpu.h b/sys/arch/mac68k/include/cpu.h index 92a2c5c5a4d3..22d7b1794e83 100644 --- a/sys/arch/mac68k/include/cpu.h +++ b/sys/arch/mac68k/include/cpu.h @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.30 1996/05/05 06:43:33 briggs Exp $ */ +/* $NetBSD: cpu.h,v 1.31 1996/05/05 06:54:09 briggs Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -349,7 +349,32 @@ extern unsigned long load_addr; #define CACHE4_OFF 0x00000000 __BEGIN_DECLS +/* machdep.c */ +u_int get_mapping __P((void)); + +/* locore.s */ +void m68881_restore __P((int [])); +void m68881_save __P((struct fpframe *)); +u_int getsfc __P((void)); +u_int getdfc __P((void)); +void TBIA __P((void)); +void TBIAS __P((void)); +void TBIS __P((vm_offset_t)); +void DCFP __P((vm_offset_t)); +void ICPP __P((vm_offset_t)); +void DCIU __P((void)); +void ICIA __P((void)); +void DCFL __P((vm_offset_t)); +int suline __P((caddr_t, caddr_t)); +int susword __P((caddr_t, u_int)); +void savectx __P((struct pcb *)); +void proc_trampoline __P((void)); + +/* trap.c */ +void child_return __P((struct proc *, struct frame)); + #if defined(COMPAT_SUNOS) +/* m68k/m68k/sunos_machdep.c */ void sunos_sendsig __P((sig_t, int, int, u_long)); #endif __END_DECLS diff --git a/sys/arch/mac68k/mac68k/fpu.c b/sys/arch/mac68k/mac68k/fpu.c index 2b70e071cff0..ce48c6143bf8 100644 --- a/sys/arch/mac68k/mac68k/fpu.c +++ b/sys/arch/mac68k/mac68k/fpu.c @@ -1,4 +1,4 @@ -/* $NetBSD: fpu.c,v 1.13 1996/05/05 06:18:25 briggs Exp $ */ +/* $NetBSD: fpu.c,v 1.14 1996/05/05 06:54:14 briggs Exp $ */ /* * Copyright (c) 1995 Gordon W. Ross @@ -106,7 +106,6 @@ fpu_probe() int fpframe[60 / sizeof(int)]; label_t faultbuf; u_char b; - void m68881_restore __P((int [])); nofault = (int *) &faultbuf; if (setjmp(&faultbuf)) { diff --git a/sys/arch/mac68k/mac68k/machdep.c b/sys/arch/mac68k/mac68k/machdep.c index c6a3294aad55..e66665bb3388 100644 --- a/sys/arch/mac68k/mac68k/machdep.c +++ b/sys/arch/mac68k/mac68k/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.95 1996/05/05 06:18:31 briggs Exp $ */ +/* $NetBSD: machdep.c,v 1.96 1996/05/05 06:54:16 briggs Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -442,10 +442,7 @@ again: } void doboot __P((void)); -void savectx __P((struct pcb *)); void via_shutdown __P((void)); -void m68881_save __P((struct fpframe *)); -void m68881_restore __P((struct fpframe *)); /* * Set registers on exec. @@ -1276,8 +1273,6 @@ nmihand(frame) } void dumpmem __P((u_int *, int)); -u_int getsfc __P((void)); -u_int getdfc __P((void)); void regdump(frame, sbytes) @@ -2424,7 +2419,6 @@ check_video(id, limit, maxm) * Returns the address of logical 0 so that locore can map the kernel * properly. */ -u_int get_mapping __P((void)); u_int get_mapping(void) { diff --git a/sys/arch/mac68k/mac68k/pmap.c b/sys/arch/mac68k/mac68k/pmap.c index bad5f2376841..11e530d509e3 100644 --- a/sys/arch/mac68k/mac68k/pmap.c +++ b/sys/arch/mac68k/mac68k/pmap.c @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.23 1996/05/05 06:18:47 briggs Exp $ */ +/* $NetBSD: pmap.c,v 1.24 1996/05/05 06:54:19 briggs Exp $ */ /* * Copyright (c) 1991, 1993 @@ -830,11 +830,6 @@ pmap_deactivate(pmap, pcb) { } -void TBIA __P((void)); -void TBIS __P((vm_offset_t)); -void DCFP __P((vm_offset_t)); -void ICPP __P((vm_offset_t)); - /* * Remove the given range of addresses from the specified map. * diff --git a/sys/arch/mac68k/mac68k/pmap_bootstrap.c b/sys/arch/mac68k/mac68k/pmap_bootstrap.c index 8b459180b0d7..03b241fee527 100644 --- a/sys/arch/mac68k/mac68k/pmap_bootstrap.c +++ b/sys/arch/mac68k/mac68k/pmap_bootstrap.c @@ -1,4 +1,4 @@ -/* $NetBSD: pmap_bootstrap.c,v 1.20 1996/05/05 06:18:51 briggs Exp $ */ +/* $NetBSD: pmap_bootstrap.c,v 1.21 1996/05/05 06:54:21 briggs Exp $ */ /* * Copyright (c) 1991, 1993 @@ -562,7 +562,6 @@ void bootstrap_mac68k(tc) int tc; { - u_int get_mapping __P((void)); extern u_long videoaddr; extern caddr_t esym; vm_offset_t nextpa; diff --git a/sys/arch/mac68k/mac68k/trap.c b/sys/arch/mac68k/mac68k/trap.c index 626611ce2418..eb3af523e055 100644 --- a/sys/arch/mac68k/mac68k/trap.c +++ b/sys/arch/mac68k/mac68k/trap.c @@ -1,4 +1,4 @@ -/* $NetBSD: trap.c,v 1.36 1996/05/05 06:19:01 briggs Exp $ */ +/* $NetBSD: trap.c,v 1.37 1996/05/05 06:54:23 briggs Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -136,10 +136,6 @@ static inline void userret __P((register struct proc *, register struct frame *, u_quad_t, u_int, int)); -void DCFL __P((vm_offset_t)); -int suline __P((caddr_t, caddr_t)); -int susword __P((caddr_t, u_int)); - #if defined(M68040) static int writeback __P((struct frame *, int)); #if DEBUG diff --git a/sys/arch/mac68k/mac68k/vm_machdep.c b/sys/arch/mac68k/mac68k/vm_machdep.c index 4c78b46da368..794629f22937 100644 --- a/sys/arch/mac68k/mac68k/vm_machdep.c +++ b/sys/arch/mac68k/mac68k/vm_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: vm_machdep.c,v 1.18 1996/05/05 06:19:07 briggs Exp $ */ +/* $NetBSD: vm_machdep.c,v 1.19 1996/05/05 06:54:26 briggs Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -83,7 +83,6 @@ cpu_fork(p1, p2) register struct trapframe *tf; register struct switchframe *sf; extern struct pcb *curpcb; - extern void proc_trampoline __P((void)), child_return __P((void)); p2->p_md.md_flags = p1->p_md.md_flags; @@ -125,7 +124,6 @@ cpu_set_kpc(p, pc) { struct pcb *pcbp; struct switchframe *sf; - extern void proc_trampoline __P((void)); pcbp = &p->p_addr->u_pcb; sf = (struct switchframe *) pcbp->pcb_regs[11];