Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 29 Jul 2013 17:49:08 +0200
From:      "Cedric GROSS" <cg@cgross.info>
To:        <freebsd-wireless@freebsd.org>
Subject:   [iwn] Review split 3
Message-ID:  <007601ce8c73$2b508cf0$81f1a6d0$@info>

next in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format.

------=_NextPart_000_0077_01CE8C83.EED95CF0
Content-Type: text/plain;
	charset="us-ascii"
Content-Transfer-Encoding: 7bit

Hello,

 

As discuss we Adrian, previous big patch is too heavy for direct application
in repo.

So I resume splitting modification. 

 

Here is split 3. 

This one create if_iwn_devif.h for storing device ID and subdevice ID for
later use.

If_iwn.c and If_iwnreg.h modified as needed.

 

Cedric


------=_NextPart_000_0077_01CE8C83.EED95CF0
Content-Type: application/octet-stream;
	name="deviceid.patch"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="deviceid.patch"

Index: sys/dev/iwn/if_iwn.c=0A=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A=
--- sys/dev/iwn/if_iwn.c	(revision 2)=0A=
+++ sys/dev/iwn/if_iwn.c	(working copy)=0A=
@@ -73,6 +73,7 @@=0A=
 =0A=
 #include <dev/iwn/if_iwnreg.h>=0A=
 #include <dev/iwn/if_iwnvar.h>=0A=
