Module Name: src
Committed By: phx
Date: Tue Feb 2 19:03:31 UTC 2010
Modified Files:
src/sys/arch/amiga/dev: com_supio.c gvpio.c hyper.c ioblix_zbus.c
zbusvar.h
Log Message:
Fix compilation warnings and errors with amigappc.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/amiga/dev/com_supio.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/amiga/dev/gvpio.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/amiga/dev/hyper.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/amiga/dev/ioblix_zbus.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/amiga/dev/zbusvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amiga/dev/com_supio.c
diff -u src/sys/arch/amiga/dev/com_supio.c:1.27 src/sys/arch/amiga/dev/com_supio.c:1.28
--- src/sys/arch/amiga/dev/com_supio.c:1.27 Mon Nov 23 00:11:43 2009
+++ src/sys/arch/amiga/dev/com_supio.c Tue Feb 2 19:03:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: com_supio.c,v 1.27 2009/11/23 00:11:43 rmind Exp $ */
+/* $NetBSD: com_supio.c,v 1.28 2010/02/02 19:03:31 phx Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_supio.c,v 1.27 2009/11/23 00:11:43 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_supio.c,v 1.28 2010/02/02 19:03:31 phx Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -118,7 +118,9 @@
bus_space_tag_t iot;
bus_space_handle_t ioh;
struct supio_attach_args *supa = aux;
+#ifdef __m68k__
u_int16_t needpsl;
+#endif
csc->sc_dev = self;
@@ -137,6 +139,7 @@
com_attach_subr(csc);
+#ifdef __m68k__
/* XXX this should be really in the interrupt stuff */
needpsl = PSL_S | (supa->supio_ipl << 8);
@@ -145,6 +148,7 @@
"from 0x%x to 0x%x\n", ipl2spl_table[IPL_SERIAL], needpsl);
ipl2spl_table[IPL_SERIAL] = needpsl;
}
+#endif
sc->sc_isr.isr_intr = comintr;
sc->sc_isr.isr_arg = csc;
sc->sc_isr.isr_ipl = supa->supio_ipl;
Index: src/sys/arch/amiga/dev/gvpio.c
diff -u src/sys/arch/amiga/dev/gvpio.c:1.17 src/sys/arch/amiga/dev/gvpio.c:1.18
--- src/sys/arch/amiga/dev/gvpio.c:1.17 Mon Nov 9 15:35:27 2009
+++ src/sys/arch/amiga/dev/gvpio.c Tue Feb 2 19:03:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: gvpio.c,v 1.17 2009/11/09 15:35:27 is Exp $ */
+/* $NetBSD: gvpio.c,v 1.18 2010/02/02 19:03:31 phx Exp $ */
/*
* Copyright (c) 1997 Ignatios Souvatzis
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gvpio.c,v 1.17 2009/11/09 15:35:27 is Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gvpio.c,v 1.18 2010/02/02 19:03:31 phx Exp $");
/*
* GVP I/O Extender
@@ -102,7 +102,9 @@
struct gvpbus_args *gap;
struct supio_attach_args supa;
volatile void *gbase;
+#ifdef __m68k__
u_int16_t needpsl;
+#endif
giosc = (struct gvpio_softc *)self;
gap = auxp;
@@ -134,6 +136,7 @@
++giosd;
}
if (giosc->sc_comhdls.lh_first) {
+#ifdef __m68k__
/* XXX this should be really in the interrupt stuff */
needpsl = PSL_S|PSL_IPL6;
if (ipl2spl_table[IPL_SERIAL] < needpsl) {
@@ -143,6 +146,7 @@
needpsl);
ipl2spl_table[IPL_SERIAL] = needpsl;
}
+#endif
giosc->sc_comisr.isr_intr = gvp_com_intr;
giosc->sc_comisr.isr_arg = giosc;
giosc->sc_comisr.isr_ipl = 6;
Index: src/sys/arch/amiga/dev/hyper.c
diff -u src/sys/arch/amiga/dev/hyper.c:1.19 src/sys/arch/amiga/dev/hyper.c:1.20
--- src/sys/arch/amiga/dev/hyper.c:1.19 Mon Apr 28 20:23:12 2008
+++ src/sys/arch/amiga/dev/hyper.c Tue Feb 2 19:03:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: hyper.c,v 1.19 2008/04/28 20:23:12 martin Exp $ */
+/* $NetBSD: hyper.c,v 1.20 2010/02/02 19:03:31 phx Exp $ */
/*-
* Copyright (c) 1997,1998 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hyper.c,v 1.19 2008/04/28 20:23:12 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hyper.c,v 1.20 2010/02/02 19:03:31 phx Exp $");
/*
* zbus HyperCom driver
@@ -38,8 +38,8 @@
#include <sys/types.h>
-#include <sys/conf.h>
#include <sys/device.h>
+#include <sys/conf.h>
#include <sys/systm.h>
#include <sys/param.h>
Index: src/sys/arch/amiga/dev/ioblix_zbus.c
diff -u src/sys/arch/amiga/dev/ioblix_zbus.c:1.14 src/sys/arch/amiga/dev/ioblix_zbus.c:1.15
--- src/sys/arch/amiga/dev/ioblix_zbus.c:1.14 Mon Apr 28 20:23:12 2008
+++ src/sys/arch/amiga/dev/ioblix_zbus.c Tue Feb 2 19:03:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: ioblix_zbus.c,v 1.14 2008/04/28 20:23:12 martin Exp $ */
+/* $NetBSD: ioblix_zbus.c,v 1.15 2010/02/02 19:03:31 phx Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,15 +30,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ioblix_zbus.c,v 1.14 2008/04/28 20:23:12 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ioblix_zbus.c,v 1.15 2010/02/02 19:03:31 phx Exp $");
/* IOBlix Zorro driver */
/* XXX to be done: we need to probe the com clock speed! */
#include <sys/types.h>
-#include <sys/conf.h>
#include <sys/device.h>
+#include <sys/conf.h>
#include <sys/systm.h>
#include <sys/param.h>
Index: src/sys/arch/amiga/dev/zbusvar.h
diff -u src/sys/arch/amiga/dev/zbusvar.h:1.7 src/sys/arch/amiga/dev/zbusvar.h:1.8
--- src/sys/arch/amiga/dev/zbusvar.h:1.7 Sun Mar 4 05:59:30 2007
+++ src/sys/arch/amiga/dev/zbusvar.h Tue Feb 2 19:03:31 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: zbusvar.h,v 1.7 2007/03/04 05:59:30 christos Exp $ */
+/* $NetBSD: zbusvar.h,v 1.8 2010/02/02 19:03:31 phx Exp $ */
/*
* Copyright (c) 1994 Christian E. Hopps
@@ -60,8 +60,8 @@
((volatile void *)((u_int)ZTWOROMADDR - ZTWOROMBASE + (u_int)(pa)))
#define ztwopa(va) ((void *)(ZTWOROMBASE + (u_int)(va) - (u_int)ZTWOROMADDR))
#else
-#define ztwomap(pa) (volatile void *)(pa)
-#define ztwopa(va) (void *)(va)
+#define ztwomap(pa) ((volatile void *)(u_int)(pa))
+#define ztwopa(va) ((void *)(u_int)(va))
#endif
/*
