Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/arch/macppc/dev/mediabay.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/arch/macppc/dev/mediabay.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.13
retrieving revision 1.13.10.1
diff -u -p -r1.13 -r1.13.10.1
--- src/sys/arch/macppc/dev/mediabay.c	2007/07/09 20:52:22	1.13
+++ src/sys/arch/macppc/dev/mediabay.c	2007/11/06 23:18:37	1.13.10.1
@@ -1,4 +1,4 @@
-/*	$NetBSD: mediabay.c,v 1.13 2007/07/09 20:52:22 ad Exp $	*/
+/*	$NetBSD: mediabay.c,v 1.13.10.1 2007/11/06 23:18:37 matt Exp $	*/
 
 /*-
  * Copyright (C) 1999 Tsubai Masanari.  All rights reserved.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mediabay.c,v 1.13 2007/07/09 20:52:22 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mediabay.c,v 1.13.10.1 2007/11/06 23:18:37 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -44,6 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: mediabay.c,v
 
 struct mediabay_softc {
 	struct device sc_dev;
+	bus_space_tag_t sc_tag;
 	int sc_node;
 	u_int *sc_addr;
 	u_int *sc_fcr;
@@ -111,11 +112,12 @@ mediabay_attach(parent, self, aux)
 	sc->sc_fcr = sc->sc_addr + 1;
 	sc->sc_node = ca->ca_node;
 	sc->sc_baseaddr = ca->ca_baseaddr;
+	sc->sc_tag = ca->ca_tag;
 	irq = ca->ca_intr[0];
-	itype = IST_LEVEL;
+	itype = IST_EDGE;
 
-	if (ca->ca_nintr == 8 && ca->ca_intr[1] == 0)
-		itype = IST_EDGE;
+	if (ca->ca_nintr == 8 && ca->ca_intr[1] != 0)
+		itype = IST_LEVEL;
 
 	printf(" irq %d %s\n", irq, intr_typename(itype));
 
@@ -172,6 +174,7 @@ mediabay_attach_content(sc)
 		ca.ca_name = name;
 		ca.ca_node = child;
 		ca.ca_baseaddr = sc->sc_baseaddr;
+		ca.ca_tag = sc->sc_tag;
 
 		ca.ca_nreg  = OF_getprop(child, "reg", reg, sizeof(reg));
 		ca.ca_nintr = OF_getprop(child, "AAPL,interrupts", intr,