Fix and add several device IDs.

2 files changed, 38 insertions, 31 deletions

diff --git a/sys/dev/firewire/fwohci_pci.c b/sys/dev/firewire/fwohci_pci.c
index ef22f19..ff96c28 100644
--- a/sys/dev/firewire/fwohci_pci.c
+++ b/sys/dev/firewire/fwohci_pci.c
@@ -63,58 +63,62 @@ static int
 fwohci_pci_probe( device_t dev )
 {
 #if 1
-	if ((pci_get_vendor(dev) == FW_VENDORID_NEC) &&
-	    (pci_get_device(dev) == FW_DEVICE_UPD861)) {
+	u_int32_t id;
+
+	id = (pci_get_vendor(dev) << 16) | pci_get_device(dev);
+	if (id == (FW_VENDORID_NEC | FW_DEVICE_UPD861)) {
 		device_set_desc(dev, "NEC uPD72861");
 		return 0;
 	}
-	if ((pci_get_vendor(dev) == FW_VENDORID_TI) &&
-	    (pci_get_device(dev) == FW_DEVICE_TITSB22)) {
+	if (id == (FW_VENDORID_TI | FW_DEVICE_TITSB22)) {
 		device_set_desc(dev, "Texas Instruments TSB12LV22");
 		return 0;
 	}
-	if ((pci_get_vendor(dev) == FW_VENDORID_TI) &&
-	    (pci_get_device(dev) == FW_DEVICE_TITSB23)) {
+	if (id == (FW_VENDORID_TI | FW_DEVICE_TITSB23)) {
 		device_set_desc(dev, "Texas Instruments TSB12LV23");
 		return 0;
 	}
-	if ((pci_get_vendor(dev) == FW_VENDORID_TI) &&
-	    (pci_get_device(dev) == FW_DEVICE_TITSB26)) {
+	if (id == (FW_VENDORID_TI | FW_DEVICE_TITSB26)) {
 		device_set_desc(dev, "Texas Instruments TSB12LV26");
 		return 0;
 	}
-	if ((pci_get_vendor(dev) == FW_VENDORID_TI) &&
-	    (pci_get_device(dev) == FW_DEVICE_TITSB43)) {
+	if (id == (FW_VENDORID_TI | FW_DEVICE_TITSB43)) {
 		device_set_desc(dev, "Texas Instruments TSB43AA22");
 		return 0;
 	}
-	if ((pci_get_vendor(dev) == FW_VENDORID_SONY) &&
-	    (pci_get_device(dev) == FW_DEVICE_CX3022)) {
+	if (id == (FW_VENDORID_TI | FW_DEVICE_TITSB43A)) {
+		device_set_desc(dev, "Texas Instruments TSB43AB22/A");
+		return 0;
+	}
+	if (id == (FW_VENDORID_TI | FW_DEVICE_TIPCI4450)) {
+		device_set_desc(dev, "Texas Instruments PCI4450");
+		return 0;
+	}
+	if (id == (FW_VENDORID_TI | FW_DEVICE_TIPCI4410A)) {
+		device_set_desc(dev, "Texas Instruments PCI4410A");
+		return 0;
+	}
+	if (id == (FW_VENDORID_SONY | FW_DEVICE_CX3022)) {
 		device_set_desc(dev, "SONY CX3022");
 		return 0;
 	}
-	if ((pci_get_vendor(dev) == FW_VENDORID_VIA) &&
-	    (pci_get_device(dev) == FW_DEVICE_VT6306)) {
+	if (id == (FW_VENDORID_VIA | FW_DEVICE_VT6306)) {
 		device_set_desc(dev, "VIA VT6306");
 		return 0;
 	}
-	if ((pci_get_vendor(dev) == FW_VENDORID_RICOH) &&
-	    (pci_get_device(dev) == FW_DEVICE_R5C552)) {
+	if (id == (FW_VENDORID_RICOH | FW_DEVICE_R5C552)) {
 		device_set_desc(dev, "Ricoh R5C552");
 		return 0;
 	}
-	if ((pci_get_vendor(dev) == FW_VENDORID_APPLE) &&
-	    (pci_get_device(dev) == FW_DEVICE_PANGEA)) {
+	if (id == (FW_VENDORID_APPLE | FW_DEVICE_PANGEA)) {
 		device_set_desc(dev, "Apple Pangea");
 		return 0;
 	}
-	if ((pci_get_vendor(dev) == FW_VENDORID_APPLE) &&
-	    (pci_get_device(dev) == FW_DEVICE_UNINORTH)) {
+	if (id == (FW_VENDORID_APPLE | FW_DEVICE_UNINORTH)) {
 		device_set_desc(dev, "Apple UniNorth");
 		return 0;
 	}
-	if ((pci_get_vendor(dev) == FW_VENDORID_LUCENT) &&
-	    (pci_get_device(dev) == FW_DEVICE_FW322)) {
+	if (id == (FW_VENDORID_LUCENT | FW_DEVICE_FW322)) {
 		device_set_desc(dev, "Lucent FW322/323");
 		return 0;
 	}
@@ -122,7 +126,7 @@ fwohci_pci_probe( device_t dev )
 	if (pci_get_class(dev) == PCIC_SERIALBUS
 			&& pci_get_subclass(dev) == PCIS_SERIALBUS_FW
 			&& pci_get_progif(dev) == PCI_INTERFACE_OHCI) {
-		printf("XXXfw: vendid=%x, dev=%x\n", pci_get_vendor(dev),
+		device_printf(dev, "vendor=%x, dev=%x\n", pci_get_vendor(dev),
 			pci_get_device(dev));
 		device_set_desc(dev, "1394 Open Host Controller Interface");
 		return 0;
diff --git a/sys/dev/firewire/fwohcireg.h b/sys/dev/firewire/fwohcireg.h
index cb399b6..1f874ee 100644
--- a/sys/dev/firewire/fwohcireg.h
+++ b/sys/dev/firewire/fwohcireg.h
@@ -35,22 +35,25 @@
  */
 #define		PCI_CBMEM		0x10
 
-#define		FW_VENDORID_NEC		0x1033
-#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_NEC		(0x1033 << 16)
+#define		FW_VENDORID_TI		(0x104c << 16)
+#define		FW_VENDORID_SONY	(0x104d << 16)
+#define		FW_VENDORID_VIA		(0x1106 << 16)
+#define		FW_VENDORID_RICOH	(0x1180 << 16)
+#define		FW_VENDORID_APPLE	(0x106b << 16)
+#define		FW_VENDORID_LUCENT	(0x11c1 << 16)
 
 #define		FW_DEVICE_UPD861	0x0063
 #define		FW_DEVICE_TITSB22	0x8009
 #define		FW_DEVICE_TITSB23	0x8019
 #define		FW_DEVICE_TITSB26	0x8020
 #define		FW_DEVICE_TITSB43	0x8021
+#define		FW_DEVICE_TITSB43A	0x8023
+#define		FW_DEVICE_TIPCI4450	0x8011
+#define		FW_DEVICE_TIPCI4410A	0x8017
 #define		FW_DEVICE_CX3022	0x8039
 #define		FW_DEVICE_VT6306	0x3044
-#define		FW_DEVICE_R5C552	0x1180
+#define		FW_DEVICE_R5C552	0x0552
 #define		FW_DEVICE_PANGEA	0x0030
 #define		FW_DEVICE_UNINORTH	0x0031
 #define		FW_DEVICE_FW322		0x5811