[rt2x00-users] [PATCH 03/12] rt2x00: Display RF chipset information for rt2800pci

Benoit PAPILLAULT benoit.papillault at free.fr
Fri Aug 14 22:06:09 UTC 2009


Signed-off-by: Benoit PAPILLAULT <benoit.papillault at free.fr>
---
 drivers/net/wireless/rt2x00/rt2800pci.c |   15 +++++++++++++++
 drivers/net/wireless/rt2x00/rt2800pci.h |    1 +
 2 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c
index aa59a98..f018cda 100644
--- a/drivers/net/wireless/rt2x00/rt2800pci.c
+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
@@ -2504,6 +2504,7 @@ static int rt2800pci_validate_eeprom(struct rt2x00_dev *rt2x00dev)
 	u16 word;
 	u8 *mac;
 	u8 default_lna_gain;
+	u8 rf_type;
 
 	/*
 	 * Read EEPROM into buffer
@@ -2530,6 +2531,20 @@ static int rt2800pci_validate_eeprom(struct rt2x00_dev *rt2x00dev)
 	}
 
 	rt2x00_eeprom_read(rt2x00dev, EEPROM_ANTENNA, &word);
+	rf_type = rt2x00_get_field16(word, EEPROM_ANTENNA_RF_TYPE);
+	EEPROM(rt2x00dev, "Antenna: %s%s%s%s%s%s%s%s%s %dT%dR\n",
+	       rf_type == RF2820 ? "RF2820" : "",
+	       rf_type == RF2850 ? "RF2850" : "",
+	       rf_type == RF2720 ? "RF2720" : "",
+	       rf_type == RF2750 ? "RF2750" : "",
+	       rf_type == RF3020 ? "RF3020" : "",
+	       rf_type == RF2020 ? "RF2020" : "",
+	       rf_type == RF3021 ? "RF3021" : "",
+	       rf_type == RF3022 ? "RF3022" : "",
+	       rf_type == RF3052 ? "RF3052" : "",
+	       rt2x00_get_field16(word, EEPROM_ANTENNA_TXPATH),
+	       rt2x00_get_field16(word, EEPROM_ANTENNA_RXPATH));
+
 	if (word == 0xffff) {
 		rt2x00_set_field16(&word, EEPROM_ANTENNA_RXPATH, 2);
 		rt2x00_set_field16(&word, EEPROM_ANTENNA_TXPATH, 1);
diff --git a/drivers/net/wireless/rt2x00/rt2800pci.h b/drivers/net/wireless/rt2x00/rt2800pci.h
index 85c27ae..3d2fed3 100644
--- a/drivers/net/wireless/rt2x00/rt2800pci.h
+++ b/drivers/net/wireless/rt2x00/rt2800pci.h
@@ -47,6 +47,7 @@
 #define RF2020				0x0006
 #define RF3021				0x0007
 #define RF3022				0x0008
+#define RF3052				0x0009
 
 /*
  * RT2860 version
-- 
1.6.2.4




More information about the users mailing list