Disable cross for UVM until I figure out what the #$%&! is happening in here.

2 files changed, 43 insertions, 2 deletions

diff --git a/sys/arch/amiga/isa/cross.c b/sys/arch/amiga/isa/cross.c
index bcac336bf32..f37ad19a239 100644
--- a/sys/arch/amiga/isa/cross.c
+++ b/sys/arch/amiga/isa/cross.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cross.c,v 1.13 1999/01/19 10:04:54 niklas Exp $	*/
+/*	$OpenBSD: cross.c,v 1.14 2000/05/28 03:28:42 art Exp $	*/
 
 /*
  * Copyright (c) 1994, 1996 Niklas Hallqvist, Carsten Hammer
@@ -54,6 +54,44 @@
 #include <amiga/isa/crossreg.h>
 #include <amiga/isa/crossvar.h>
 
+#if defined(UVM)
+void	crossattach __P((struct device *, struct device *, void *));
+int	crossmatch __P((struct device *, void *, void *));
+
+struct cfattach cross_ca = {
+	sizeof(struct cross_softc), crossmatch, crossattach
+};
+
+struct cfdriver cross_cd = {
+	NULL, "cross", DV_DULL, 0
+};
+
+void
+crossattach(a, b, c)
+	struct device *a;
+	struct device *b;
+	void *c;
+{
+	panic("crossattach && UVM");
+}
+
+int
+crossmatch(parent, match, aux)
+	struct device *parent;
+	void *match, *aux;
+{
+	struct zbus_args *zap = aux;
+
+	/*
+	 * Check manufacturer and product id.
+	 */
+	if (zap->manid == 2011 && zap->prodid == 3)
+		printf("cross not supported with uvm yet.");
+	return(0);
+}
+
+#else
+
 extern int cold;
 
 int crossdebug = 0;
@@ -469,3 +507,4 @@ cross_intr_check(ic, irq, type)
 
 	return (__isa_intr_check(irq, type, sc->sc_intrsharetype));
 }
+#endif /* UVM */
diff --git a/sys/arch/amiga/isa/crossvar.h b/sys/arch/amiga/isa/crossvar.h
index 93176806ef2..92b4885cabf 100644
--- a/sys/arch/amiga/isa/crossvar.h
+++ b/sys/arch/amiga/isa/crossvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: crossvar.h,v 1.5 1997/01/05 02:04:33 niklas Exp $	*/
+/*	$OpenBSD: crossvar.h,v 1.6 2000/05/28 03:28:42 art Exp $	*/
 
 /*
  * Copyright (c) 1994, 1996 Niklas Hallqvist
@@ -61,7 +61,9 @@ struct cross_softc {
 	u_int16_t sc_imask;
 	volatile u_int16_t *sc_status;
 	struct vm_page sc_page[CROSS_BANK_SIZE / NBPG];
+#ifndef UVM
 	struct pager_struct sc_pager;
+#endif
 
 	struct amiga_bus_space sc_iot;
 	struct amiga_bus_space sc_memt;