svn commit: r331858 - head/sys/dev/firewire

[Warner Losh]

Author: imp
Date: Sun Apr  1 00:25:47 2018
New Revision: 331858
URL: https://svnweb.freebsd.org/changeset/base/331858

Log:
  The Uninorth ID was really for Uninorth 2.
  
  Submitted by: Sevan Janiyan
  Differential Revision: https://reviews.freebsd.org/D14919

Modified:
  head/sys/dev/firewire/fwohci_pci.c
  head/sys/dev/firewire/fwohcireg.h

Modified: head/sys/dev/firewire/fwohci_pci.c
==============================================================================
--- head/sys/dev/firewire/fwohci_pci.c	Sun Apr  1 00:22:51 2018	(r331857)
+++ head/sys/dev/firewire/fwohci_pci.c	Sun Apr  1 00:25:47 2018	(r331858)
@@ -171,8 +171,8 @@ fwohci_pci_probe(device_t dev)
 		device_set_desc(dev, "Apple Pangea");
 		return BUS_PROBE_DEFAULT;
 	}
-	if (id == (FW_VENDORID_APPLE | FW_DEVICE_UNINORTH)) {
-		device_set_desc(dev, "Apple UniNorth");
+	if (id == (FW_VENDORID_APPLE | FW_DEVICE_UNINORTH2)) {
+		device_set_desc(dev, "Apple UniNorth 2");
 		return BUS_PROBE_DEFAULT;
 	}
 	if (id == (FW_VENDORID_LUCENT | FW_DEVICE_FW322)) {

Modified: head/sys/dev/firewire/fwohcireg.h
==============================================================================
--- head/sys/dev/firewire/fwohcireg.h	Sun Apr  1 00:22:51 2018	(r331857)
+++ head/sys/dev/firewire/fwohcireg.h	Sun Apr  1 00:25:47 2018	(r331858)
@@ -74,7 +74,7 @@
 #define		FW_DEVICE_R5C551	(0x0551 << 16)
 #define		FW_DEVICE_R5C552	(0x0552 << 16)
 #define		FW_DEVICE_PANGEA	(0x0030 << 16)
-#define		FW_DEVICE_UNINORTH	(0x0031 << 16)
+#define		FW_DEVICE_UNINORTH2	(0x0031 << 16)
 #define		FW_DEVICE_AIC5800	(0x5800 << 16)
 #define		FW_DEVICE_FW322		(0x5811 << 16)
 #define		FW_DEVICE_7007		(0x7007 << 16)