Update for renamed ATI PCI ids.

5 files changed, 22 insertions, 22 deletions

diff --git a/sys/dev/pci/ahci.c b/sys/dev/pci/ahci.c
index 570095ae942..fe70632674f 100644
--- a/sys/dev/pci/ahci.c
+++ b/sys/dev/pci/ahci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ahci.c,v 1.140 2008/05/31 23:50:32 dlg Exp $ */
+/*	$OpenBSD: ahci.c,v 1.141 2008/09/17 06:14:09 brad Exp $ */
 
 /*
  * Copyright (c) 2006 David Gwynne <dlg@openbsd.org>
@@ -427,7 +427,7 @@ int			ahci_ati_ixp600_attach(struct ahci_softc *,
 static const struct ahci_device ahci_devices[] = {
 	{ PCI_VENDOR_VIATECH,	PCI_PRODUCT_VIATECH_VT8251_SATA,
 	    ahci_no_match,	ahci_vt8251_attach },
-	{ PCI_VENDOR_ATI,	PCI_PRODUCT_ATI_IXP_SATA_600,
+	{ PCI_VENDOR_ATI,	PCI_PRODUCT_ATI_SB600_SATA,
 	    NULL,		ahci_ati_ixp600_attach }
 };
 
diff --git a/sys/dev/pci/auixp.c b/sys/dev/pci/auixp.c
index 2e418b15dc1..88d4dced2f2 100644
--- a/sys/dev/pci/auixp.c
+++ b/sys/dev/pci/auixp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auixp.c,v 1.19 2008/05/25 23:59:33 jakemsr Exp $ */
+/* $OpenBSD: auixp.c,v 1.20 2008/09/17 06:14:09 brad Exp $ */
 /* $NetBSD: auixp.c,v 1.9 2005/06/27 21:13:09 thorpej Exp $ */
 
 /*
@@ -90,9 +90,9 @@
 #define	DMAADDR(p)	((p)->map->dm_segs[0].ds_addr)
 
 const struct pci_matchid auixp_pci_devices[] = {
-	{ PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_AUDIO_200 },
-	{ PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_AUDIO_300 },
-	{ PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_AUDIO_400 },
+	{ PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB200_AUDIO },
+	{ PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB300_AUDIO },
+	{ PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB400_AUDIO }
 };
 
 struct cfdriver auixp_cd = {
diff --git a/sys/dev/pci/azalia.c b/sys/dev/pci/azalia.c
index 88ad0836ae6..6b367fb9e48 100644
--- a/sys/dev/pci/azalia.c
+++ b/sys/dev/pci/azalia.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: azalia.c,v 1.52 2008/06/26 05:42:17 ray Exp $	*/
+/*	$OpenBSD: azalia.c,v 1.53 2008/09/17 06:14:09 brad Exp $	*/
 /*	$NetBSD: azalia.c,v 1.20 2006/05/07 08:31:44 kent Exp $	*/
 
 /*-
@@ -426,7 +426,7 @@ azalia_pci_attach(struct device *parent, struct device *self, void *aux)
  
 	/* enable PCIe snoop */
 	switch (PCI_PRODUCT(pa->pa_id)) {
-	case PCI_PRODUCT_ATI_IXP_HDA_X00:
+	case PCI_PRODUCT_ATI_SBX00_HDA:
 		reg = azalia_pci_read(pa->pa_pc, pa->pa_tag, ATI_PCIE_SNOOP_REG);
 		reg &= ATI_PCIE_SNOOP_MASK;
 		reg |= ATI_PCIE_SNOOP_ENABLE;
diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c
index cea7d1497bc..b4cb9f360f5 100644
--- a/sys/dev/pci/pciide.c
+++ b/sys/dev/pci/pciide.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pciide.c,v 1.287 2008/07/29 20:09:11 kettenis Exp $	*/
+/*	$OpenBSD: pciide.c,v 1.288 2008/09/17 06:14:09 brad Exp $	*/
 /*	$NetBSD: pciide.c,v 1.127 2001/08/03 01:31:08 tsutsui Exp $	*/
 
 /*
@@ -1076,35 +1076,35 @@ const struct pciide_product_desc pciide_ite_products[] = {
 };
 
 const struct pciide_product_desc pciide_ati_products[] = {
-	{ PCI_PRODUCT_ATI_IXP_IDE_200,
+	{ PCI_PRODUCT_ATI_SB200_IDE,
 	  0,
 	  ixp_chip_map
 	},
-	{ PCI_PRODUCT_ATI_IXP_IDE_300,
+	{ PCI_PRODUCT_ATI_SB300_IDE,
 	  0,
 	  ixp_chip_map
 	},
-	{ PCI_PRODUCT_ATI_IXP_IDE_400,
+	{ PCI_PRODUCT_ATI_SB400_IDE,
 	  0,
 	  ixp_chip_map
 	},
-	{ PCI_PRODUCT_ATI_IXP_IDE_600,
+	{ PCI_PRODUCT_ATI_SB600_IDE,
 	  0,
 	  ixp_chip_map
 	},
-	{ PCI_PRODUCT_ATI_IXP_IDE_700,
+	{ PCI_PRODUCT_ATI_SB700_IDE,
 	  0,
 	  ixp_chip_map
 	},
-	{ PCI_PRODUCT_ATI_IXP_SATA_300,
+	{ PCI_PRODUCT_ATI_SB300_SATA,
 	  0,
 	  sii3112_chip_map
 	},
-	{ PCI_PRODUCT_ATI_IXP_SATA_400_1,
+	{ PCI_PRODUCT_ATI_SB400_SATA_1,
 	  0,
 	  sii3112_chip_map
 	},
-	{ PCI_PRODUCT_ATI_IXP_SATA_400_2,
+	{ PCI_PRODUCT_ATI_SB400_SATA_2,
 	  0,
 	  sii3112_chip_map
 	}
diff --git a/sys/dev/pci/piixpm.c b/sys/dev/pci/piixpm.c
index 588ca5d6fc7..422ae5d46e8 100644
--- a/sys/dev/pci/piixpm.c
+++ b/sys/dev/pci/piixpm.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: piixpm.c,v 1.29 2008/05/24 06:23:40 brad Exp $	*/
+/*	$OpenBSD: piixpm.c,v 1.30 2008/09/17 06:14:09 brad Exp $	*/
 
 /*
  * Copyright (c) 2005, 2006 Alexander Yurchenko <grange@openbsd.org>
@@ -93,10 +93,10 @@ const struct pci_matchid piixpm_ids[] = {
 	{ PCI_VENDOR_RCC, PCI_PRODUCT_RCC_CSB6 },
 	{ PCI_VENDOR_RCC, PCI_PRODUCT_RCC_HT_1000 },
 	{ PCI_VENDOR_SMSC, PCI_PRODUCT_SMSC_VICTORY66_PM },
-	{ PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_SMB_200 },
-	{ PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_SMB_300 },
-	{ PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_SMB_400 },
-	{ PCI_VENDOR_ATI, PCI_PRODUCT_ATI_IXP_SMB_X00 }
+	{ PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB200_SMB },
+	{ PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB300_SMB },
+	{ PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB400_SMB },
+	{ PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SBX00_SMB }
 };
 
 int