+#include <dev/iwn/if_iwn_devid.h>=0A=
 =0A=
 struct iwn_ident {=0A=
 	uint16_t	vendor;=0A=
@@ -81,40 +82,40 @@=0A=
 };=0A=
 =0A=
 static const struct iwn_ident iwn_ident_table[] =3D {=0A=
-	{ 0x8086, 0x0082, "Intel Centrino Advanced-N 6205"		},=0A=
-	{ 0x8086, 0x0083, "Intel Centrino Wireless-N 1000"		},=0A=
-	{ 0x8086, 0x0084, "Intel Centrino Wireless-N 1000"		},=0A=
-	{ 0x8086, 0x0085, "Intel Centrino Advanced-N 6205"		},=0A=
-	{ 0x8086, 0x0087, "Intel Centrino Advanced-N + WiMAX 6250"	},=0A=
-	{ 0x8086, 0x0089, "Intel Centrino Advanced-N + WiMAX 6250"	},=0A=
-	{ 0x8086, 0x008a, "Intel Centrino Wireless-N 1030"		},=0A=
-	{ 0x8086, 0x008b, "Intel Centrino Wireless-N 1030"		},=0A=
-	{ 0x8086, 0x0090, "Intel Centrino Advanced-N 6230"		},=0A=
-	{ 0x8086, 0x0091, "Intel Centrino Advanced-N 6230"		},=0A=
-	{ 0x8086, 0x0885, "Intel Centrino Wireless-N + WiMAX 6150"	},=0A=
-	{ 0x8086, 0x0886, "Intel Centrino Wireless-N + WiMAX 6150"	},=0A=
-	{ 0x8086, 0x0887, "Intel Centrino Wireless-N 2230"		},=0A=
-	{ 0x8086, 0x0888, "Intel Centrino Wireless-N 2230"		},=0A=
-	{ 0x8086, 0x0896, "Intel Centrino Wireless-N 130"		},=0A=
-	{ 0x8086, 0x0897, "Intel Centrino Wireless-N 130"		},=0A=
-	{ 0x8086, 0x08ae, "Intel Centrino Wireless-N 100"		},=0A=
-	{ 0x8086, 0x08af, "Intel Centrino Wireless-N 100"		},=0A=
-	{ 0x8086, 0x4229, "Intel Wireless WiFi Link 4965"		},=0A=
-	{ 0x8086, 0x422b, "Intel Centrino Ultimate-N 6300"		},=0A=
-	{ 0x8086, 0x422c, "Intel Centrino Advanced-N 6200"		},=0A=
-	{ 0x8086, 0x422d, "Intel Wireless WiFi Link 4965"		},=0A=
-	{ 0x8086, 0x4230, "Intel Wireless WiFi Link 4965"		},=0A=
-	{ 0x8086, 0x4232, "Intel WiFi Link 5100"			},=0A=
-	{ 0x8086, 0x4233, "Intel Wireless WiFi Link 4965"		},=0A=
-	{ 0x8086, 0x4235, "Intel Ultimate N WiFi Link 5300"		},=0A=
-	{ 0x8086, 0x4236, "Intel Ultimate N WiFi Link 5300"		},=0A=
-	{ 0x8086, 0x4237, "Intel WiFi Link 5100"			},=0A=
-	{ 0x8086, 0x4238, "Intel Centrino Ultimate-N 6300"		},=0A=
-	{ 0x8086, 0x4239, "Intel Centrino Advanced-N 6200"		},=0A=
-	{ 0x8086, 0x423a, "Intel WiMAX/WiFi Link 5350"			},=0A=
-	{ 0x8086, 0x423b, "Intel WiMAX/WiFi Link 5350"			},=0A=
-	{ 0x8086, 0x423c, "Intel WiMAX/WiFi Link 5150"			},=0A=
-	{ 0x8086, 0x423d, "Intel WiMAX/WiFi Link 5150"			},=0A=
+	{ 0x8086, IWN_DID_6x05_1, "Intel Centrino Advanced-N 6205"		},=0A=
+	{ 0x8086, IWN_DID_1000_1, "Intel Centrino Wireless-N 1000"		},=0A=
+	{ 0x8086, IWN_DID_1000_2, "Intel Centrino Wireless-N 1000"		},=0A=
+	{ 0x8086, IWN_DID_6x05_2, "Intel Centrino Advanced-N 6205"		},=0A=
+	{ 0x8086, IWN_DID_6050_1, "Intel Centrino Advanced-N + WiMAX 6250"	},=0A=
+	{ 0x8086, IWN_DID_6050_2, "Intel Centrino Advanced-N + WiMAX 6250"	},=0A=
+	{ 0x8086, IWN_DID_x030_1, "Intel Centrino Wireless-N 1030"		},=0A=
+	{ 0x8086, IWN_DID_x030_2, "Intel Centrino Wireless-N 1030"		},=0A=
+	{ 0x8086, IWN_DID_x030_3, "Intel Centrino Advanced-N 6230"		},=0A=
+	{ 0x8086, IWN_DID_x030_4, "Intel Centrino Advanced-N 6230"		},=0A=
+	{ 0x8086, IWN_DID_6150_1, "Intel Centrino Wireless-N + WiMAX 6150"	},=0A=
+	{ 0x8086, IWN_DID_6150_2, "Intel Centrino Wireless-N + WiMAX 6150"	},=0A=
+	{ 0x8086, IWN_DID_2x30_1, "Intel Centrino Wireless-N 2230"		},=0A=
+	{ 0x8086, IWN_DID_2x30_2, "Intel Centrino Wireless-N 2230"		},=0A=
+	{ 0x8086, IWN_DID_130_1, "Intel Centrino Wireless-N 130"		},=0A=
+	{ 0x8086, IWN_DID_130_2, "Intel Centrino Wireless-N 130"		},=0A=
+	{ 0x8086, IWN_DID_100_1, "Intel Centrino Wireless-N 100"		},=0A=
+	{ 0x8086, IWN_DID_100_2, "Intel Centrino Wireless-N 100"		},=0A=
+	{ 0x8086, IWN_DID_4965_1, "Intel Wireless WiFi Link 4965"		},=0A=
+	{ 0x8086, IWN_DID_6x00_1, "Intel Centrino Ultimate-N 6300"		},=0A=
+	{ 0x8086, IWN_DID_6x00_2, "Intel Centrino Advanced-N 6200"		},=0A=
+	{ 0x8086, IWN_DID_4965_2, "Intel Wireless WiFi Link 4965"		},=0A=
+	{ 0x8086, IWN_DID_4965_3, "Intel Wireless WiFi Link 4965"		},=0A=
+	{ 0x8086, IWN_DID_5x00_1, "Intel WiFi Link 5100"			},=0A=
+	{ 0x8086, IWN_DID_4965_4, "Intel Wireless WiFi Link 4965"		},=0A=
+	{ 0x8086, IWN_DID_5x00_3, "Intel Ultimate N WiFi Link 5300"		},=0A=
+	{ 0x8086, IWN_DID_5x00_4, "Intel Ultimate N WiFi Link 5300"		},=0A=
+	{ 0x8086, IWN_DID_5x00_2, "Intel WiFi Link 5100"			},=0A=
+	{ 0x8086, IWN_DID_6x00_3, "Intel Centrino Ultimate-N 6300"		},=0A=
+	{ 0x8086, IWN_DID_6x00_4, "Intel Centrino Advanced-N 6200"		},=0A=
+	{ 0x8086, IWN_DID_5x50_1, "Intel WiMAX/WiFi Link 5350"			},=0A=
+	{ 0x8086, IWN_DID_5x50_2, "Intel WiMAX/WiFi Link 5350"			},=0A=
+	{ 0x8086, IWN_DID_5x50_3, "Intel WiMAX/WiFi Link 5150"			},=0A=
+	{ 0x8086, IWN_DID_5x50_4, "Intel WiMAX/WiFi Link 5150"			},=0A=
 	{ 0, 0, NULL }=0A=
 };=0A=
 =0A=
