Make ppbus compile under egcs. I'm not sure about this casting-to-union-

-containing-the-type stuff, but gcc seemed to do it implicitly..

3 files changed, 14 insertions, 9 deletions

diff --git a/sys/dev/ppbus/immio.c b/sys/dev/ppbus/immio.c
index c02202924b02..50b9c06a707e 100644
--- a/sys/dev/ppbus/immio.c
+++ b/sys/dev/ppbus/immio.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: immio.c,v 1.5 1999/01/10 12:04:54 nsouch Exp $
+ *	$Id: immio.c,v 1.6 1999/01/30 15:35:39 nsouch Exp $
  *
  */
 
@@ -411,7 +411,8 @@ imm_outstr(struct vpoio_data *vpo, char *buffer, int size)
 	if (PPB_IN_EPP_MODE(&vpo->vpo_dev))
 		ppb_reset_epp_timeout(&vpo->vpo_dev);
 
-	ppb_MS_exec(&vpo->vpo_dev, MS_OP_PUT, buffer, size, MS_UNKNOWN, &error);
+	ppb_MS_exec(&vpo->vpo_dev, MS_OP_PUT, (union ppb_insarg)buffer,
+		(union ppb_insarg)size, (union ppb_insarg)MS_UNKNOWN, &error);
 
 	return (error);
 }
@@ -427,7 +428,8 @@ imm_instr(struct vpoio_data *vpo, char *buffer, int size)
 	if (PPB_IN_EPP_MODE(&vpo->vpo_dev))
 		ppb_reset_epp_timeout(&vpo->vpo_dev);
 
-	ppb_MS_exec(&vpo->vpo_dev, MS_OP_GET, buffer, size, MS_UNKNOWN, &error);
+	ppb_MS_exec(&vpo->vpo_dev, MS_OP_GET, (union ppb_insarg)buffer,
+		(union ppb_insarg)size, (union ppb_insarg)MS_UNKNOWN, &error);
 
 	return (error);
 }
diff --git a/sys/dev/ppbus/ppbconf.h b/sys/dev/ppbus/ppbconf.h
index af08c5df72a4..ebed36f9489f 100644
--- a/sys/dev/ppbus/ppbconf.h
+++ b/sys/dev/ppbus/ppbconf.h
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: ppbconf.h,v 1.12 1999/01/27 19:44:05 dillon Exp $
+ *	$Id: ppbconf.h,v 1.13 1999/01/30 15:35:39 nsouch Exp $
  *
  */
 #ifndef __PPBCONF_H
@@ -125,6 +125,7 @@ struct ppb_status {
 union ppb_insarg {
 	int	i;
 	void	*p;
+	char	*c;
 	int	(* f)(void *, char *);
 };
 
diff --git a/sys/dev/ppbus/vpoio.c b/sys/dev/ppbus/vpoio.c
index 17c25dd03469..4b9ff52fba31 100644
--- a/sys/dev/ppbus/vpoio.c
+++ b/sys/dev/ppbus/vpoio.c
@@ -23,7 +23,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: vpoio.c,v 1.5 1999/01/10 12:04:55 nsouch Exp $
+ *	$Id: vpoio.c,v 1.6 1999/01/30 15:35:39 nsouch Exp $
  *
  */
 
@@ -98,9 +98,9 @@
 #define INIT_TRIG_MICROSEQ {						\
 	int i;								\
 	for (i=1; i <= 7; i+=2) {					\
-		disconnect_microseq[i].arg[2] = (void *)d_pulse;	\
+		disconnect_microseq[i].arg[2] = (union ppb_insarg)d_pulse; \
 		connect_epp_microseq[i].arg[2] = 			\
-		connect_spp_microseq[i].arg[2] = (void *)c_pulse;	\
+		connect_spp_microseq[i].arg[2] = (union ppb_insarg)c_pulse; \
 	}								\
 }
 
@@ -419,7 +419,8 @@ vpoio_outstr(struct vpoio_data *vpo, char *buffer, int size)
 
 	int error = 0;
 
-	ppb_MS_exec(&vpo->vpo_dev, MS_OP_PUT, buffer, size, MS_UNKNOWN, &error);
+	ppb_MS_exec(&vpo->vpo_dev, MS_OP_PUT, (union ppb_insarg)buffer,
+		(union ppb_insarg)size, (union ppb_insarg)MS_UNKNOWN, &error);
 
 #if 0
 		/* XXX EPP 1.9 not implemented with microsequences */
@@ -458,7 +459,8 @@ vpoio_instr(struct vpoio_data *vpo, char *buffer, int size)
 {
 	int error = 0;
 
-	ppb_MS_exec(&vpo->vpo_dev, MS_OP_GET, buffer, size, MS_UNKNOWN, &error);
+	ppb_MS_exec(&vpo->vpo_dev, MS_OP_GET, (union ppb_insarg)buffer,
+		(union ppb_insarg)size, (union ppb_insarg)MS_UNKNOWN, &error);
 
 #if 0
 		/* XXX EPP 1.9 not implemented with microsequences */