Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 9 Nov 2011 04:38:28 +0000 (UTC)
From:      Adrian Chadd <adrian@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r227373 - head/sys/dev/ath/ath_hal/ar9002
Message-ID:  <201111090438.pA94cS9r064516@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: adrian
Date: Wed Nov  9 04:38:27 2011
New Revision: 227373
URL: http://svn.freebsd.org/changeset/base/227373

Log:
  Add in some more PCI/PCIe differentiation.

Modified:
  head/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c
  head/sys/dev/ath/ath_hal/ar9002/ar9287_attach.c

Modified: head/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c	Wed Nov  9 04:35:33 2011	(r227372)
+++ head/sys/dev/ath/ath_hal/ar9002/ar9280_attach.c	Wed Nov  9 04:38:27 2011	(r227373)
@@ -892,9 +892,12 @@ ar9280SetAntennaSwitch(struct ath_hal *a
 static const char*
 ar9280Probe(uint16_t vendorid, uint16_t devid)
 {
-	if (vendorid == ATHEROS_VENDOR_ID &&
-	    (devid == AR9280_DEVID_PCI || devid == AR9280_DEVID_PCIE))
-		return "Atheros 9280";
+	if (vendorid == ATHEROS_VENDOR_ID) {
+		if (devid == AR9280_DEVID_PCI)
+			return "Atheros 9220";
+		if (devid == AR9280_DEVID_PCIE)
+			return "Atheros 9280";
+	}
 	return AH_NULL;
 }
 AH_CHIP(AR9280, ar9280Probe, ar9280Attach);

Modified: head/sys/dev/ath/ath_hal/ar9002/ar9287_attach.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ar9002/ar9287_attach.c	Wed Nov  9 04:35:33 2011	(r227372)
+++ head/sys/dev/ath/ath_hal/ar9002/ar9287_attach.c	Wed Nov  9 04:38:27 2011	(r227373)
@@ -471,9 +471,12 @@ ar9287SetAntennaSwitch(struct ath_hal *a
 static const char*
 ar9287Probe(uint16_t vendorid, uint16_t devid)
 {
-	if (vendorid == ATHEROS_VENDOR_ID &&
-	    (devid == AR9287_DEVID_PCI || devid == AR9287_DEVID_PCIE))
-		return "Atheros 9287";
+	if (vendorid == ATHEROS_VENDOR_ID) {
+		if (devid == AR9287_DEVID_PCI)
+			return "Atheros 9227";
+		if (devid == AR9287_DEVID_PCIE)
+			return "Atheros 9287";
+	}
 	return AH_NULL;
 }
 AH_CHIP(AR9287, ar9287Probe, ar9287Attach);

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201111090438.pA94cS9r064516>