>Number:         29482
>Category:       kern
>Synopsis:       Add support for Microsoft MN-520 PCMCIA WLAN card
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    kern-bug-people
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon Feb 21 15:41:00 +0000 2005
>Originator:     Kirk Strauser <kirk@strauser.com>
>Release:        NetBSD 2.0
>Organization:
The Strauser Group
	
>Environment:
	
	
System: NetBSD woozle.honeypot.net 2.0 NetBSD 2.0 (WOOZLE) #0: Sat Feb 19 15:30:14 CST 2005 root@woozle.honeypot.net:/usr/src/sys/arch/i386/compile/WOOZLE i386
Architecture: i386
Machine: i386
>Description:
This patch adds support for the Microsoft MN-520 PCMCIA WLAN (Prism) card.
	
>How-To-Repeat:
	
>Fix:
	

Common subdirectories: pcmcia-old/CVS and pcmcia/CVS
diff -u pcmcia-old/if_wi_pcmcia.c pcmcia/if_wi_pcmcia.c
--- pcmcia-old/if_wi_pcmcia.c	2004-01-24 20:42:49.000000000 -0600
+++ pcmcia/if_wi_pcmcia.c	2005-02-19 10:01:12.000000000 -0600
@@ -179,6 +179,11 @@
 	  PCMCIA_CIS_NANOSPEED_PRISM2,
 	  PCMCIA_STR_NANOSPEED_PRISM2 },
 
+	{ PCMCIA_VENDOR_MICROSOFT,
+	  PCMCIA_PRODUCT_MICROSOFT_MN_520,
+	  PCMCIA_CIS_MICROSOFT_MN_520,
+	  PCMCIA_STR_MICROSOFT_MN_520 },
+
 	{ PCMCIA_VENDOR_ELSA,
 	  PCMCIA_PRODUCT_ELSA_XI300_IEEE,
 	  PCMCIA_CIS_ELSA_XI300_IEEE,
diff -u pcmcia-old/pcmciadevs pcmcia/pcmciadevs
--- pcmcia-old/pcmciadevs	2004-02-01 06:35:59.000000000 -0600
+++ pcmcia/pcmciadevs	2005-02-19 09:59:20.000000000 -0600
@@ -90,6 +90,7 @@
 vendor BUFFALO			0x026f	BUFFALO (Melco Corporation)
 vendor LINKSYS2			0x0274  The Linksys Group
 vendor IODATA2			0x028a	I-O DATA
+vendor MICROSOFT		0x02d2	Microsoft Corporation
 vendor BREEZECOM		0x0a02	BreezeCOM
 vendor NEWMEDIA2		0x10cd	NewMedia
 vendor ACTIONTEC		0x1668	ACTIONTEC
@@ -271,6 +272,9 @@
 /* Melco Products */
 product MELCO LPC3_TX		0xc1ab Melco LPC3-TX
 
+/* Microsoft Products */
+product MICROSOFT MN_520	0x0001 Microsoft MN-520 WLAN Card
+
 /* Motorola Products */
 product MOTOROLA POWER144	0x0105 Motorola Power 14.4 Modem
 product MOTOROLA PM100C		0x0302 Motorola Personal Messenger 100C CDPD Modem
diff -u pcmcia-old/pcmciadevs.h pcmcia/pcmciadevs.h
--- pcmcia-old/pcmciadevs.h	2004-02-01 06:38:24.000000000 -0600
+++ pcmcia/pcmciadevs.h	2005-02-19 09:59:45.000000000 -0600
@@ -1,4 +1,4 @@
-/*	$NetBSD: pcmciadevs.h,v 1.195 2004/02/01 12:38:24 uwe Exp $	*/
+/*	$NetBSD$	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -97,6 +97,7 @@
 #define	PCMCIA_VENDOR_BUFFALO	0x026f	/* BUFFALO (Melco Corporation) */
 #define	PCMCIA_VENDOR_LINKSYS2	0x0274	/* The Linksys Group */
 #define	PCMCIA_VENDOR_IODATA2	0x028a	/* I-O DATA */
+#define	PCMCIA_VENDOR_MICROSOFT	0x02d2	/* Microsoft Corporation */
 #define	PCMCIA_VENDOR_BREEZECOM	0x0a02	/* BreezeCOM */
 #define	PCMCIA_VENDOR_NEWMEDIA2	0x10cd	/* NewMedia */
 #define	PCMCIA_VENDOR_ACTIONTEC	0x1668	/* ACTIONTEC */
@@ -452,6 +453,11 @@
 #define	PCMCIA_PRODUCT_MELCO_LPC3_TX	0xc1ab
 #define	PCMCIA_STR_MELCO_LPC3_TX	"Melco LPC3-TX"
 
+/* Microsoft Products */
+#define	PCMCIA_CIS_MICROSOFT_MN_520	{ NULL, NULL, NULL, NULL }
+#define	PCMCIA_PRODUCT_MICROSOFT_MN_520	0x0001
+#define	PCMCIA_STR_MICROSOFT_MN_520	"Microsoft MN-520 WLAN Card"
+
 /* Motorola Products */
 #define	PCMCIA_CIS_MOTOROLA_POWER144	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_MOTOROLA_POWER144	0x0105
diff -u pcmcia-old/pcmciadevs_data.h pcmcia/pcmciadevs_data.h
--- pcmcia-old/pcmciadevs_data.h	2004-02-01 06:38:24.000000000 -0600
+++ pcmcia/pcmciadevs_data.h	2005-02-19 09:59:45.000000000 -0600
@@ -1,4 +1,4 @@
-/*	$NetBSD: pcmciadevs_data.h,v 1.195 2004/02/01 12:38:24 uwe Exp $	*/
+/*	$NetBSD$	*/
 
 /*
  * THIS FILE AUTOMATICALLY GENERATED.  DO NOT EDIT.
@@ -673,6 +673,13 @@
 	    "Melco LPC3-TX",	}
 	,
 	{
+	    PCMCIA_VENDOR_MICROSOFT, PCMCIA_PRODUCT_MICROSOFT_MN_520,
+	    PCMCIA_CIS_MICROSOFT_MN_520,
+	    0,
+	    "Microsoft Corporation",
+	    "Microsoft MN-520 WLAN Card",	}
+	,
+	{
 	    PCMCIA_VENDOR_MOTOROLA, PCMCIA_PRODUCT_MOTOROLA_POWER144,
 	    PCMCIA_CIS_MOTOROLA_POWER144,
 	    0,
@@ -2010,6 +2017,14 @@
 	    NULL,
 	},
 	{
+	    PCMCIA_VENDOR_MICROSOFT,
+	    PCMCIA_KNOWNDEV_NOPROD,
+	    PCMCIA_CIS_INVALID,
+	    0,
+	    "Microsoft Corporation",
+	    NULL,
+	},
+	{
 	    PCMCIA_VENDOR_BREEZECOM,
 	    PCMCIA_KNOWNDEV_NOPROD,
 	    PCMCIA_CIS_INVALID,

>Unformatted: