summaryrefslogtreecommitdiff
path: root/sys/dev/pci/pciide.c
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2007-07-02 14:01:15 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2007-07-02 14:01:15 +0000
commit63ed4de470c61a8b706398104d73eae11ed12624 (patch)
tree1648015e151371da0c9140e11555e440ae604488 /sys/dev/pci/pciide.c
parentb791c508bea0b43ae972e64ba85de4e7fb2a88c9 (diff)
kettenis suggested that i can use pci_intr_map twice on the same device
safely, so i tried it and it worked great. i can reuse the pci_attach_args to attach ahci and now pciide to jmb without really modifying either of them. lots of code shrinks. ok jsg@
Diffstat (limited to 'sys/dev/pci/pciide.c')
-rw-r--r--sys/dev/pci/pciide.c24
1 files changed, 22 insertions, 2 deletions
diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c
index 1461c9a57bb..37bf4ce7834 100644
--- a/sys/dev/pci/pciide.c
+++ b/sys/dev/pci/pciide.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pciide.c,v 1.271 2007/06/26 17:48:18 kettenis Exp $ */
+/* $OpenBSD: pciide.c,v 1.272 2007/07/02 14:01:14 dlg Exp $ */
/* $NetBSD: pciide.c,v 1.127 2001/08/03 01:31:08 tsutsui Exp $ */
/*
@@ -1062,6 +1062,22 @@ const struct pciide_product_desc pciide_ati_products[] = {
};
const struct pciide_product_desc pciide_jmicron_products[] = {
+ { PCI_PRODUCT_JMICRON_JMB361,
+ 0,
+ jmicron_chip_map
+ },
+ { PCI_PRODUCT_JMICRON_JMB363,
+ 0,
+ jmicron_chip_map
+ },
+ { PCI_PRODUCT_JMICRON_JMB365,
+ 0,
+ jmicron_chip_map
+ },
+ { PCI_PRODUCT_JMICRON_JMB366,
+ 0,
+ jmicron_chip_map
+ },
{ PCI_PRODUCT_JMICRON_JMB368,
0,
jmicron_chip_map
@@ -1119,7 +1135,11 @@ const struct pciide_vendor_desc pciide_vendors[] = {
int pciide_match(struct device *, void *, void *);
void pciide_attach(struct device *, struct device *, void *);
-struct cfattach pciide_ca = {
+struct cfattach pciide_pci_ca = {
+ sizeof(struct pciide_softc), pciide_match, pciide_attach
+};
+
+struct cfattach pciide_jmb_ca = {
sizeof(struct pciide_softc), pciide_match, pciide_attach
};