@@ -517,7 +518,8 @@=0A=
 	IWN_LOCK_INIT(sc);=0A=
 =0A=
 	/* Read hardware revision and attach. */=0A=
-	sc->hw_type =3D (IWN_READ(sc, IWN_HW_REV) >> 4) & 0xf;=0A=
+	sc->hw_type =3D (IWN_READ(sc, IWN_HW_REV) >> IWN_HW_REV_TYPE_SHIFT)=0A=
+	    & IWN_HW_REV_TYPE_MASK;=0A=
 	if (sc->hw_type =3D=3D IWN_HW_REV_TYPE_4965)=0A=
 		error =3D iwn4965_attach(sc, pci_get_device(dev));=0A=
 	else=0A=
Index: sys/dev/iwn/if_iwn_devid.h=0A=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A=
--- sys/dev/iwn/if_iwn_devid.h	(revision 0)=0A=
+++ sys/dev/iwn/if_iwn_devid.h	(working copy)=0A=
@@ -0,0 +1,289 @@=0A=
+/*	$FreeBSD$	*/=0A=
+=0A=
+/*-=0A=
+ * Copyright (c) 2013 Cedric GROSS <cg@cgross.info>=0A=
+ *=0A=
+ * Permission to use, copy, modify, and distribute this software for any=0A=
+ * purpose with or without fee is hereby granted, provided that the =
above=0A=
+ * copyright notice and this permission notice appear in all copies.=0A=
+ *=0A=
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL =
WARRANTIES=0A=
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF=0A=
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE =
FOR=0A=
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY =
DAMAGES=0A=
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN=0A=
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT =
OF=0A=
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.=0A=
+ */=0A=
+=0A=
+#define IWN_HW_REV_TYPE_SHIFT	4=0A=
+#define IWN_HW_REV_TYPE_MASK	0x1f=0A=
+=0A=
+/* Device revision */=0A=
+#define IWN_HW_REV_TYPE_4965	0=0A=
+#define IWN_HW_REV_TYPE_5300	2=0A=
+#define IWN_HW_REV_TYPE_5350	3=0A=
+#define IWN_HW_REV_TYPE_5150	4=0A=
+#define IWN_HW_REV_TYPE_5100	5=0A=
+#define IWN_HW_REV_TYPE_1000	6=0A=
+#define IWN_HW_REV_TYPE_6000	7=0A=
+#define IWN_HW_REV_TYPE_6050	8=0A=
+#define IWN_HW_REV_TYPE_6005	11=0A=
+#define IWN_HW_REV_TYPE_2030	12=0A=
+#define IWN_HW_REV_TYPE_2000	16=0A=
+#define IWN_HW_REV_TYPE_105	17=0A=
+#define IWN_HW_REV_TYPE_135	18=0A=
+=0A=
+ /* =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A=
+ * DEVICE ID BLOCK=0A=
+ * =
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A=
+*/ =0A=
+/*=0A=
+ * =
-------------------------------------------------------------------------=
-=0A=
+ * Device ID for 2x30 series =0A=
+ * =
-------------------------------------------------------------------------=
-=0A=
+ */=0A=
+#define IWN_DID_2x30_1		0x0887 =0A=
+#define IWN_DID_2x30_2		0x0888 =0A=
+/* SubDevice ID */=0A=
+#define IWN_SDID_2x30_1		0x4062=0A=
+#define IWN_SDID_2x30_2		0x4262=0A=
+#define IWN_SDID_2x30_3		0x4462=0A=
+#define IWN_SDID_2x30_4		0x4066=0A=
+#define IWN_SDID_2x30_5		0x4266=0A=
+#define IWN_SDID_2x30_6		0x4466=0A=
+/*=0A=
+ * =
-------------------------------------------------------------------------=
-=0A=
+ * Device ID for 1000 series =0A=
+ * =
-------------------------------------------------------------------------=
-=0A=
+ */=0A=
+#define IWN_DID_1000_1		0x0083=0A=
+#define IWN_DID_1000_2		0x0084=0A=
+/* SubDevice ID */=0A=
+#define IWN_SDID_1000_1		0x1205=0A=
+#define IWN_SDID_1000_2		0x1305=0A=
+#define IWN_SDID_1000_3		0x1225=0A=
+#define IWN_SDID_1000_4		0x1325=0A=
+#define IWN_SDID_1000_5		0x1215=0A=
+#define IWN_SDID_1000_6		0x1315=0A=
+#define IWN_SDID_1000_7		0x1206=0A=
+#define IWN_SDID_1000_8		0x1306=0A=
+#define IWN_SDID_1000_9		0x1226=0A=
+#define IWN_SDID_1000_10	0x1326=0A=
+#define IWN_SDID_1000_11	0x1216=0A=
+#define IWN_SDID_1000_12	0x1316=0A=
+=0A=
+/*=0A=
+ * =
-------------------------------------------------------------------------=
-=0A=
+ * Device ID for 6x00 series =0A=
+ * =
-------------------------------------------------------------------------=
-=0A=
+ */=0A=
+#define IWN_DID_6x00_1		0x422B=0A=
+#define IWN_DID_6x00_2		0x422C=0A=
+#define IWN_DID_6x00_3		0x4238=0A=
+#define IWN_DID_6x00_4		0x4239=0A=
+/* SubDevice ID */=0A=
+#define IWN_SDID_6x00_1		0x1101=0A=
+#define IWN_SDID_6x00_2		0x1121=0A=
+#define IWN_SDID_6x00_3		0x1301=0A=
+#define IWN_SDID_6x00_4		0x1306=0A=
+#define IWN_SDID_6x00_5		0x1307=0A=
+#define IWN_SDID_6x00_6		0x1321=0A=
+#define IWN_SDID_6x00_7		0x1326=0A=
+#define IWN_SDID_6x00_8		0x1111=0A=
+#define IWN_SDID_6x00_9		0x1311=0A=
+#define IWN_SDID_6x00_10	0x1316=0A=
+/*=0A=
+ * =
-------------------------------------------------------------------------=
-=0A=
+ * Device ID for 6x05 series =0A=
+ * =
-------------------------------------------------------------------------=
-=0A=
+ */=0A=
+#define IWN_DID_6x05_1		0x0082=0A=
+#define IWN_DID_6x05_2		0x0085=0A=
+/* SubDevice ID */=0A=
+#define IWN_SDID_6x05_1		0x1301=0A=
+#define IWN_SDID_6x05_2		0x1306=0A=
+#define IWN_SDID_6x05_3		0x1307=0A=
+#define IWN_SDID_6x05_4		0x1321=0A=
+#define IWN_SDID_6x05_5		0x1326=0A=
+#define IWN_SDID_6x05_6		0x1311=0A=
+#define IWN_SDID_6x05_7		0x1316=0A=
+#define IWN_SDID_6x05_8		0xC020=0A=
+#define IWN_SDID_6x05_9		0xC220=0A=
+#define IWN_SDID_6x05_10	0x4820=0A=
+#define IWN_SDID_6x05_11	0x1304=0A=
+#define IWN_SDID_6x05_12	0x1305=0A=
+/*=0A=
+ * =
-------------------------------------------------------------------------=
-=0A=
+ * Device ID for 6050 WiFi/WiMax Series =0A=
+ * =
-------------------------------------------------------------------------=
-=0A=
+ */=0A=
+#define IWN_DID_6050_1		0x0087=0A=
+#define IWN_DID_6050_2		0x0089=0A=
+/* SubDevice ID */=0A=
+#define IWN_SDID_6050_1		0x1301=0A=
+#define IWN_SDID_6050_2		0x1306=0A=
+#define IWN_SDID_6050_3		0x1321=0A=
+#define IWN_SDID_6050_4		0x1326=0A=
+#define IWN_SDID_6050_5		0x1311=0A=
+#define IWN_SDID_6050_6		0x1316=0A=
+/*=0A=
+ * =
-------------------------------------------------------------------------=
-=0A=
+ * Device ID for 6150 Series =0A=
+ * =
-------------------------------------------------------------------------=
-=0A=
+ */=0A=
+#define IWN_DID_6150_1		0x0885=0A=
+#define IWN_DID_6150_2		0x0886=0A=
+/* SubDevice ID */=0A=
+#define IWN_SDID_6150_1		0x1305=0A=
+#define IWN_SDID_6150_2		0x1307=0A=
+#define IWN_SDID_6150_3		0x1325=0A=
+#define IWN_SDID_6150_4		0x1327=0A=
+#define IWN_SDID_6150_5		0x1315=0A=
+#define IWN_SDID_6150_6		0x1317=0A=
+/*=0A=
+ * =
-------------------------------------------------------------------------=
-=0A=
+ * Device ID for 6035 Series =0A=
+ * =
-------------------------------------------------------------------------=
-=0A=
+ */=0A=
+#define IWN_DID_6035_1		0x088E=0A=
+#define IWN_DID_6035_2		0x088F=0A=
+/* SubDevice ID */=0A=
+#define IWN_SDID_6035_1		0x4060=0A=
+#define IWN_SDID_6035_2		0x4260=0A=
+#define IWN_SDID_6035_3		0x4460=0A=
+#define IWN_SDID_6035_4		0x4860=0A=
+/*=0A=
+ * =
-------------------------------------------------------------------------=
-=0A=
+ * Device ID for 1030 and 6030 Series =0A=
+ * =
-------------------------------------------------------------------------=
-=0A=
+ */=0A=
+#define IWN_DID_x030_1		0x008A=0A=
+#define IWN_DID_x030_2		0x008B=0A=
+#define IWN_DID_x030_3		0x0090=0A=
+#define IWN_DID_x030_4		0x0091=0A=
+/* SubDevice ID */=0A=
+#define IWN_SDID_x030_1		0x5305=0A=
+#define IWN_SDID_x030_2		0x5307=0A=
+#define IWN_SDID_x030_3		0x5325=0A=
+#define IWN_SDID_x030_4		0x5327=0A=
+#define IWN_SDID_x030_5		0x5315=0A=
+#define IWN_SDID_x030_6		0x5317=0A=
+#define IWN_SDID_x030_7		0x5211=0A=
+#define IWN_SDID_x030_8		0x5215=0A=
+#define IWN_SDID_x030_9		0x5216=0A=
+#define IWN_SDID_x030_10	0x5201=0A=
+#define IWN_SDID_x030_11	0x5205=0A=
+#define IWN_SDID_x030_12	0x5206=0A=
+#define IWN_SDID_x030_13	0x5207=0A=
+#define IWN_SDID_x030_14	0x5221=0A=
+#define IWN_SDID_x030_15	0x5225=0A=
+#define IWN_SDID_x030_16	0x5226=0A=
+/*=0A=
+ * =
-------------------------------------------------------------------------=
-=0A=
+ * Device ID for 130 Series =0A=
+ * =
-------------------------------------------------------------------------=
-=0A=
+ */=0A=
+#define IWN_DID_130_1		0x0896=0A=
+#define IWN_DID_130_2		0x0897=0A=
+/* SubDevice ID */=0A=
+#define IWN_SDID_130_1		0x5005=0A=
+#define IWN_SDID_130_2		0x5007=0A=
+#define IWN_SDID_130_3		0x5015=0A=
+#define IWN_SDID_130_4		0x5017=0A=
+#define IWN_SDID_130_5		0x5025=0A=
+#define IWN_SDID_130_6		0x5027=0A=
+=0A=
+/*=0A=
+ * =
-------------------------------------------------------------------------=
-=0A=
+ * Device ID for 100 Series =0A=
+ * =
-------------------------------------------------------------------------=
-=0A=
+ */=0A=
+#define IWN_DID_100_1		0x08AE=0A=
+#define IWN_DID_100_2		0x08AF=0A=
+/* SubDevice ID */=0A=
+#define IWN_SDID_100_1		0x1005=0A=
+#define IWN_SDID_100_2		0x1007=0A=
+#define IWN_SDID_100_3		0x1015=0A=
+#define IWN_SDID_100_4		0x1017=0A=
+#define IWN_SDID_100_5		0x1025=0A=
+#define IWN_SDID_100_6		0x1027=0A=
+=0A=
+/*=0A=
+ * =
-------------------------------------------------------------------------=
-=0A=
+ * Device ID for 5x00 Series =0A=
+ * =
-------------------------------------------------------------------------=
-=0A=
+ */=0A=
+#define IWN_DID_5x00_1		0x4232=0A=
+#define IWN_DID_5x00_2		0x4237=0A=
+#define IWN_DID_5x00_3		0x4235=0A=
+#define IWN_DID_5x00_4		0x4236=0A=
+/* SubDevice ID */=0A=
+#define IWN_SDID_5x00_1		0x1201=0A=
+#define IWN_SDID_5x00_2		0x1301=0A=
+#define IWN_SDID_5x00_3		0x1204=0A=
+#define IWN_SDID_5x00_4		0x1304=0A=
+#define IWN_SDID_5x00_5		0x1205=0A=
+#define IWN_SDID_5x00_6		0x1305=0A=
+#define IWN_SDID_5x00_7		0x1206=0A=
+#define IWN_SDID_5x00_8		0x1306=0A=
+#define IWN_SDID_5x00_9		0x1221=0A=
+#define IWN_SDID_5x00_10		0x1321=0A=
+#define IWN_SDID_5x00_11		0x1224=0A=
+#define IWN_SDID_5x00_12		0x1324=0A=
+#define IWN_SDID_5x00_13		0x1225=0A=
+#define IWN_SDID_5x00_14		0x1325=0A=
+#define IWN_SDID_5x00_15		0x1226=0A=
+#define IWN_SDID_5x00_16		0x1326=0A=
+#define IWN_SDID_5x00_17		0x1211=0A=
+#define IWN_SDID_5x00_18		0x1311=0A=
+#define IWN_SDID_5x00_19		0x1214=0A=
+#define IWN_SDID_5x00_20		0x1314=0A=
+#define IWN_SDID_5x00_21		0x1215=0A=
+#define IWN_SDID_5x00_22		0x1315=0A=
+#define IWN_SDID_5x00_23		0x1216=0A=
+#define IWN_SDID_5x00_24		0x1316=0A=
+#define IWN_SDID_5x00_25		0x1021=0A=
+#define IWN_SDID_5x00_26		0x1121=0A=
+#define IWN_SDID_5x00_27		0x1024=0A=
+#define IWN_SDID_5x00_28		0x1124=0A=
+#define IWN_SDID_5x00_29		0x1001=0A=
+#define IWN_SDID_5x00_30		0x1101=0A=
+#define IWN_SDID_5x00_31		0x1004=0A=
+#define IWN_SDID_5x00_32		0x1104=0A=
+#define IWN_SDID_5x00_33		0x1011=0A=
+#define IWN_SDID_5x00_34		0x1111=0A=
+#define IWN_SDID_5x00_35		0x1014=0A=
+#define IWN_SDID_5x00_36		0x1114=0A=
+/*=0A=
+ * =
-------------------------------------------------------------------------=
-=0A=
+ * Device ID for 5x50 Series =0A=
+ * =
-------------------------------------------------------------------------=
-=0A=
+ */=0A=
+#define IWN_DID_5x50_1		0x423A=0A=
+#define IWN_DID_5x50_2		0x423B=0A=
+#define IWN_DID_5x50_3		0x423C=0A=
+#define IWN_DID_5x50_4		0x423D=0A=
+/* SubDevice ID */=0A=
+#define IWN_SDID_5x50_1		0x1001=0A=
+#define IWN_SDID_5x50_2		0x1021=0A=
+#define IWN_SDID_5x50_3		0x1011=0A=
+#define IWN_SDID_5x50_4		0x1201=0A=
+#define IWN_SDID_5x50_5		0x1301=0A=
+#define IWN_SDID_5x50_6		0x1206=0A=
+#define IWN_SDID_5x50_7		0x1306=0A=
+#define IWN_SDID_5x50_8		0x1221=0A=
+#define IWN_SDID_5x50_9		0x1321=0A=
+#define IWN_SDID_5x50_10		0x1211=0A=
+#define IWN_SDID_5x50_11		0x1311=0A=
+#define IWN_SDID_5x50_12		0x1216=0A=
+#define IWN_SDID_5x50_13		0x1316=0A=
+/*=0A=
+ * =
-------------------------------------------------------------------------=
-=0A=
+ * Device ID for 4965 Series =0A=
+ * =
-------------------------------------------------------------------------=
-=0A=
+ */=0A=
+#define IWN_DID_4965_1		0x4229=0A=
+#define IWN_DID_4965_2		0x422d=0A=
+#define IWN_DID_4965_3		0x4230=0A=
+#define IWN_DID_4965_4		0x4233=0A=
Index: sys/dev/iwn/if_iwnreg.h=0A=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A=
--- sys/dev/iwn/if_iwnreg.h	(revision 2)=0A=
+++ sys/dev/iwn/if_iwnreg.h	(working copy)=0A=
@@ -200,19 +200,6 @@=0A=
 #define IWN_GP_CNTRL_SLEEP		(1 << 4)=0A=
 #define IWN_GP_CNTRL_RFKILL		(1 << 27)=0A=
 =0A=
-/* Possible flags for register IWN_HW_REV. */=0A=
-#define IWN_HW_REV_TYPE_SHIFT	4=0A=
-#define IWN_HW_REV_TYPE_MASK	0x000000f0=0A=
-#define IWN_HW_REV_TYPE_4965	0=0A=
-#define IWN_HW_REV_TYPE_5300	2=0A=
-#define IWN_HW_REV_TYPE_5350	3=0A=
-#define IWN_HW_REV_TYPE_5150	4=0A=
-#define IWN_HW_REV_TYPE_5100	5=0A=
-#define IWN_HW_REV_TYPE_1000	6=0A=
-#define IWN_HW_REV_TYPE_6000	7=0A=
-#define IWN_HW_REV_TYPE_6050	8=0A=
-#define IWN_HW_REV_TYPE_6005	11=0A=
-=0A=
 /* Possible flags for register IWN_GIO_CHICKEN. */=0A=
 #define IWN_GIO_CHICKEN_L1A_NO_L0S_RX	(1 << 23)=0A=
 #define IWN_GIO_CHICKEN_DIS_L0S_TIMER	(1 << 29)=0A=

------=_NextPart_000_0077_01CE8C83.EED95CF0--




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?007601ce8c73$2b508cf0$81f1a6d0$>