use those new pdc call types

5 files changed, 20 insertions, 18 deletions

diff --git a/sys/arch/hppa/stand/libsa/cache_c.c b/sys/arch/hppa/stand/libsa/cache_c.c
index 8867755af21..d8f90394496 100644
--- a/sys/arch/hppa/stand/libsa/cache_c.c
+++ b/sys/arch/hppa/stand/libsa/cache_c.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cache_c.c,v 1.1 1998/06/23 18:46:41 mickey Exp $	*/
+/*	$OpenBSD: cache_c.c,v 1.2 1998/07/08 21:34:31 mickey Exp $	*/
 /*	$NOWHERE: cache_c.c,v 2.1 1998/06/22 19:34:46 mickey Exp $	*/
 
 /*
@@ -42,8 +42,11 @@
 /*
  * HISTORY
  * $Log: cache_c.c,v $
- * Revision 1.1  1998/06/23 18:46:41  mickey
- * Initial revision
+ * Revision 1.2  1998/07/08 21:34:31  mickey
+ * use those new pdc call types
+ *
+ * Revision 1.1.1.1  1998/06/23 18:46:41  mickey
+ * ok, it boots, include and libkern to come
  *
  * Revision 2.1  1998/06/22 19:34:46  mickey
  * add cache manipulating routines
@@ -96,7 +99,6 @@ fall(c_base, c_count, c_loop, c_stride, rot)
  * Returns:
  *              Hopefully.
  */
-extern int (*pdc)();
 struct pdc_cache pdc_cacheinfo __attribute__ ((aligned(8)));
 
 void 
diff --git a/sys/arch/hppa/stand/libsa/ct.c b/sys/arch/hppa/stand/libsa/ct.c
index f5b3421b92e..21751ec8943 100644
--- a/sys/arch/hppa/stand/libsa/ct.c
+++ b/sys/arch/hppa/stand/libsa/ct.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ct.c,v 1.1 1998/06/23 18:46:42 mickey Exp $	*/
+/*	$OpenBSD: ct.c,v 1.2 1998/07/08 21:34:33 mickey Exp $	*/
 /*	$NOWHERE: ct.c,v 2.2 1998/06/22 18:41:34 mickey Exp $	*/
 
 /*
@@ -64,7 +64,7 @@
 
 #include "dev_hppa.h"
 
-int (*ctiodc)();	/* cartridge tape IODC entry point */
+iodcio_t ctiodc;	/* cartridge tape IODC entry point */
 int ctcode[IODC_MAXSIZE/sizeof(int)];
 
 /* hp800-specific comments:
@@ -101,7 +101,7 @@ ctopen(f)
 			printf("ct: device ENTRY_IO Read ret'd %d\n", ret);
 			return (EIO);
 		} else
-			ctdev.pz_iodc_io = ctiodc = (int (*)()) ctcode;
+			ctdev.pz_iodc_io = ctiodc = (iodcio_t) ctcode;
 	}
 
 	if (ctiodc != NULL)
diff --git a/sys/arch/hppa/stand/libsa/dk.c b/sys/arch/hppa/stand/libsa/dk.c
index c2bc29be6a3..86c48e4066e 100644
--- a/sys/arch/hppa/stand/libsa/dk.c
+++ b/sys/arch/hppa/stand/libsa/dk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dk.c,v 1.1 1998/06/23 18:46:42 mickey Exp $	*/
+/*	$OpenBSD: dk.c,v 1.2 1998/07/08 21:34:34 mickey Exp $	*/
 
 /*
  * Copyright 1996 1995 by Open Software Foundation, Inc.   
@@ -33,7 +33,7 @@
 
 #include "dev_hppa.h"
 
-int (*btiodc)();	/* boot IODC entry point */
+iodcio_t btiodc;	/* boot IODC entry point */
 
 char btbuf[BTIOSIZ] __attribute ((aligned (MINIOSIZ)));
 int HP800;	
@@ -44,7 +44,7 @@ btinit()
 	int err;
 	static int firstime = 1;
 
-	btiodc = (int (*)()) ((unsigned int)PAGE0->mem_free + IODC_MAXSIZE);
+	btiodc = (iodcio_t)(PAGE0->mem_free + IODC_MAXSIZE);
 
 	if (firstime) {
 		/*
diff --git a/sys/arch/hppa/stand/libsa/itecons.c b/sys/arch/hppa/stand/libsa/itecons.c
index 533189d93c2..a361e3b9c0e 100644
--- a/sys/arch/hppa/stand/libsa/itecons.c
+++ b/sys/arch/hppa/stand/libsa/itecons.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: itecons.c,v 1.1 1998/06/23 18:46:42 mickey Exp $	*/
+/*	$OpenBSD: itecons.c,v 1.2 1998/07/08 21:34:35 mickey Exp $	*/
 
 /*
  * Copyright (c) 1998 Michael Shalayeff
@@ -63,8 +63,8 @@
 
 #include "dev_hppa.h"
 
-int (*cniodc)();	/* console IODC entry point */
-int (*kyiodc)();	/* keyboard IODC entry point */
+iodcio_t cniodc;	/* console IODC entry point */
+iodcio_t kyiodc;	/* keyboard IODC entry point */
 
 /*
  * Console.
@@ -85,7 +85,7 @@ void
 ite_probe(cn)
 	struct consdev *cn;
 {
-	cniodc = (int (*)()) PAGE0->mem_free;
+	cniodc = (iodcio_t)PAGE0->mem_free;
 
 	if ((*pdc)   (PDC_IODC, PDC_IODC_READ, pdcbuf, CN_HPA, IODC_INIT,
 		      cniodc, IODC_MAXSIZE) < 0 ||
@@ -114,7 +114,7 @@ ite_init(cn)
 	 */
 	if (CN_CLASS != PCL_DUPLEX || KY_CLASS == PCL_KEYBD) {
 
-		kyiodc = (int (*)()) kycode;
+		kyiodc = (iodcio_t)kycode;
 
 		if ((*pdc)   (PDC_IODC, PDC_IODC_READ, pdcbuf, KY_HPA,
 			      IODC_INIT, kyiodc, IODC_MAXSIZE) < 0 ||
diff --git a/sys/arch/hppa/stand/libsa/pdc.c b/sys/arch/hppa/stand/libsa/pdc.c
index 686dc1492a9..8d910ed5001 100644
--- a/sys/arch/hppa/stand/libsa/pdc.c
+++ b/sys/arch/hppa/stand/libsa/pdc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pdc.c,v 1.1 1998/06/23 18:46:42 mickey Exp $	*/
+/*	$OpenBSD: pdc.c,v 1.2 1998/07/08 21:34:37 mickey Exp $	*/
 
 /*
  * Copyright 1996 1995 by Open Software Foundation, Inc.   
@@ -52,7 +52,7 @@
  * Interface routines to initialize and access the PDC.
  */
 
-int (*pdc)();
+pdcio_t pdc;
 int	pdcbuf[64] __attribute ((aligned(8)));		/* PDC return buffer */
 struct	stable_storage sstor;	/* contents of Stable Storage */
 int	sstorsiz;		/* size of Stable Storage */
@@ -74,7 +74,7 @@ pdc_init()
 	/*
 	 * Initialize important global variables (defined above).
 	 */
-	pdc = PAGE0->mem_pdc;
+	pdc = (pdcio_t)PAGE0->mem_pdc;
 
 	err = (*pdc)(PDC_STABLE, PDC_STABLE_SIZE, pdcbuf, 0, 0);
 	if (err >= 0) {