Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/pmax Include <pmax/pmax/machdep.h> instead of decla...
details: https://anonhg.NetBSD.org/src/rev/aa810cb3d789
branches: trunk
changeset: 473591:aa810cb3d789
user: simonb <simonb%NetBSD.org@localhost>
date: Tue Jun 08 23:42:36 1999 +0000
description:
Include <pmax/pmax/machdep.h> instead of declaring our own prom_*()
prototypes.
diffstat:
sys/arch/pmax/dev/findcons.c | 6 +++---
sys/arch/pmax/pmax/dec_3maxplus.c | 6 +++---
sys/arch/pmax/pmax/dec_3min.c | 6 +++---
sys/arch/pmax/pmax/dec_5100.c | 4 ++--
sys/arch/pmax/pmax/dec_maxine.c | 6 +++---
sys/arch/pmax/pmax/machdep.c | 7 +++----
6 files changed, 17 insertions(+), 18 deletions(-)
diffs (196 lines):
diff -r 8b642c17813e -r aa810cb3d789 sys/arch/pmax/dev/findcons.c
--- a/sys/arch/pmax/dev/findcons.c Tue Jun 08 23:41:59 1999 +0000
+++ b/sys/arch/pmax/dev/findcons.c Tue Jun 08 23:42:36 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: findcons.c,v 1.12 1999/05/11 05:15:54 nisimura Exp $ */
+/* $NetBSD: findcons.c,v 1.13 1999/06/08 23:42:36 simonb Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone
@@ -34,7 +34,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: findcons.c,v 1.12 1999/05/11 05:15:54 nisimura Exp $$");
+__KERNEL_RCSID(0, "$NetBSD: findcons.c,v 1.13 1999/06/08 23:42:36 simonb Exp $$");
#include <sys/param.h>
#include <sys/systm.h>
@@ -43,6 +43,7 @@
#include <sys/termios.h>
#include <pmax/pmax/pmaxtype.h>
+#include <pmax/pmax/machdep.h>
/*
* Default consdev, for errors or warnings before
@@ -153,7 +154,6 @@
int find_serial __P((int prom_slot));
void consinit __P((void));
-extern void prom_findcons __P((int *, int *, int *));
extern struct consdev promcd;
/*
diff -r 8b642c17813e -r aa810cb3d789 sys/arch/pmax/pmax/dec_3maxplus.c
--- a/sys/arch/pmax/pmax/dec_3maxplus.c Tue Jun 08 23:41:59 1999 +0000
+++ b/sys/arch/pmax/pmax/dec_3maxplus.c Tue Jun 08 23:42:36 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_3maxplus.c,v 1.22 1999/05/29 09:31:02 nisimura Exp $ */
+/* $NetBSD: dec_3maxplus.c,v 1.23 1999/06/08 23:42:36 simonb Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -73,7 +73,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_3maxplus.c,v 1.22 1999/05/29 09:31:02 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_3maxplus.c,v 1.23 1999/06/08 23:42:36 simonb Exp $");
#include <sys/types.h>
#include <sys/systm.h>
@@ -97,6 +97,7 @@
#include <pmax/pmax/clockreg.h>
#include <pmax/pmax/turbochannel.h>
#include <pmax/pmax/pmaxtype.h>
+#include <pmax/pmax/machdep.h>
#include <pmax/pmax/kn03.h>
#include <pmax/pmax/memc.h>
@@ -126,7 +127,6 @@
void kn03_wbflush __P((void));
unsigned kn03_clkread __P((void));
extern unsigned (*clkread) __P((void));
-extern void prom_haltbutton __P((void));
extern volatile struct chiptime *mcclock_addr; /* XXX */
extern char cpu_model[];
diff -r 8b642c17813e -r aa810cb3d789 sys/arch/pmax/pmax/dec_3min.c
--- a/sys/arch/pmax/pmax/dec_3min.c Tue Jun 08 23:41:59 1999 +0000
+++ b/sys/arch/pmax/pmax/dec_3min.c Tue Jun 08 23:42:36 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_3min.c,v 1.19 1999/05/27 06:43:50 nisimura Exp $ */
+/* $NetBSD: dec_3min.c,v 1.20 1999/06/08 23:42:36 simonb Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -73,7 +73,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_3min.c,v 1.19 1999/05/27 06:43:50 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_3min.c,v 1.20 1999/06/08 23:42:36 simonb Exp $");
#include <sys/types.h>
@@ -98,6 +98,7 @@
#include <pmax/pmax/clockreg.h>
#include <pmax/pmax/turbochannel.h>
#include <pmax/pmax/pmaxtype.h>
+#include <pmax/pmax/machdep.h>
#include <pmax/pmax/kmin.h> /* 3min baseboard addresses */
#include <pmax/pmax/memc.h> /* 3min/maxine memory errors */
@@ -129,7 +130,6 @@
void kn02ba_wbflush __P((void));
unsigned kn02ba_clkread __P((void));
extern unsigned (*clkread) __P((void));
-extern void prom_haltbutton __P((void));
extern volatile struct chiptime *mcclock_addr; /* XXX */
extern char cpu_model[];
diff -r 8b642c17813e -r aa810cb3d789 sys/arch/pmax/pmax/dec_5100.c
--- a/sys/arch/pmax/pmax/dec_5100.c Tue Jun 08 23:41:59 1999 +0000
+++ b/sys/arch/pmax/pmax/dec_5100.c Tue Jun 08 23:42:36 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_5100.c,v 1.8 1999/05/26 04:23:59 nisimura Exp $ */
+/* $NetBSD: dec_5100.c,v 1.9 1999/06/08 23:42:36 simonb Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -56,6 +56,7 @@
#include <pmax/pmax/clockreg.h>
#include <pmax/pmax/turbochannel.h>
#include <pmax/pmax/pmaxtype.h>
+#include <pmax/pmax/machdep.h>
#include <pmax/pmax/kn01.h> /* common definitions */
#include <pmax/pmax/kn230.h>
@@ -86,7 +87,6 @@
extern unsigned nullclkread __P((void));
extern unsigned (*clkread) __P((void));
-extern void prom_haltbutton __P((void));
extern volatile struct chiptime *mcclock_addr; /* XXX */
extern char cpu_model[];
diff -r 8b642c17813e -r aa810cb3d789 sys/arch/pmax/pmax/dec_maxine.c
--- a/sys/arch/pmax/pmax/dec_maxine.c Tue Jun 08 23:41:59 1999 +0000
+++ b/sys/arch/pmax/pmax/dec_maxine.c Tue Jun 08 23:42:36 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_maxine.c,v 1.14 1999/05/26 04:23:59 nisimura Exp $ */
+/* $NetBSD: dec_maxine.c,v 1.15 1999/06/08 23:42:36 simonb Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -73,7 +73,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: dec_maxine.c,v 1.14 1999/05/26 04:23:59 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_maxine.c,v 1.15 1999/06/08 23:42:36 simonb Exp $");
#include <sys/types.h>
#include <sys/systm.h>
@@ -97,6 +97,7 @@
#include <pmax/pmax/clockreg.h>
#include <pmax/pmax/turbochannel.h>
#include <pmax/pmax/pmaxtype.h>
+#include <pmax/pmax/machdep.h>
#include <pmax/pmax/maxine.h> /* baseboard addresses (constants) */
#include <pmax/pmax/memc.h> /* 3min/maxine memory errors */
@@ -126,7 +127,6 @@
void kn02ca_wbflush __P((void));
unsigned kn02ca_clkread __P((void));
extern unsigned (*clkread) __P((void));
-extern void prom_haltbutton __P((void));
extern volatile struct chiptime *mcclock_addr; /* XXX */
extern char cpu_model[];
diff -r 8b642c17813e -r aa810cb3d789 sys/arch/pmax/pmax/machdep.c
--- a/sys/arch/pmax/pmax/machdep.c Tue Jun 08 23:41:59 1999 +0000
+++ b/sys/arch/pmax/pmax/machdep.c Tue Jun 08 23:42:36 1999 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.146 1999/05/26 19:16:34 thorpej Exp $ */
+/* $NetBSD: machdep.c,v 1.147 1999/06/08 23:42:37 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: machdep.c,v 1.146 1999/05/26 19:16:34 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.147 1999/06/08 23:42:37 simonb Exp $");
/* from: Utah Hdr: machdep.c 1.63 91/04/24 */
@@ -90,6 +90,7 @@
#include <machine/locore.h>
#include <pmax/pmax/pmaxtype.h>
#include <pmax/pmax/clockreg.h>
+#include <pmax/pmax/machdep.h>
#ifdef DDB
#include <sys/exec_aout.h> /* XXX backwards compatilbity for DDB */
@@ -133,8 +134,6 @@
unsigned (*clkread) __P((void)); /* high resolution timer if available */
unsigned nullclkread __P((void));
-void prom_halt __P((int, char *)) __attribute__((__noreturn__));
-int prom_systype __P((void));
int initcpu __P((void));
/* XXX XXX XXX */
Home |
Main Index |
Thread Index |
Old Index