From owner-freebsd-bugs@FreeBSD.ORG Thu Sep 18 14:20:19 2003 Return-Path: Delivered-To: freebsd-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 92B7216A4D7 for ; Thu, 18 Sep 2003 14:20:19 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id C8DA243FE0 for ; Thu, 18 Sep 2003 14:20:15 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h8ILKFFY027416 for ; Thu, 18 Sep 2003 14:20:15 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h8ILKF6X027415; Thu, 18 Sep 2003 14:20:15 -0700 (PDT) (envelope-from gnats) Resent-Date: Thu, 18 Sep 2003 14:20:15 -0700 (PDT) Resent-Message-Id: <200309182120.h8ILKF6X027415@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jeremy Bingham Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3EE3616A4B3 for ; Thu, 18 Sep 2003 14:11:13 -0700 (PDT) Received: from lagash.satanosphere.com (216-210-218-82.atgi.net [216.210.218.82]) by mx1.FreeBSD.org (Postfix) with ESMTP id D1F8343FAF for ; Thu, 18 Sep 2003 14:11:11 -0700 (PDT) (envelope-from jeremy@lagash.satanosphere.com) Received: (from jeremy@localhost) by lagash.satanosphere.com (8.12.9/8.12.9) id h8ILHwnZ068015; Thu, 18 Sep 2003 14:17:58 -0700 (PDT) (envelope-from jeremy) Message-Id: <200309182117.h8ILHwnZ068015@lagash.satanosphere.com> Date: Thu, 18 Sep 2003 14:17:58 -0700 (PDT) From: Jeremy Bingham To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: kern/56985: Fix for OEM Proxim Harmony PCMCIA wireless cards X-BeenThere: freebsd-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Jeremy Bingham List-Id: Bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Sep 2003 21:20:19 -0000 >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@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: (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: