diff options
| author | Dale S. Rahn <rahnds@cvs.openbsd.org> | 2000-03-20 07:26:52 +0000 |
|---|---|---|
| committer | Dale S. Rahn <rahnds@cvs.openbsd.org> | 2000-03-20 07:26:52 +0000 |
| commit | ef912cc6b6727d00d870e34cbb93dd81818ad5ee (patch) | |
| tree | 08cc2cce860864839f83f7e566fe482a4323dc4e /sys/arch/powerpc/mac/wdc_obio.c | |
| parent | 1f1dff1081e7f0bbf06664a62f35190afdc3a7a4 (diff) | |
Interrupt code changed from called routines, to initialized driver.
Added openpic support with this new driver scheme.
added support for keylargo-ata, G4 ide configures properly.
interrupt configuration changed to be more full featured, like isa had been.
Diffstat (limited to 'sys/arch/powerpc/mac/wdc_obio.c')
| -rw-r--r-- | sys/arch/powerpc/mac/wdc_obio.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/arch/powerpc/mac/wdc_obio.c b/sys/arch/powerpc/mac/wdc_obio.c index 6d6b72c2185..fe3f09bb2dd 100644 --- a/sys/arch/powerpc/mac/wdc_obio.c +++ b/sys/arch/powerpc/mac/wdc_obio.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wdc_obio.c,v 1.2 1999/11/23 01:25:29 rahnds Exp $ */ +/* $OpenBSD: wdc_obio.c,v 1.3 2000/03/20 07:26:51 rahnds Exp $ */ /* $NetBSD: wdc_obio.c,v 1.4 1999/06/14 08:53:06 tsubai Exp $ */ /*- @@ -119,14 +119,14 @@ wdc_obio_probe(parent, match, aux) /* XXX should not use name */ if (strcmp(ca->ca_name, "ATA") == 0 || - strcmp(ca->ca_name, "ata") == 0 || - strcmp(ca->ca_name, "ata0") == 0 || + strncmp(ca->ca_name, "ata", 3) == 0 || strcmp(ca->ca_name, "ide") == 0) return 1; bzero(compat, sizeof(compat)); OF_getprop(ca->ca_node, "compatible", compat, sizeof(compat)); - if (strcmp(compat, "heathrow-ata") == 0) + if (strcmp(compat, "heathrow-ata") == 0 || + strcmp(compat, "keylargo-ata") == 0) return 1; return 0; @@ -186,7 +186,8 @@ printf ("wdc_obio cmd_ioh %x ctl_ioh %x\n", chp->cmd_ioh, chp->ctl_ioh); chp->data32iot = chp->cmd_iot; chp->data32ioh = chp->cmd_ioh; - mac_intr_establish(intr, IST_LEVEL, IPL_BIO, wdcintr, chp); + mac_intr_establish(parent, intr, IST_LEVEL, IPL_BIO, wdcintr, chp, + "wdc_obio"); if (use_dma) { sc->sc_dmacmd = dbdma_alloc(sizeof(dbdma_command_t) * 20); |