Attachment #136653 for bug #181898

View | Details | Raw Unified | Return to bug 181898
Collapse All | Expand All

Lines 115-120 Link Here

(-)sys/dev/iwn/if_iwn.c (-5 / +9 lines)
115	{ 0x8086, IWN_DID_5x00_2, "Intel WiFi Link 5100" },	115	{ 0x8086, IWN_DID_5x00_2, "Intel WiFi Link 5100" },
116	{ 0x8086, IWN_DID_6x00_3, "Intel Centrino Ultimate-N 6300" },	116	{ 0x8086, IWN_DID_6x00_3, "Intel Centrino Ultimate-N 6300" },
117	{ 0x8086, IWN_DID_6x00_4, "Intel Centrino Advanced-N 6200" },	117	{ 0x8086, IWN_DID_6x00_4, "Intel Centrino Advanced-N 6200" },
		118	{ 0x8086, IWN_DID_6235_1, "Intel Centrino Advanced-N 6235" },
		119	{ 0x8086, IWN_DID_6235_2, "Intel Centrino Advanced-N 6235" },
118	{ 0x8086, IWN_DID_5x50_1, "Intel WiMAX/WiFi Link 5350" },	120	{ 0x8086, IWN_DID_5x50_1, "Intel WiMAX/WiFi Link 5350" },
119	{ 0x8086, IWN_DID_5x50_2, "Intel WiMAX/WiFi Link 5350" },	121	{ 0x8086, IWN_DID_5x50_2, "Intel WiMAX/WiFi Link 5350" },
120	{ 0x8086, IWN_DID_5x50_3, "Intel WiMAX/WiFi Link 5150" },	122	{ 0x8086, IWN_DID_5x50_3, "Intel WiMAX/WiFi Link 5150" },
Lines 861-866 Link Here
861	if (pid != 0x0082 && pid != 0x0085) {	863	if (pid != 0x0082 && pid != 0x0085) {
862	sc->fwname = "iwn6000g2bfw";	864	sc->fwname = "iwn6000g2bfw";
863	sc->sc_flags \|= IWN_FLAG_ADV_BTCOEX;	865	sc->sc_flags \|= IWN_FLAG_ADV_BTCOEX;
		866	/* xmj 3lines Override chains masks, ROM is known to be broken. */
		867	sc->txchainmask = IWN_ANT_AB;
		868	sc->rxchainmask = IWN_ANT_AB;
864	} else	869	} else
865	sc->fwname = "iwn6000g2afw";	870	sc->fwname = "iwn6000g2afw";
866	break;	871	break;
Lines 5213-5219 Link Here
5213	cmd.energy_cck = htole16(calib->energy_cck);	5218	cmd.energy_cck = htole16(calib->energy_cck);
5214	/* Barker modulation: use default values. */	5219	/* Barker modulation: use default values. */
5215	cmd.corr_barker = htole16(190);	5220	cmd.corr_barker = htole16(190);
5216	cmd.corr_barker_mrc = htole16(390);	5221	cmd.corr_barker_mrc = htole16(sc->limits->barker_mrc);
5217		5222
5218	DPRINTF(sc, IWN_DEBUG_CALIBRATE,	5223	DPRINTF(sc, IWN_DEBUG_CALIBRATE,
5219	"%s: set sensitivity %d/%d/%d/%d/%d/%d/%d\n", __func__,	5224	"%s: set sensitivity %d/%d/%d/%d/%d/%d/%d\n", __func__,
Lines 5799-5805 Link Here
5799	sc->rxon->ofdm_mask = 0;	5804	sc->rxon->ofdm_mask = 0;
5800	} else {	5805	} else {
5801	/* Assume 802.11b/g. */	5806	/* Assume 802.11b/g. */
5802	sc->rxon->cck_mask = 0x0f;	5807	sc->rxon->cck_mask = 0x03;
5803	sc->rxon->ofdm_mask = 0x15;	5808	sc->rxon->ofdm_mask = 0x15;
5804	}	5809	}
5805	if (IEEE80211_IS_CHAN_HT(ni->ni_chan)) {	5810	if (IEEE80211_IS_CHAN_HT(ni->ni_chan)) {
Lines 7059-7070 Link Here
7059	/* Use internal power amplifier only. */	7064	/* Use internal power amplifier only. */
7060	IWN_WRITE(sc, IWN_GP_DRIVER, IWN_GP_DRIVER_RADIO_2X2_IPA);	7065	IWN_WRITE(sc, IWN_GP_DRIVER, IWN_GP_DRIVER_RADIO_2X2_IPA);
7061	}	7066	}
7062	if ((sc->hw_type == IWN_HW_REV_TYPE_6050 \|\|	7067	if (sc->hw_type == IWN_HW_REV_TYPE_6050 && sc->calib_ver >= 6) {
7063	sc->hw_type == IWN_HW_REV_TYPE_6005) && sc->calib_ver >= 6) {
7064	/* Indicate that ROM calibration version is >=6. */	7068	/* Indicate that ROM calibration version is >=6. */
7065	IWN_SETBITS(sc, IWN_GP_DRIVER, IWN_GP_DRIVER_CALIB_VER6);	7069	IWN_SETBITS(sc, IWN_GP_DRIVER, IWN_GP_DRIVER_CALIB_VER6);
7066	}	7070	}
7067	if (sc->hw_type == IWN_HW_REV_TYPE_6005)	7071	if (sc->hw_type == IWN_HW_REV_TYPE_6050)
7068	IWN_SETBITS(sc, IWN_GP_DRIVER, IWN_GP_DRIVER_6050_1X2);	7072	IWN_SETBITS(sc, IWN_GP_DRIVER, IWN_GP_DRIVER_6050_1X2);
7069	return 0;	7073	return 0;
7070	}	7074	}

