From 6e2b0d0b25f537641e72ba34031dabd598fac86d Mon Sep 17 00:00:00 2001
From: Hidetoshi Shimokawa <simokawa@FreeBSD.org>
Date: Sat, 17 Jul 2004 09:41:20 +0000
Subject: [PATCH] Add some PCI IDs for OHCI chips.

Obtained from: DragonFly BSD
---
 sys/dev/firewire/fwohci_pci.c | 21 +++++++++++++++++++++
 sys/dev/firewire/fwohcireg.h  |  9 +++++++++
 2 files changed, 30 insertions(+)

diff --git a/sys/dev/firewire/fwohci_pci.c b/sys/dev/firewire/fwohci_pci.c
index 5331629b97b3..bb4ac46c75ad 100644
--- a/sys/dev/firewire/fwohci_pci.c
+++ b/sys/dev/firewire/fwohci_pci.c
@@ -95,6 +95,10 @@ fwohci_pci_probe( device_t dev )
 	uint32_t id;
 
 	id = pci_get_devid(dev);
+	if (id == (FW_VENDORID_NATSEMI | FW_DEVICE_CS4210)) {
+		device_set_desc(dev, "National Semiconductor CS4210");
+		return 0;
+	}
 	if (id == (FW_VENDORID_NEC | FW_DEVICE_UPD861)) {
 		device_set_desc(dev, "NEC uPD72861");
 		return 0;
@@ -115,6 +119,11 @@ fwohci_pci_probe( device_t dev )
 		device_set_desc(dev, "NEC uPD72874");
 		return 0;
 	}
+	if (id == (FW_VENDORID_SIS | FW_DEVICE_7007)) {
+		/* It has no real identifier, using device id. */
+		device_set_desc(dev, "SiS 7007");
+		return 0;
+	}
 	if (id == (FW_VENDORID_TI | FW_DEVICE_TITSB22)) {
 		device_set_desc(dev, "Texas Instruments TSB12LV22");
 		return 0;
@@ -135,6 +144,10 @@ fwohci_pci_probe( device_t dev )
 		device_set_desc(dev, "Texas Instruments TSB43AB22/A");
 		return 0;
 	}
+	if (id == (FW_VENDORID_TI | FW_DEVICE_TITSB43AB21)) {
+		device_set_desc(dev, "Texas Instruments TSB43AB21/A/AI/A-EP");
+		return 0;
+	}
 	if (id == (FW_VENDORID_TI | FW_DEVICE_TITSB43AB23)) {
 		device_set_desc(dev, "Texas Instruments TSB43AB23");
 		return 0;
@@ -183,6 +196,14 @@ fwohci_pci_probe( device_t dev )
 		device_set_desc(dev, "Lucent FW322/323");
 		return 0;
 	}
+	if (id == (FW_VENDORID_INTEL | FW_DEVICE_82372FB)) {
+		device_set_desc(dev, "Intel 82372FB");
+		return 0;
+	}
+	if (id == (FW_VENDORID_ADAPTEC | FW_DEVICE_AIC5800)) {
+		device_set_desc(dev, "Adaptec AHA-894x/AIC-5800");
+		return 0;
+	}
 #endif
 	if (pci_get_class(dev) == PCIC_SERIALBUS
 			&& pci_get_subclass(dev) == PCIS_SERIALBUS_FW
diff --git a/sys/dev/firewire/fwohcireg.h b/sys/dev/firewire/fwohcireg.h
index 8884698ce6e2..2904e8501c3e 100644
--- a/sys/dev/firewire/fwohcireg.h
+++ b/sys/dev/firewire/fwohcireg.h
@@ -36,14 +36,19 @@
  */
 #define		PCI_CBMEM		PCIR_BAR(0)
 
+#define		FW_VENDORID_NATSEMI	0x100B
 #define		FW_VENDORID_NEC		0x1033
+#define		FW_VENDORID_SIS		0x1039
 #define		FW_VENDORID_TI		0x104c
 #define		FW_VENDORID_SONY	0x104d
 #define		FW_VENDORID_VIA		0x1106
 #define		FW_VENDORID_RICOH	0x1180
 #define		FW_VENDORID_APPLE	0x106b
 #define		FW_VENDORID_LUCENT	0x11c1
+#define		FW_VENDORID_INTEL	0x8086
+#define		FW_VENDORID_ADAPTEC	0x9004
 
+#define		FW_DEVICE_CS4210	(0x000f << 16)
 #define		FW_DEVICE_UPD861	(0x0063 << 16)
 #define		FW_DEVICE_UPD871	(0x00ce << 16)
 #define		FW_DEVICE_UPD72870	(0x00cd << 16)
@@ -56,6 +61,7 @@
 #define		FW_DEVICE_TITSB43A	(0x8023 << 16)
 #define		FW_DEVICE_TITSB43AB23	(0x8024 << 16)
 #define		FW_DEVICE_TITSB82AA2	(0x8025 << 16)
+#define		FW_DEVICE_TITSB43AB21	(0x8026 << 16)
 #define		FW_DEVICE_TIPCI4410A	(0x8017 << 16)
 #define		FW_DEVICE_TIPCI4450	(0x8011 << 16)
 #define		FW_DEVICE_TIPCI4451	(0x8027 << 16)
@@ -65,7 +71,10 @@
 #define		FW_DEVICE_R5C552	(0x0552 << 16)
 #define		FW_DEVICE_PANGEA	(0x0030 << 16)
 #define		FW_DEVICE_UNINORTH	(0x0031 << 16)
+#define		FW_DEVICE_AIC5800	(0x5800 << 16)
 #define		FW_DEVICE_FW322		(0x5811 << 16)
+#define		FW_DEVICE_7007		(0x7007 << 16)
+#define		FW_DEVICE_82372FB	(0x7605 << 16)
 
 #define PCI_INTERFACE_OHCI	0x10