Module Name: src
Committed By: hubertf
Date: Mon Jun 29 11:05:12 UTC 2009
Modified Files:
src/sys/dev/pci: sdhc_pci.c
Log Message:
Use PCI IDs from pcidevs, instead of storing them in here.
Compile tested and OK'd by NONAKA Kimihiro.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/pci/sdhc_pci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/sdhc_pci.c
diff -u src/sys/dev/pci/sdhc_pci.c:1.1 src/sys/dev/pci/sdhc_pci.c:1.2
--- src/sys/dev/pci/sdhc_pci.c:1.1 Tue Apr 21 03:00:29 2009
+++ src/sys/dev/pci/sdhc_pci.c Mon Jun 29 11:05:12 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: sdhc_pci.c,v 1.1 2009/04/21 03:00:29 nonaka Exp $ */
+/* $NetBSD: sdhc_pci.c,v 1.2 2009/06/29 11:05:12 hubertf Exp $ */
/* $OpenBSD: sdhc_pci.c,v 1.7 2007/10/30 18:13:45 chl Exp $ */
/*
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sdhc_pci.c,v 1.1 2009/04/21 03:00:29 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sdhc_pci.c,v 1.2 2009/06/29 11:05:12 hubertf Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -67,11 +67,6 @@
#define DPRINTF(s) /**/
#endif
-/* XXX */
-#define PCI_PRODUCT_TI_PCI7XX1_FLASH 0x8033
-#define PCI_PRODUCT_TI_PCI7XX1_SD 0x8034
-#define PCI_PRODUCT_ENE_SDCARD 0x0550
-
static const struct sdhc_pci_quirk {
pci_vendor_id_t vendor;
pci_product_id_t product;
@@ -86,7 +81,7 @@
} sdhc_pci_quirk_table[] = {
{
PCI_VENDOR_TI,
- PCI_PRODUCT_TI_PCI7XX1_SD,
+ PCI_PRODUCT_TI_PCI72111SD,
0xffff,
0xffff,
4,
@@ -95,7 +90,7 @@
{
PCI_VENDOR_ENE,
- PCI_PRODUCT_ENE_SDCARD,
+ PCI_PRODUCT_ENE_CB712,
0xffff,
0xffff,
0,
@@ -286,7 +281,7 @@
/* Look at func 3 for the flash device */
tag = pci_make_tag(pc, pa->pa_bus, pa->pa_device, 3);
id = pci_conf_read(pc, tag, PCI_ID_REG);
- if (PCI_PRODUCT(id) != PCI_PRODUCT_TI_PCI7XX1_FLASH)
+ if (PCI_PRODUCT(id) != PCI_PRODUCT_TI_PCI72111FM)
return;
/*
