diff options
| -rw-r--r-- | distrib/notes/amd64/hardware | 4 | ||||
| -rw-r--r-- | distrib/notes/i386/hardware | 4 | ||||
| -rw-r--r-- | share/man/man4/pciide.4 | 4 | ||||
| -rw-r--r-- | sys/dev/pci/pciide.c | 16 |
4 files changed, 20 insertions, 8 deletions
diff --git a/distrib/notes/amd64/hardware b/distrib/notes/amd64/hardware index bd4e7c1eb58..c2261a1e73d 100644 --- a/distrib/notes/amd64/hardware +++ b/distrib/notes/amd64/hardware @@ -1,4 +1,4 @@ -dnl $OpenBSD: hardware,v 1.44 2005/04/20 01:01:49 jsg Exp $ +dnl $OpenBSD: hardware,v 1.45 2005/04/29 01:11:47 jsg Exp $ OpenBSD/MACHINE OSREV should work on all Athlon 64-based and compatible designs. @@ -44,7 +44,7 @@ dnl YENTA-compatible PCI-CardBus bridges PDC20277, PDC20376 (RAID mode is not supported) ServerWorks OSB4, CSB5, CSB6 (including support for the third channel) - Silicon Image SiI3112, SiI3512, SiI3114 + Silicon Image SiI3112 (including ATI IXP SATA), SiI3512, SiI3114 Silicon Integrated System 180, 181, 182, 5513 (5597/5598), 540, 550, 620, 630, 630S, 633, 635, 640, 645, 645DX, 648, 650, 651, 652, 661, 655, 658, 730, 733, 735, 740, 745, 746, 748, diff --git a/distrib/notes/i386/hardware b/distrib/notes/i386/hardware index 3826ad92fc8..9523effbc77 100644 --- a/distrib/notes/i386/hardware +++ b/distrib/notes/i386/hardware @@ -1,4 +1,4 @@ -dnl $OpenBSD: hardware,v 1.199 2005/04/20 01:01:49 jsg Exp $ +dnl $OpenBSD: hardware,v 1.200 2005/04/29 01:11:47 jsg Exp $ OpenBSD/MACHINE OSREV works across a broad range of standard PCs and clones, with a wide variety of processors and I/O bus architectures. It can be expected to install and run with minimal difficulties on most @@ -87,7 +87,7 @@ Supported hardware {:-include-:}: PDC20277, PDC20376 (RAID mode is not supported) ServerWorks OSB4, CSB5, CSB6 (including support for the third channel) - Silicon Image SiI3112, SiI3512, SiI3114 + Silicon Image SiI3112 (including ATI IXP SATA), SiI3512, SiI3114 Silicon Integrated System 180, 181, 182, 5513 (5597/5598), 540, 550, 620, 630, 630S, 633, 635, 640, 645, 645DX, 648, 650, 651, 652, 661, 655, 658, 730, 733, 735, 740, 745, 746, 748, diff --git a/share/man/man4/pciide.4 b/share/man/man4/pciide.4 index 249615bce69..cdc1fa63b71 100644 --- a/share/man/man4/pciide.4 +++ b/share/man/man4/pciide.4 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pciide.4,v 1.47 2005/04/20 01:01:49 jsg Exp $ +.\" $OpenBSD: pciide.4,v 1.48 2005/04/29 01:11:47 jsg Exp $ .\" $NetBSD: pciide.4,v 1.8 1999/03/16 01:19:17 garbled Exp $ .\" .\" Copyright (c) 1998 Manuel Bouyer. @@ -98,7 +98,7 @@ PDC20269, PDC20271, PDC20275, PDC20276, PDC20277, PDC20376 .It ServerWorks OSB4, CSB5, CSB6 (including support for the third channel) .It -Silicon Image SiI3112, SiI3512, SiI3114 +Silicon Image SiI3112 (including ATI IXP SATA), SiI3512, SiI3114 .It Silicon Integrated System 180, 181, 182, 5513 (5597/5598), 540, 550, 620, 630, 630S, 633, 635, 640, 645, 645DX, 648, 650, 651, 652, 655, 658, 661, diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c index 4a96f1913f0..5fd4b5e1006 100644 --- a/sys/dev/pci/pciide.c +++ b/sys/dev/pci/pciide.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pciide.c,v 1.191 2005/04/20 00:57:25 jsg Exp $ */ +/* $OpenBSD: pciide.c,v 1.192 2005/04/29 01:11:46 jsg Exp $ */ /* $NetBSD: pciide.c,v 1.127 2001/08/03 01:31:08 tsutsui Exp $ */ /* @@ -666,6 +666,16 @@ const struct pciide_product_desc pciide_ite_products[] = { } }; +const struct pciide_product_desc pciide_ati_products[] = { + { PCI_PRODUCT_ATI_IXP_SATA_400_1, + IDE_PCI_CLASS_OVERRIDE, + sii3112_chip_map + }, + { PCI_PRODUCT_ATI_IXP_SATA_400_2, + IDE_PCI_CLASS_OVERRIDE, + sii3112_chip_map + } +}; struct pciide_vendor_desc { u_int32_t ide_vendor; @@ -705,7 +715,9 @@ const struct pciide_vendor_desc pciide_vendors[] = { { PCI_VENDOR_NVIDIA, pciide_nvidia_products, sizeof(pciide_nvidia_products)/sizeof(pciide_nvidia_products[0]) }, { PCI_VENDOR_ITEXPRESS, pciide_ite_products, - sizeof(pciide_ite_products)/sizeof(pciide_ite_products[0]) } + sizeof(pciide_ite_products)/sizeof(pciide_ite_products[0]) }, + { PCI_VENDOR_ATI, pciide_ati_products, + sizeof(pciide_ati_products)/sizeof(pciide_ati_products[0]) } }; /* options passed via the 'flags' config keyword */ |