Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 8 Jan 2014 13:59:34 +0000 (UTC)
From:      Gavin Atkinson <gavin@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r260448 - head/sys/dev/iwn
Message-ID:  <201401081359.s08DxYaw099301@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gavin
Date: Wed Jan  8 13:59:33 2014
New Revision: 260448
URL: http://svnweb.freebsd.org/changeset/base/260448

Log:
  Add support for the Intel Centrino Wireless-N 135 chipset.
  
  MFC after:	2 weeks

Modified:
  head/sys/dev/iwn/if_iwn.c
  head/sys/dev/iwn/if_iwn_devid.h

Modified: head/sys/dev/iwn/if_iwn.c
==============================================================================
--- head/sys/dev/iwn/if_iwn.c	Wed Jan  8 09:33:16 2014	(r260447)
+++ head/sys/dev/iwn/if_iwn.c	Wed Jan  8 13:59:33 2014	(r260448)
@@ -108,6 +108,8 @@ static const struct iwn_ident iwn_ident_
 	{ 0x8086, IWN_DID_130_2, "Intel Centrino Wireless-N 130"		},
 	{ 0x8086, IWN_DID_100_1, "Intel Centrino Wireless-N 100"		},
 	{ 0x8086, IWN_DID_100_2, "Intel Centrino Wireless-N 100"		},
+	{ 0x8086, IWN_DID_135_1, "Intel Centrino Wireless-N 135"		},
+	{ 0x8086, IWN_DID_135_2, "Intel Centrino Wireless-N 135"		},
 	{ 0x8086, IWN_DID_4965_1, "Intel Wireless WiFi Link 4965"		},
 	{ 0x8086, IWN_DID_6x00_1, "Intel Centrino Ultimate-N 6300"		},
 	{ 0x8086, IWN_DID_6x00_2, "Intel Centrino Advanced-N 6200"		},
@@ -966,6 +968,28 @@ iwn_config_specific(struct iwn_softc *sc
 		}
 		break;
 
+/* 135 Series */
+/* XXX: This series will need adjustment for rate.
+ * see rx_with_siso_diversity in linux kernel
+ */
+	case IWN_DID_135_1:
+	case IWN_DID_135_2:
+		switch(sc->subdevice_id) {
+			case IWN_SDID_135_1:
+			case IWN_SDID_135_2:
+			case IWN_SDID_135_3:
+				sc->limits = &iwn2030_sensitivity_limits;
+				sc->base_params = &iwn2030_base_params;
+				sc->fwname = "iwn135fw";
+				break;
+			default:
+				device_printf(sc->sc_dev, "adapter type id : 0x%04x sub id :"
+				    "0x%04x rev %d not supported (subdevice)\n", pid,
+				    sc->subdevice_id,sc->hw_type);
+				return ENOTSUP;
+		}
+		break;
+
 /* 2x00 Series */
 	case IWN_DID_2x00_1:
 	case IWN_DID_2x00_2:

Modified: head/sys/dev/iwn/if_iwn_devid.h
==============================================================================
--- head/sys/dev/iwn/if_iwn_devid.h	Wed Jan  8 09:33:16 2014	(r260447)
+++ head/sys/dev/iwn/if_iwn_devid.h	Wed Jan  8 13:59:33 2014	(r260448)
@@ -228,6 +228,18 @@
 
 /*
  * --------------------------------------------------------------------------
+ * Device ID for 135 Series
+ * --------------------------------------------------------------------------
+ */
+#define	IWN_DID_135_1		0x0892
+#define	IWN_DID_135_2		0x0893
+/* SubDevice ID */
+#define	IWN_SDID_135_1		0x0062
+#define	IWN_SDID_135_2		0x0262
+#define	IWN_SDID_135_3		0x0462
+
+/*
+ * --------------------------------------------------------------------------
  * Device ID for 5x00 Series
  * --------------------------------------------------------------------------
  */



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