Fixes to update to that the powerpc port builds again.

These change were necessary due to the following changes:
The change/import of the "generic" isa/pcppi driver. The powerpc
port currently has it's own copy of that driver. The two versions
need to be merged.
The parameter changes to cpu_set_kpc. The powerpc change was not quite correct.

4 files changed, 18 insertions, 16 deletions

diff --git a/sys/arch/powerpc/conf/GENERIC b/sys/arch/powerpc/conf/GENERIC
index 06267ceacb6..25924c3f659 100644
--- a/sys/arch/powerpc/conf/GENERIC
+++ b/sys/arch/powerpc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.9 1998/10/11 20:51:39 rahnds Exp $
+#	$OpenBSD: GENERIC,v 1.10 1999/01/23 19:41:30 rahnds Exp $
 #
 # PPC GENERIC config file
 #
@@ -50,9 +50,9 @@ com1		at isa? port 0x2f8 irq 3
 com2		at isa? port 0x3e8 irq 1	#addresses for VI board com1
 com3		at isa? port 0x2e8 irq 5	#addresses for VI board com0
 
-pcppi0		at isa?			# PC prog. periph. interface
-pckbd0		at pcppi?			# PC keyboard (kbd port)
-pms0		at pcppi?			# PS/2-style mouse (aux port)
+pckbc0		at isa?			# PC prog. periph. interface
+pckbd0		at pckbc?			# PC keyboard (kbd port)
+pms0		at pckbc?			# PS/2-style mouse (aux port)
 
 vga0		at isa?			# ISA VGA
 
diff --git a/sys/arch/powerpc/conf/files.powerpc b/sys/arch/powerpc/conf/files.powerpc
index 2ecab544e20..1cf72012c8c 100644
--- a/sys/arch/powerpc/conf/files.powerpc
+++ b/sys/arch/powerpc/conf/files.powerpc
@@ -84,16 +84,16 @@ define	pcmcia {}			# XXX dummy decl...
 include	"../../../dev/isa/files.isa"
 major	{ wd = 5 }		# Not even in bdevsw XXX
 
-device	pcppi { }
-attach	pcppi at isa
-file	arch/powerpc/isa/pcppi.c	pcppi
+device	pckbc { } 
+attach	pckbc at isa
+file	arch/powerpc/isa/pcppi.c	pckbc
 
 device	pckbd
-attach	pckbd at pcppi
+attach	pckbd at pckbc
 file	arch/powerpc/isa/pckbd.c	pckbd
 
 device	pms
-attach	pms at pcppi
+attach	pms at pckbc
 file	arch/powerpc/isa/pms.c		pms
 
 include "../../../dev/isa/files.isapnp"
diff --git a/sys/arch/powerpc/isa/pcppi.c b/sys/arch/powerpc/isa/pcppi.c
index 66c0a310145..3a69f665b47 100644
--- a/sys/arch/powerpc/isa/pcppi.c
+++ b/sys/arch/powerpc/isa/pcppi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcppi.c,v 1.1 1998/09/27 03:55:58 rahnds Exp $	*/
+/*	$OpenBSD: pcppi.c,v 1.2 1999/01/23 19:41:33 rahnds Exp $	*/
 /*	$NetBSD: pcppi.c,v 1.3 1996/12/05 01:39:31 cgd Exp $	*/
 
 /*
@@ -54,11 +54,13 @@ int	pcppi_match __P((struct device *, struct cfdata *, void *));
 #endif
 void	pcppi_attach __P((struct device *, struct device *, void *));
 
-struct cfattach pcppi_ca = {
+/* ARGH pcppi_ca -> pckbc_ca */
+struct cfattach pckbc_ca = {
 	sizeof(struct pcppi_softc), pcppi_match, pcppi_attach,
 };
 
-struct cfdriver pcppi_cd = {
+/* ARGH pcppi_cd -> pckbc_cd */
+struct cfdriver pckbc_cd = {
 	NULL, "pcppi", DV_DULL,
 };
 
diff --git a/sys/arch/powerpc/powerpc/vm_machdep.c b/sys/arch/powerpc/powerpc/vm_machdep.c
index 8649e0485eb..d43e13da067 100644
--- a/sys/arch/powerpc/powerpc/vm_machdep.c
+++ b/sys/arch/powerpc/powerpc/vm_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: vm_machdep.c,v 1.5 1999/01/10 13:34:19 niklas Exp $	*/
+/*	$OpenBSD: vm_machdep.c,v 1.6 1999/01/23 19:41:33 rahnds Exp $	*/
 /*	$NetBSD: vm_machdep.c,v 1.1 1996/09/30 16:34:57 ws Exp $	*/
 
 /*
@@ -111,9 +111,9 @@ cpu_set_kpc(p, pc, arg)
 	struct switchframe *sf = (struct switchframe *)p->p_addr->u_pcb.pcb_sp;
 	struct callframe *cf = (struct callframe *)sf->sp;
 	
-	cf->r30 = (int)arg;
-	cf->r31 = (int)pc;
-	cf++->lr = pc;
+	cf->r30 = (register_t)arg;
+	cf->r31 = (register_t)pc;
+	cf++->lr = (register_t)pc;
 }
 
 void