From 051b06a759f5e8b8e2d66dcffab8362c45157844 Mon Sep 17 00:00:00 2001 From: oki Date: Fri, 10 Oct 1997 21:45:18 +0000 Subject: [PATCH] Add prototypes. --- sys/arch/x68k/dev/sram.c | 8 ++++++-- sys/arch/x68k/include/cpu.h | 17 ++++++++++------- sys/arch/x68k/x68k/autoconf.c | 7 +++++-- sys/arch/x68k/x68k/iodevice.h | 10 +++++++++- sys/arch/x68k/x68k/x68k_init.c | 4 +++- 5 files changed, 33 insertions(+), 13 deletions(-) diff --git a/sys/arch/x68k/dev/sram.c b/sys/arch/x68k/dev/sram.c index 6575eb7e5b40..876de00af72b 100644 --- a/sys/arch/x68k/dev/sram.c +++ b/sys/arch/x68k/dev/sram.c @@ -1,4 +1,4 @@ -/* $NetBSD: sram.c,v 1.4 1996/10/13 03:35:08 christos Exp $ */ +/* $NetBSD: sram.c,v 1.5 1997/10/10 21:45:18 oki Exp $ */ /* * Copyright (c) 1994 Kazuhisa Shimizu. @@ -40,7 +40,6 @@ #include #include #include -#include "sram.h" struct sram_softc sram_softc; @@ -51,6 +50,11 @@ struct sram_softc sram_softc; int sramdebug = SRAM_DEBUG_IOCTL; #endif +void sramattach __P((int)); +int sramopen __P((dev_t, int)); +void sramclose __P((dev_t, int)); +int sramioctl __P((dev_t, u_long, caddr_t, int, struct proc *)); + /* * functions for probeing. */ diff --git a/sys/arch/x68k/include/cpu.h b/sys/arch/x68k/include/cpu.h index 0b884df8149f..359c668c7edd 100644 --- a/sys/arch/x68k/include/cpu.h +++ b/sys/arch/x68k/include/cpu.h @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.5 1997/02/03 22:20:32 oki Exp $ */ +/* $NetBSD: cpu.h,v 1.6 1997/10/10 21:45:20 oki Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -154,17 +154,18 @@ extern unsigned char ssir; extern int machineid; extern char *intiolimit; -/* autoconf.c */ +/* autoconf.c functions */ void configure __P((void)); +void config_console __P((void)); -/* fpu.c */ +/* fpu.c functions */ int fpu_probe __P((void)); -/* machdep.c */ +/* machdep.c functions */ void dumpconf __P((void)); void dumpsys __P((void)); -/* locore.s */ +/* locore.s functions */ struct pcb; struct fpframe; void savectx __P((struct pcb *)); @@ -194,11 +195,13 @@ void ICPL __P((vm_offset_t)); void ICPP __P((vm_offset_t)); #endif -/* sys_machdep.c */ +/* sys_machdep.c functions */ int cachectl __P((int, caddr_t, int)); int dma_cachectl __P((caddr_t, int)); -/* vm_machdep.c */ +/* vm_machdep.c functions */ +void physaccess __P((caddr_t, caddr_t, int, int)); +void physunaccess __P((caddr_t, int)); int kvtop __P((caddr_t)); #endif diff --git a/sys/arch/x68k/x68k/autoconf.c b/sys/arch/x68k/x68k/autoconf.c index f79364ac8f31..a27701385b5a 100644 --- a/sys/arch/x68k/x68k/autoconf.c +++ b/sys/arch/x68k/x68k/autoconf.c @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.10 1997/03/26 22:39:25 gwr Exp $ */ +/* $NetBSD: autoconf.c,v 1.11 1997/10/10 21:45:22 oki Exp $ */ /* * Copyright (c) 1995 Leo Weppelman @@ -38,6 +38,7 @@ #include #include #include +#include void configure __P((void)); static void findroot __P((struct device **, int *)); @@ -45,6 +46,8 @@ void mbattach __P((struct device *, struct device *, void *)); int mbprint __P((void *, const char *)); int mbmatch __P((struct device *, void *, void *)); +static int simple_devprint __P((void *, const char *)); + extern int cold; /* 1 if still booting (locore.s) */ int x68k_realconfig; #include @@ -87,7 +90,7 @@ cpu_rootconf() } /*ARGSUSED*/ -int +static int simple_devprint(auxp, pnp) void *auxp; const char *pnp; diff --git a/sys/arch/x68k/x68k/iodevice.h b/sys/arch/x68k/x68k/iodevice.h index 24df0fa96709..c173ddb1777e 100644 --- a/sys/arch/x68k/x68k/iodevice.h +++ b/sys/arch/x68k/x68k/iodevice.h @@ -1,4 +1,4 @@ -/* $NetBSD: iodevice.h,v 1.2 1997/01/18 21:04:34 oki Exp $ */ +/* $NetBSD: iodevice.h,v 1.3 1997/10/10 21:45:23 oki Exp $ */ /* * Copyright (c) 1993, 1994, 1995 Masaru Oki @@ -367,3 +367,11 @@ volatile struct IODEVICE *IODEVbase; #define PPI (IODEVbase->io_joyport) #define ioctlr (IODEVbase->io_ctlr) #endif + +/* + * devices that need to configure before console use this + * *and know it* (i.e. everything is really tight certain params won't be + * passed in some cases and the devices will deal with it) + */ +int x68k_config_found __P((struct cfdata *, struct device *, + void *, cfprint_t)); diff --git a/sys/arch/x68k/x68k/x68k_init.c b/sys/arch/x68k/x68k/x68k_init.c index d83486447b4f..e5042fa3737d 100644 --- a/sys/arch/x68k/x68k/x68k_init.c +++ b/sys/arch/x68k/x68k/x68k_init.c @@ -1,4 +1,4 @@ -/* $NetBSD: x68k_init.c,v 1.2 1997/02/04 11:45:03 oki Exp $ */ +/* $NetBSD: x68k_init.c,v 1.3 1997/10/10 21:45:24 oki Exp $ */ /* * Copyright (c) 1996 Masaru Oki. @@ -35,6 +35,8 @@ volatile struct IODEVICE *IODEVbase = (volatile struct IODEVICE *) PHYS_IODEV; +void intr_reset __P((void)); + /* * disable all interrupt. */