Lines 156-162 Link Here

(-)sys/dev/iwn/if_iwn_devid.h (+9 lines)
156	#define IWN_SDID_6035_2 0x4260	156	#define IWN_SDID_6035_2 0x4260
157	#define IWN_SDID_6035_3 0x4460	157	#define IWN_SDID_6035_3 0x4460
158	#define IWN_SDID_6035_4 0x4860	158	#define IWN_SDID_6035_4 0x4860
		159
159	/*	160	/*
		161	* This includes Centrino Advanced-N 6235
		162	*/
		163
		164	#define IWN_DID_6235_1 0x088e
		165	#define IWN_DID_6235_2 0x088f
		166
		167
		168	/*
160	* --------------------------------------------------------------------------	169	* --------------------------------------------------------------------------
161	* Device ID for 1030 and 6030 Series	170	* Device ID for 1030 and 6030 Series
162	* --------------------------------------------------------------------------	171	* --------------------------------------------------------------------------




	uint32_t	min_energy_cck;
	uint32_t	energy_cck;
	uint32_t	energy_ofdm;
	uint32_t	barker_mrc;
};

/*

	200, 400,
	 97,
	100,
	100,
	390
};

static const struct iwn_sensitivity_limits iwn5000_sensitivity_limits = {

	170, 400,
	 95,
	 95,
	 95,
	390
};

static const struct iwn_sensitivity_limits iwn5150_sensitivity_limits = {

	170, 400,
	 95,
	 95,
	 95,
	390
};

static const struct iwn_sensitivity_limits iwn1000_sensitivity_limits = {

	170, 400,
	 95,
	 95,
	 95,
	390
};

static const struct iwn_sensitivity_limits iwn6000_sensitivity_limits = {

	128, 232,
	125, 175,
	160, 310,
	110,
	110,
	110,
	336
};

/* Get value from linux kernel 3.2.+ in Drivers/net/wireless/iwlwifi/iwl-2000.c*/

Lines 1-6 Link Here

(-)sys/modules/iwnfw/iwn6000g2b/Makefile (-1 / +1 lines)
1	# $FreeBSD$	1	# $FreeBSD$
2		2
3	KMOD= iwn6000g2bfw	3	KMOD= iwn6000g2bfw
4	IMG= iwlwifi-6000g2b-17.168.5.2	4	IMG= iwlwifi-6000g2b-18.168.6.1
5		5
6	.include <bsd.kmod.mk>	6	.include <bsd.kmod.mk>

Return to bug 181898

Lines 1891-1896 Link Here

(-)sys/dev/iwn/if_iwnreg.h (-7 / +13 lines)
1891	uint32_t min_energy_cck;	1891	uint32_t min_energy_cck;
1892	uint32_t energy_cck;	1892	uint32_t energy_cck;
1893	uint32_t energy_ofdm;	1893	uint32_t energy_ofdm;
		1894	uint32_t barker_mrc;
1894	};	1895	};
1895		1896
1896	/*	1897	/*
Lines 1905-1911 Link Here
1905	200, 400,	1906	200, 400,
1906	97,	1907	97,
1907	100,	1908	100,
1908	100	1909	100,
		1910	390
1909	};	1911	};
1910		1912
1911	static const struct iwn_sensitivity_limits iwn5000_sensitivity_limits = {	1913	static const struct iwn_sensitivity_limits iwn5000_sensitivity_limits = {
Lines 1917-1923 Link Here
1917	170, 400,	1919	170, 400,
1918	95,	1920	95,
1919	95,	1921	95,
1920	95	1922	95,
		1923	390
1921	};	1924	};
1922		1925
1923	static const struct iwn_sensitivity_limits iwn5150_sensitivity_limits = {	1926	static const struct iwn_sensitivity_limits iwn5150_sensitivity_limits = {
Lines 1929-1935 Link Here
1929	170, 400,	1932	170, 400,
1930	95,	1933	95,
1931	95,	1934	95,
1932	95	1935	95,
		1936	390
1933	};	1937	};
1934		1938
1935	static const struct iwn_sensitivity_limits iwn1000_sensitivity_limits = {	1939	static const struct iwn_sensitivity_limits iwn1000_sensitivity_limits = {
Lines 1941-1947 Link Here
1941	170, 400,	1945	170, 400,
1942	95,	1946	95,
1943	95,	1947	95,
1944	95	1948	95,
		1949	390
1945	};	1950	};
1946		1951
1947	static const struct iwn_sensitivity_limits iwn6000_sensitivity_limits = {	1952	static const struct iwn_sensitivity_limits iwn6000_sensitivity_limits = {
Lines 1951-1959 Link Here
1951	128, 232,	1956	128, 232,
1952	125, 175,	1957	125, 175,
1953	160, 310,	1958	160, 310,
1954	97,	1959	110,
1955	97,	1960	110,
1956	100	1961	110,
		1962	336
1957	};	1963	};
1958		1964
1959	/* Get value from linux kernel 3.2.+ in Drivers/net/wireless/iwlwifi/iwl-2000.c*/	1965	/* Get value from linux kernel 3.2.+ in Drivers/net/wireless/iwlwifi/iwl-2000.c*/