summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtur Grabowski <art@cvs.openbsd.org>2001-02-06 19:07:12 +0000
committerArtur Grabowski <art@cvs.openbsd.org>2001-02-06 19:07:12 +0000
commit8e3adbbaa38abe0d284701a8bfc9f61020f785ba (patch)
tree242540bfc7fbd49280bd6930aa0b464d827e8085
parent32814ff66ba7dc314c57e3338dcc39db8d36fcd5 (diff)
I don't think there is a reason to enable IDE through isa now that
we have pciide.
-rw-r--r--sys/arch/alpha/pci/sio.c51
1 files changed, 2 insertions, 49 deletions
diff --git a/sys/arch/alpha/pci/sio.c b/sys/arch/alpha/pci/sio.c
index 967b9ef33fd..1c3e2c52f54 100644
--- a/sys/arch/alpha/pci/sio.c
+++ b/sys/arch/alpha/pci/sio.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sio.c,v 1.20 2001/02/05 17:25:42 art Exp $ */
+/* $OpenBSD: sio.c,v 1.21 2001/02/06 19:07:11 art Exp $ */
/* $NetBSD: sio.c,v 1.15 1996/12/05 01:39:36 cgd Exp $ */
/*
@@ -94,8 +94,6 @@ void sio_eisa_attach_hook __P((struct device *, struct device *,
struct eisabus_attach_args *));
int sio_eisa_maxslots __P((void *));
int sio_eisa_intr_map __P((void *, u_int, eisa_intr_handle_t *));
-void siocfiddle __P((struct isabus_attach_args *iba));
-
void sio_bridge_callback __P((void *));
int
@@ -217,7 +215,7 @@ sio_isa_attach_hook(parent, self, iba)
struct device *parent, *self;
struct isabus_attach_args *iba;
{
- siocfiddle(iba);
+ /* Nothing to do. */
}
void
@@ -259,48 +257,3 @@ sio_eisa_intr_map(v, irq, ihp)
*ihp = irq;
return 0;
}
-
-
-/*
- * Look for and gently fondle the 87312 Super I/O chip.
- */
-
-#define SIOC_IDE_ENABLE 0x40
-#define SIOC_NPORTS 2
-void
-siocfiddle(iba)
- struct isabus_attach_args *iba;
-{
- bus_space_tag_t iot = iba->iba_iot;
- bus_space_handle_t ioh;
- extern int cputype;
- int addr;
- u_int8_t reg0;
-
- /* Decide based on machine type */
- switch (cputype) {
- case 11: /* DEC AXPpci */
- case 12: /* DEC 2100 A50 */
- addr = 0x26e;
- break;
- case 26: /* DEC EB164 */
- addr = 0x398;
- break;
- default:
- return;
- }
-
- if (bus_space_map(iot, addr, SIOC_NPORTS, 0, &ioh))
- return;
-
- /* select and read register 0 */
- bus_space_write_1(iot, ioh, 0, 0);
- reg0 = bus_space_read_1(iot, ioh, 1);
-
- /* write back with IDE enabled flag set, and do it twice! */
- bus_space_write_1(iot, ioh, 0, 0);
- bus_space_write_1(iot, ioh, 1, reg0 | SIOC_IDE_ENABLE);
- bus_space_write_1(iot, ioh, 1, reg0 | SIOC_IDE_ENABLE);
-
- bus_space_unmap(iot, ioh, SIOC_NPORTS);
-}