diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2005-10-07 17:21:13 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2005-10-07 17:21:13 +0000 |
| commit | 5b8dea0dc6d5df86af47bd176c10e16cb2088c45 (patch) | |
| tree | 4fe86521492323a4418c74f905778b309132116b /sys | |
| parent | 6c060c55a3050fdb773139a5158e1089353b26f2 (diff) | |
match uata devices found on more modern (ie. G5) machines. parts
from kettenis, ok drahn
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/macppc/pci/kauaiata.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/sys/arch/macppc/pci/kauaiata.c b/sys/arch/macppc/pci/kauaiata.c index fecb745ec01..0cf19c6248e 100644 --- a/sys/arch/macppc/pci/kauaiata.c +++ b/sys/arch/macppc/pci/kauaiata.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kauaiata.c,v 1.4 2005/06/08 19:08:23 drahn Exp $ */ +/* $OpenBSD: kauaiata.c,v 1.5 2005/10/07 17:21:12 deraadt Exp $ */ /* * Copyright (c) 2003 Dale Rahn @@ -79,6 +79,8 @@ kauaiatamatch(struct device *parent, void *match, void *aux) switch (PCI_PRODUCT(pa->pa_id)) { case PCI_PRODUCT_APPLE_UNINORTH_ATA: case PCI_PRODUCT_APPLE_INTREPID_ATA: + case PCI_PRODUCT_APPLE_K2_ATA: + case PCI_PRODUCT_APPLE_SHASTA_ATA: return (1); } break; @@ -100,13 +102,10 @@ kauaiataattach(struct device *parent, struct device *self, void *aux) struct pci_attach_args *pa = aux; pci_chipset_tag_t pc = pa->pa_pc; - /* XXX assumes that this is /pci@f400000/ata-6 */ - - /* -vendor 0x106b product 0x003b (class undefined unknown subclass 0x00, rev 0x00) at pci2 dev 13 function 0 not configured - */ - - node = OF_finddevice("/pci@f4000000/ata-6"); + /* XXX not neccessarily the right device */ + node = OF_finddevice("uata"); + if (node == -1) + node = OF_finddevice("/pci@f4000000/ata-6"); /* * XXX - need to compare node and PCI id to verify this is the |