diff options
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/powerpc/mac/openpic.c | 13 | ||||
| -rw-r--r-- | sys/arch/powerpc/powerpc/conf.c | 4 | ||||
| -rw-r--r-- | sys/arch/powerpc/powerpc/cpu.c | 20 | ||||
| -rw-r--r-- | sys/arch/powerpc/powerpc/mainbus.c | 5 |
4 files changed, 18 insertions, 24 deletions
diff --git a/sys/arch/powerpc/mac/openpic.c b/sys/arch/powerpc/mac/openpic.c index 9e0a7d5a586..1c6c197dc52 100644 --- a/sys/arch/powerpc/mac/openpic.c +++ b/sys/arch/powerpc/mac/openpic.c @@ -1,4 +1,4 @@ -/* $OpenBSD: openpic.c,v 1.16 2001/07/09 03:30:20 mickey Exp $ */ +/* $OpenBSD: openpic.c,v 1.17 2001/07/09 04:41:28 mickey Exp $ */ /*- * Copyright (c) 1995 Per Fogelstrom @@ -199,17 +199,6 @@ openpic_collect_preconf_intr() } int -prog_switch (void *arg) -{ -#ifdef DDB - Debugger(); -#else - printf("programmer button pressed, debugger not available\n"); -#endif - return 1; -} - -static int fakeintr(arg) void *arg; { diff --git a/sys/arch/powerpc/powerpc/conf.c b/sys/arch/powerpc/powerpc/conf.c index fe78f96c084..1cd87307d02 100644 --- a/sys/arch/powerpc/powerpc/conf.c +++ b/sys/arch/powerpc/powerpc/conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: conf.c,v 1.24 2001/07/05 02:40:44 mickey Exp $ */ +/* $OpenBSD: conf.c,v 1.25 2001/07/09 04:41:28 mickey Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom @@ -374,7 +374,7 @@ blktochr(dev) } #include <dev/cons.h> -#include <vgafb_pci.h> +#include "vgafb_pci.h" cons_decl(ws); cons_decl(com); diff --git a/sys/arch/powerpc/powerpc/cpu.c b/sys/arch/powerpc/powerpc/cpu.c index 3b1a9ab31bd..fa908134ec7 100644 --- a/sys/arch/powerpc/powerpc/cpu.c +++ b/sys/arch/powerpc/powerpc/cpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.c,v 1.11 2001/06/18 21:36:06 drahn Exp $ */ +/* $OpenBSD: cpu.c,v 1.12 2001/07/09 04:41:28 mickey Exp $ */ /* * Copyright (c) 1997 Per Fogelstrom @@ -39,6 +39,8 @@ #include <sys/user.h> #include <sys/device.h> +#include <dev/ofw/openfirm.h> + #include <machine/autoconf.h> #define MPC601 1 @@ -62,17 +64,20 @@ char cpu_model[80]; char machine[] = "powerpc"; /* cpu architecture */ /* Definition of the driver for autoconfig. */ -static int cpumatch(struct device *, void *, void *); -static void cpuattach(struct device *, struct device *, void *); +int cpumatch(struct device *, void *, void *); +void cpuattach(struct device *, struct device *, void *); struct cfattach cpu_ca = { sizeof(struct device), cpumatch, cpuattach }; + struct cfdriver cpu_cd = { NULL, "cpu", DV_DULL, NULL, 0 }; -static int +void config_l2cr __P((void)); + +int cpumatch(parent, cfdata, aux) struct device *parent; void *cfdata; @@ -86,9 +91,8 @@ cpumatch(parent, cfdata, aux) return (1); } -void config_l2cr(); -static void +void cpuattach(parent, dev, aux) struct device *parent; struct device *dev; @@ -149,10 +153,10 @@ cpuattach(parent, dev, aux) { break; } - if (phandle = OF_child(qhandle)) + if ((phandle = OF_child(qhandle))) continue; while (qhandle) { - if (phandle = OF_peer(qhandle)) + if ((phandle = OF_peer(qhandle))) break; qhandle = OF_parent(qhandle); } diff --git a/sys/arch/powerpc/powerpc/mainbus.c b/sys/arch/powerpc/powerpc/mainbus.c index 2a5e1a16ea6..2158932f81e 100644 --- a/sys/arch/powerpc/powerpc/mainbus.c +++ b/sys/arch/powerpc/powerpc/mainbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mainbus.c,v 1.7 2001/06/25 23:30:04 drahn Exp $ */ +/* $OpenBSD: mainbus.c,v 1.8 2001/07/09 04:41:28 mickey Exp $ */ /* * Copyright (c) 1994, 1995 Carnegie-Mellon University. @@ -33,6 +33,7 @@ #include <sys/reboot.h> #include <machine/autoconf.h> +#include <dev/ofw/openfirm.h> struct mainbus_softc { struct device sc_dv; @@ -117,7 +118,7 @@ mbattach(parent, self, aux) if (system_type == APPL) { char name[32]; int node; - for (node = OF_child(OF_peer(0)); node; node= OF_peer(node)) { + for (node = OF_child(OF_peer(0)); node; node=OF_peer(node)) { bzero (name, sizeof(name)); if (OF_getprop(node, "device_type", name, sizeof(name)) <= 0) { |