Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/dev/pci/if_iwn.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/dev/pci/if_iwn.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.52.2.1
retrieving revision 1.53
diff -u -p -r1.52.2.1 -r1.53
--- src/sys/dev/pci/if_iwn.c	2011/06/06 09:08:13	1.52.2.1
+++ src/sys/dev/pci/if_iwn.c	2011/05/15 13:56:20	1.53
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_iwn.c,v 1.52.2.1 2011/06/06 09:08:13 jruoho Exp $	*/
+/*	$NetBSD: if_iwn.c,v 1.53 2011/05/15 13:56:20 christos Exp $	*/
 /*	$OpenBSD: if_iwn.c,v 1.96 2010/05/13 09:25:03 damien Exp $	*/
 
 /*-
@@ -22,7 +22,7 @@
  * adapters.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.52.2.1 2011/06/06 09:08:13 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.53 2011/05/15 13:56:20 christos Exp $");
 
 #define IWN_USE_RBUF	/* Use local storage for RX */
 #undef IWN_HWCRYPTO	/* XXX does not even compile yet */
@@ -42,7 +42,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1
 
 #include <dev/sysmon/sysmonvar.h>
 
-#include <sys/bus.h>
+#include <machine/bus.h>
 #include <machine/endian.h>
 #include <machine/intr.h>
 
@@ -73,12 +73,8 @@ __KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1
 #include <dev/pci/if_iwnvar.h>
 
 static const pci_product_id_t iwn_devices[] = {
-	PCI_PRODUCT_INTEL_WIFI_LINK_1030_1,
-	PCI_PRODUCT_INTEL_WIFI_LINK_1030_2,
 	PCI_PRODUCT_INTEL_WIFI_LINK_4965_1,
 	PCI_PRODUCT_INTEL_WIFI_LINK_4965_2,
-	PCI_PRODUCT_INTEL_WIFI_LINK_4965_3,
-	PCI_PRODUCT_INTEL_WIFI_LINK_4965_4,
 	PCI_PRODUCT_INTEL_WIFI_LINK_5100_1,
 	PCI_PRODUCT_INTEL_WIFI_LINK_5100_2,
 	PCI_PRODUCT_INTEL_WIFI_LINK_5150_1,
@@ -97,8 +93,19 @@ static const pci_product_id_t iwn_device
 	PCI_PRODUCT_INTEL_WIFI_LINK_6050_2X2_2,
 	PCI_PRODUCT_INTEL_WIFI_LINK_6005_2X2_1,
 	PCI_PRODUCT_INTEL_WIFI_LINK_6005_2X2_2,
-	PCI_PRODUCT_INTEL_WIFI_LINK_6230_1,
-	PCI_PRODUCT_INTEL_WIFI_LINK_6230_2,
+#ifdef notyet
+	/*
+	 * XXX NetBSD: the 6005A replaces the two 6005, above
+	 * (see OpenBSD rev 1.96).
+	 */
+	PCI_PRODUCT_INTEL_WIFI_LINK_6005A_2X2_1,
+	PCI_PRODUCT_INTEL_WIFI_LINK_6005A_2X2_2,
+	PCI_PRODUCT_INTEL_WIFI_LINK_6005B_1X1_1,
+	PCI_PRODUCT_INTEL_WIFI_LINK_6005B_1X1_2,
+	PCI_PRODUCT_INTEL_WIFI_LINK_6005B_2X2_1,
+	PCI_PRODUCT_INTEL_WIFI_LINK_6005B_2X2_2,
+	PCI_PRODUCT_INTEL_WIFI_LINK_6005B_2X2_3
+#endif
 };
 
 /*
@@ -149,6 +156,7 @@ static void	iwn5000_ict_reset(struct iwn
 static int	iwn_read_eeprom(struct iwn_softc *);
 static void	iwn4965_read_eeprom(struct iwn_softc *);
 
+#define IWN_DEBUG 1
 #ifdef IWN_DEBUG
 static void	iwn4965_print_power_group(struct iwn_softc *, int);
 #endif
@@ -716,11 +724,11 @@ iwn5000_attach(struct iwn_softc *sc, pci
 		break;
 	case IWN_HW_REV_TYPE_6050:
 		sc->limits = &iwn6000_sensitivity_limits;
-		sc->fwname = "iwlwifi-6050-5.ucode";
+		sc->fwname = "iwlwifi-6050-2.ucode";
 		break;
 	case IWN_HW_REV_TYPE_6005:
 		sc->limits = &iwn6000_sensitivity_limits;
-		sc->fwname = "iwlwifi-6000g2a-5.ucode";
+		sc->fwname = "iwlwifi-6005-2.ucode";
 		break;
 	default:
 		aprint_normal(": adapter type %d not supported\n", sc->hw_type);