kern/56985: Fix for OEM Proxim Harmony PCMCIA wireless cards

[Jeremy Bingham]

>Number:         56985
>Category:       kern
>Synopsis:       Fix for OEM Proxim Harmony PCMCIA wireless cards
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Sep 18 14:20:15 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Jeremy Bingham
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
>Environment:
System: FreeBSD akkad.satanosphere.com 5.1-CURRENT FreeBSD 5.1-CURRENT #1: Thu S
ep 18 12:20:09 PDT 2003 jeremy at akkad.satanosphere.com:/usr/src/sys/i386/compile/
AKKAD i386

	
>Description:
	This particular kind of Proxim Harmony PCMCIA wireless card had a different product identifier than a normal Harmony card. If the card was inserted, it would say output this:
	pccard0: <unknown card> (manufacturer=0x0126, product=0x0002) at function 0
	pccard0:    CIS info: PROXIM, LAN PC CARD HARMONY 80211B,
>How-To-Repeat:
	Find one of these cards and insert it into a FreeBSD machine with a PCMCIA slot.
>Fix:

	These patches add entries for this card into the kernel. After these patches are applied and the kernel rebuilt, the card works fine. It comes up and a valid wi0 interface, and will work as a network monitor with the version of dstumbler from the 0.3-beta version of bsd-airtools.

--- if_wi_pccard.c.diff begins here ---
--- if_wi_pccard.c	Thu Sep 18 12:00:51 2003
+++ newif_wi_pccard.c	Thu Sep 18 12:00:39 2003
@@ -163,6 +163,7 @@
 	PCMCIA_CARD(NOKIA, C110_WLAN, 0),
 	PCMCIA_CARD(PLANEX_2, GWNS11H, 0),
 	PCMCIA_CARD(PROXIM, RANGELANDS_8430, 0),
+        PCMCIA_CARD(PROXIM, HARMONY_OEM, 0),
 	PCMCIA_CARD(SAMSUNG, SWL_2000N, 0),
 	PCMCIA_CARD(SIEMENS, SS1021, 0),
 	PCMCIA_CARD(SIMPLETECH, SPECTRUM24_ALT, 0),
--- if_wi_pccard.c.diff ends here ---

--- pccarddev.diff begins here ---
--- pccarddevs	Thu Sep 18 11:58:16 2003
+++ newpccarddevs	Thu Sep 18 11:57:59 2003
@@ -375,6 +375,7 @@
 product PROXIM ROAMABOUT_2400FH	0x1058 Digital RoamAbout 2400FH
 product PROXIM RANGELAN2_7401	0x1158 Proxim RangeLAN2 7401
 product PROXIM RANGELANDS_8430	0x8000 Proxim RangeLAN-DS 8430
+product PROXIM HARMONY_OEM      0x0002 LAN PC CARD HARMONY 80211B
 
 /* Psion */
 product PSION GOLDCARD		0x0020 Psion Gold Card
--- pccarddev.diff ends here ---

--- pccarddev.h.diff begins here ---
--- pccarddevs.h	Thu Sep 18 11:58:31 2003
+++ newpccarddevs.h	Thu Sep 18 11:58:08 2003
@@ -636,6 +636,10 @@
 #define	PCMCIA_CIS_PROXIM_RANGELANDS_8430	{ NULL, NULL, NULL, NULL }
 #define	PCMCIA_PRODUCT_PROXIM_RANGELANDS_8430	0x8000
 #define	PCMCIA_STR_PROXIM_RANGELANDS_8430	"Proxim RangeLAN-DS 8430"
+#define PCMCIA_CIS_PROXIM_HARMONY_OEM		{ NULL, NULL, NULL, NULL }
+#define PCMCIA_PRODUCT_PROXIM_HARMONY_OEM	0x0002
+#define PCMCIA_STR_PROXIM_HARMONY_OEM		"LAN PC CARD HARMONY 80211B"
+
 
 /* Psion */
 #define	PCMCIA_CIS_PSION_GOLDCARD	{ NULL, NULL, NULL, NULL }
--- pccarddev.h.diff ends here ---

--- pccard.conf.diff begins here ---
--- pccard.conf	Thu Sep 18 11:53:29 2003
+++ newpccard.conf	Thu Sep 18 11:53:15 2003
@@ -2159,6 +2159,12 @@
 	insert	/etc/pccard_ether $device start
 	remove	/etc/pccard_ether $device stop
 
+# Proxim Harmony OEM card
+card "PROXIM" "LAN PC CARD HARMONY 80211B"
+        config 0x1 "wi" ?
+        insert  /etc/pccard_ether $device start
+        remove  /etc/pccard_ether $device stop
+
 # SAMSUNG SWL-2000P PCI Card
 card "SAMSUNG" "11Mbps WLAN PCI Card"
         config	auto "wi" ?
--- pccard.conf.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: