Add pciide support for powerpc.

Yes Theo, you found my bug, but the tree broke
because you referenced devices that were not enabled, yet.

3 files changed, 79 insertions, 4 deletions

diff --git a/sys/arch/powerpc/conf/GENERIC b/sys/arch/powerpc/conf/GENERIC
index 61792638976..f8f94a06dd7 100644
--- a/sys/arch/powerpc/conf/GENERIC
+++ b/sys/arch/powerpc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.41 2001/06/26 21:05:56 deraadt Exp $
+#	$OpenBSD: GENERIC,v 1.42 2001/06/26 21:26:44 drahn Exp $
 #
 # PPC GENERIC config file
 #
@@ -53,7 +53,7 @@ vgafb0		at pci? dev ? function ?	# PCI VGA graphics
 #bha*		at pci? dev ? function ?	# BusLogic 9xx SCSI
 #ami*		at pci? dev ? function ?
 #pcscp*		at pci? dev ? function ?	# AMD Am53c974 PCscsi-PCI SCSI
-#pciide*	at pci? dev ? function ?
+pciide*		at pci? dev ? function ?
 macobio0	at pci? dev ? function ?
 gm*		at pci? dev ? function ?	# GMAC ethernet
 an*		at pci? dev ? function ?	# Cisco/Aironet
@@ -106,8 +106,6 @@ scsibus*	at siop?
 #scsibus*	at pcscp?
 
 wdc*		at macobio? flags 0x0
-#wd*		at pciide? channel ? drive ?
-#wd*		at wdc? channel ? drive ? flags 0x0000
 wd*		at wdc? drive ? flags 0x0000
 wd*		at pciide? drive ? flags 0x0000
 atapiscsi*	at wdc? channel ? flags 0x0000
diff --git a/sys/arch/powerpc/conf/files.powerpc b/sys/arch/powerpc/conf/files.powerpc
index eaa7ae40701..02ef3f1cde1 100644
--- a/sys/arch/powerpc/conf/files.powerpc
+++ b/sys/arch/powerpc/conf/files.powerpc
@@ -86,6 +86,7 @@ include "../../../scsi/files.scsi"
 include "../../../dev/i2o/files.i2o"
 
 include "dev/pci/files.pci"
+file	arch/powerpc/pci/pciide_machdep.c	pciide
 
 device	mpcpcibr {} : pcibus
 attach	mpcpcibr at mainbus
diff --git a/sys/arch/powerpc/pci/pciide_machdep.c b/sys/arch/powerpc/pci/pciide_machdep.c
new file mode 100644
index 00000000000..f82b6ee9888
--- /dev/null
+++ b/sys/arch/powerpc/pci/pciide_machdep.c
@@ -0,0 +1,76 @@
+/*	$OpenBSD: pciide_machdep.c,v 1.1 2001/06/26 21:26:45 drahn Exp $	*/
+/*	$NetBSD: pciide_machdep.c,v 1.2 1999/02/19 18:01:27 mycroft Exp $	*/
+
+/*
+ * Copyright (c) 1998 Christopher G. Demetriou.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *      This product includes software developed by Christopher G. Demetriou
+ *	for the NetBSD Project.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * PCI IDE controller driver (i386 machine-dependent portion).
+ *
+ * Author: Christopher G. Demetriou, March 2, 1998 (derived from NetBSD
+ * sys/dev/pci/ppb.c, revision 1.16).
+ *
+ * See "PCI IDE Controller Specification, Revision 1.0 3/4/94" from the
+ * PCI SIG.
+ */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/device.h>
+
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pciidereg.h>
+#include <dev/pci/pciidevar.h>
+
+#include <powerpc/autoconf.h>
+
+void *
+pciide_machdep_compat_intr_establish(dev, pa, chan, func, arg)
+	struct device *dev;
+	struct pci_attach_args *pa;
+	int chan;
+	int (*func) __P((void *));
+	void *arg;
+{
+	int irq;
+	void *cookie;
+
+	irq = PCIIDE_COMPAT_IRQ(chan);
+	cookie = mac_intr_establish(NULL, irq, IPL_BIO, IST_EDGE, func, arg, dev->dv_xname);
+
+	return (cookie);
+}
+
+void
+pciide_machdep_compat_intr_disestablish(pci_chipset_tag_t pc, void *cookie)
+{
+	mac_intr_disestablish(NULL, cookie);
+}