From administrator@Vitsch.net  Tue Feb 22 09:07:43 2005
Return-Path: <administrator@Vitsch.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4B27416A4CE
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 22 Feb 2005 09:07:43 +0000 (GMT)
Received: from amsfep20-int.chello.nl (amsfep20-int.chello.nl [213.46.243.18])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C16FE43D46
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 22 Feb 2005 09:07:41 +0000 (GMT)
	(envelope-from administrator@Vitsch.net)
Received: from Vitsch.net ([62.195.39.211]) by amsfep20-int.chello.nl
          (InterMail vM.6.01.04.01 201-2131-118-101-20041129) with ESMTP
          id <20050222090739.NKKU1891.amsfep20-int.chello.nl@Vitsch.net>
          for <FreeBSD-gnats-submit@freebsd.org>;
          Tue, 22 Feb 2005 10:07:39 +0100
Received: (from root@localhost)
	by Vitsch.net (8.12.3p2/8.11.3) id j1M97SJ3007992;
	Tue, 22 Feb 2005 10:07:28 +0100 (CET)
	(envelope-from administrator)
Message-Id: <200502220907.j1M97SJ3007992@Vitsch.net>
Date: Tue, 22 Feb 2005 10:07:28 +0100 (CET)
From: "Daan Vreeken [PA4DAN]" <Danovitsch@Vitsch.net>
Reply-To: "Daan Vreeken [PA4DAN]" <Danovitsch@Vitsch.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] Add the APDL-325 WLAN pccard to wi(4)
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         77913
>Category:       kern
>Synopsis:       [wi] [patch] Add the APDL-325 WLAN pccard to wi(4)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-net
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Feb 22 09:10:18 GMT 2005
>Closed-Date:    Fri Aug 06 19:14:34 UTC 2010
>Last-Modified:  Fri Aug 06 19:14:34 UTC 2010
>Originator:     Daan Vreeken [PA4DAN]
>Release:        FreeBSD 5.3-RELEASE i386
>Organization:
Vitsch Electronics
>Environment:
System: FreeBSD Racebeest.Danovitsch.LAN 5.3-RELEASE FreeBSD 5.3-RELEASE #4: Fri Feb 4 17:20:30 CET 2005 root@Racebeest.Danovitsch.LAN:/usr/src.5.3-release/sys/i386/compile/Laptop i386

>Description:
	The APDL-325 is a Wireless LAN pcmcia adapter that sits inside
	some Billion Access Points. Currently wi(4) doesn't recognise the
	adapter :

	pccard0: <unknown card> (manufacturer=0xd601, product=0x0006) at
	 function 0
	pccard0:    CIS info: Z-Com, LANEscape/APDL-325,

>How-To-Repeat:
	Plug a APDL-325 pcmcia card into FreeBSD.
>Fix:
	Apply the following patches to the src tree. The patches are against
	FreeBSD 5.3-RELEASE, but the device also isn't known on -current.
	After recompiling the wi(4) driver will detect the device and work
	properly. The patch to wi.4 also adds the ELSA XI325 to the manual
	page, since it wasn't listed in the man page but is in the driver.

	After patching the APDL325 will attach with the following dmesg
	output :
	wi0: <Z-Com LANEscape/APDL-325> at port 0x100-0x13f irq 11 function
	 0 config 1 on pccard0
	wi0: 802.11 address: 00:60:b3:73:ff:d8
	wi0: using testing against 800c
	RF:PRISM2.5 MAC:ISL3873
	wi0: Intersil Firmware: Primary (1.0.7), Station (1.3.6)
	wi0: 11b rates: 1Mbps 2Mbps 5.5Mbps 11Mbps


--- pccarddevs.diff begins here ---
*** pccarddevs.org	Sat Jan  5 20:35:42 1980
--- pccarddevs	Tue Feb 15 11:38:18 2005
***************
*** 241,246 ****
--- 241,247 ----
  product ELSA XI300_IEEE		0x0002 XI300 Wireless LAN
  product ELSA XI800_IEEE		0x0004 XI800 CF Wireless LAN
  product ELSA XI325_IEEE		0x0005 XI325 Wireless LAN
+ product ELSA ADPL325_IEEE	0x0006 ADPL325 Wireless LAN
  
  /* EMTAC */
  product EMTAC WLAN		0x0002	EMTAC A2424i 11Mbps WLAN Card
--- pccarddevs.diff ends here ---

--- if_wi_pccard.c.diff begins here ---
*** if_wi_pccard.c.org	Tue Feb 15 11:38:10 2005
--- if_wi_pccard.c	Tue Feb 15 11:38:10 2005
***************
*** 148,153 ****
--- 148,154 ----
  	PCMCIA_CARD(ELSA, XI300_IEEE, 0),
  	PCMCIA_CARD(ELSA, XI325_IEEE, 0),
  	PCMCIA_CARD(ELSA, XI800_IEEE, 0),
+ 	PCMCIA_CARD(ELSA, APDL325_IEEE, 0),
  	PCMCIA_CARD(EMTAC, WLAN, 0),
  	PCMCIA_CARD(ERICSSON, WIRELESSLAN, 0),
  	PCMCIA_CARD(GEMTEK, WLAN, 0),
--- if_wi_pccard.c.diff ends here ---

--- wi.4.diff begins here ---
*** wi.4.org	Tue Feb 22 09:36:17 2005
--- wi.4	Tue Feb 22 09:42:42 2005
***************
*** 174,181 ****
--- 174,183 ----
  Dlink DWL520	Prism-2.5	PCI
  Dlink DWL650	Prism-2.5	PCMCIA
  ELECOM Air@Hawk/LD-WL11/PCC		PCMCIA
+ ELSA APDL325	Prism-2.5	PCMCIA
  ELSA MC-11		PCMCIA
  ELSA XI300	Prism-II	PCMCIA
+ ELSA XI325		PCMCIA
  ELSA XI800	Prism-II	CF
  EMTAC A2424i	Prism-II	PCMCIA
  Ericsson Wireless LAN CARD C11	Spectrum24	PCMCIA
--- wi.4.diff ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->freebsd-net 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Wed Mar 5 03:37:41 UTC 2008 
Responsible-Changed-Why:  
Over to maintainer(s). 

http://www.freebsd.org/cgi/query-pr.cgi?pr=77913 
State-Changed-From-To: open->patched 
State-Changed-By: imp 
State-Changed-When: Tue Aug 26 22:52:32 MDT 2008 
State-Changed-Why:  
Committed to head. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=77913 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/77913: commit references a PR
Date: Wed, 27 Aug 2008 04:53:30 +0000 (UTC)

 imp         2008-08-27 04:52:27 UTC
 
   FreeBSD src repository
 
   Modified files:
     sys/dev/pccard       pccarddevs 
     sys/dev/wi           if_wi_pccard.c 
   Log:
   SVN rev 182236 on 2008-08-27 04:52:27Z by imp
   
   The APDL-325 is a Wireless LAN pcmcia adapter that sits inside some
   Billion Access Points.  Fix wi(4) to recognise the adapter.
   
   PR:             77913
   Submitted by:   Daan Vreeken [PA4DAN]
   MFC after:      3 days
   
   Revision  Changes    Path
   1.135     +1 -0      src/sys/dev/pccard/pccarddevs
   1.62      +1 -0      src/sys/dev/wi/if_wi_pccard.c
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/77913: commit references a PR
Date: Wed, 27 Aug 2008 04:56:01 +0000 (UTC)

 imp         2008-08-27 04:55:37 UTC
 
   FreeBSD src repository
 
   Modified files:
     share/man/man4       wi.4 
   Log:
   SVN rev 182238 on 2008-08-27 04:55:37Z by imp
   
   Add recent ELSA additions to wi(4), plus make sure the list matches
   the driver for ELSA.
   
   PR:             77913
   Submitted by:   Daan Vreeken
   MFC after:      3 days
   
   Revision  Changes    Path
   1.79      +3 -0      src/share/man/man4/wi.4
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: kern/77913: commit references a PR
Date: Fri,  6 Aug 2010 18:57:22 +0000 (UTC)

 Author: bschmidt
 Date: Fri Aug  6 18:57:09 2010
 New Revision: 210949
 URL: http://svn.freebsd.org/changeset/base/210949
 
 Log:
   MFC r182236,r182238,182250,182251:
   - Add recent ELSA additions to wi(4), plus make sure the list matches
     the driver for ELSA.
   - The APDL-325 is a Wireless LAN pcmcia adapter that sits inside some
     Billion Access Points.  Fix wi(4) to recognise the adapter.
   - Remove opt_wi.h
   
   PR:		kern/77913
   Submitted by:	Daan Vreeken [PA4DAN] <Danovitsch at Vitsch.net>
 
 Modified:
   stable/7/share/man/man4/wi.4
   stable/7/sys/dev/pccard/pccarddevs
   stable/7/sys/dev/wi/if_wi_pccard.c
   stable/7/sys/modules/wi/Makefile
 Directory Properties:
   stable/7/share/man/man4/   (props changed)
   stable/7/sys/   (props changed)
   stable/7/sys/cddl/contrib/opensolaris/   (props changed)
   stable/7/sys/contrib/dev/acpica/   (props changed)
   stable/7/sys/contrib/pf/   (props changed)
 
 Modified: stable/7/share/man/man4/wi.4
 ==============================================================================
 --- stable/7/share/man/man4/wi.4	Fri Aug  6 18:55:49 2010	(r210948)
 +++ stable/7/share/man/man4/wi.4	Fri Aug  6 18:57:09 2010	(r210949)
 @@ -189,6 +189,9 @@ Dlink DWL650	Prism-2.5	PCMCIA
  ELECOM Air@Hawk/LD-WL11/PCC		PCMCIA
  ELSA MC-11		PCMCIA
  ELSA XI300	Prism-II	PCMCIA
 +ELSA XI325	Prism-2.5	PCMCIA
 +ELSA APDL325	Prism-2.5	PCMCIA
 +ELSA XI330	Prism-3	PCMCIA
  ELSA XI800	Prism-II	CF
  EMTAC A2424i	Prism-II	PCMCIA
  Ericsson Wireless LAN CARD C11	Spectrum24	PCMCIA
 
 Modified: stable/7/sys/dev/pccard/pccarddevs
 ==============================================================================
 --- stable/7/sys/dev/pccard/pccarddevs	Fri Aug  6 18:55:49 2010	(r210948)
 +++ stable/7/sys/dev/pccard/pccarddevs	Fri Aug  6 18:57:09 2010	(r210949)
 @@ -320,6 +320,7 @@ product ELSA MC2_IEEE		0x0001 AirLancer 
  product ELSA XI300_IEEE		0x0002 XI300 Wireless LAN
  product ELSA XI800_IEEE		0x0004 XI800 CF Wireless LAN
  product ELSA XI325_IEEE		0x0005 XI325 Wireless LAN
 +product ELSA APDL325_IEEE	0x0006 ADPL325 Wireless LAN
  product ELSA XI330_IEEE		0x0010 XI330 Wireless LAN
  product ELSA WIFI_FLASH		0x0101 802.11b plus 128MB Flash
  
 
 Modified: stable/7/sys/dev/wi/if_wi_pccard.c
 ==============================================================================
 --- stable/7/sys/dev/wi/if_wi_pccard.c	Fri Aug  6 18:55:49 2010	(r210948)
 +++ stable/7/sys/dev/wi/if_wi_pccard.c	Fri Aug  6 18:57:09 2010	(r210949)
 @@ -41,8 +41,6 @@
  #include <sys/cdefs.h>
  __FBSDID("$FreeBSD$");
  
 -#include "opt_wi.h"
 -
  #include <sys/param.h>
  #include <sys/kernel.h>
  #include <sys/socket.h>
 @@ -126,6 +124,7 @@ static const struct pccard_product wi_pc
  	PCMCIA_CARD(DLINK, DWL650H),
  	PCMCIA_CARD(ELSA, XI300_IEEE),
  	PCMCIA_CARD(ELSA, XI325_IEEE),
 +	PCMCIA_CARD(ELSA, APDL325_IEEE),
  	PCMCIA_CARD(ELSA, XI330_IEEE),
  	PCMCIA_CARD(ELSA, XI800_IEEE),
  	PCMCIA_CARD(ELSA, WIFI_FLASH),
 
 Modified: stable/7/sys/modules/wi/Makefile
 ==============================================================================
 --- stable/7/sys/modules/wi/Makefile	Fri Aug  6 18:55:49 2010	(r210948)
 +++ stable/7/sys/modules/wi/Makefile	Fri Aug  6 18:57:09 2010	(r210949)
 @@ -3,12 +3,7 @@
  .PATH: ${.CURDIR}/../../dev/wi
  
  KMOD=	if_wi
 -SRCS=	opt_wi.h if_wi.c if_wi_pccard.c if_wi_pci.c \
 +SRCS=	if_wi.c if_wi_pccard.c if_wi_pci.c \
  	card_if.h device_if.h bus_if.h pci_if.h pccarddevs.h
  
 -.if !defined(KERNBUILDDIR)
 -opt_wi.h:
 -	echo "#define WI_SYMBOL_FIRMWARE 1" > ${.TARGET}
 -.endif
 -
  .include <bsd.kmod.mk>
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: patched->closed 
State-Changed-By: bschmidt 
State-Changed-When: Fri Aug 6 19:13:24 UTC 2010 
State-Changed-Why:  
Patch is included head, stable/8 and stable/7, thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=77913 
>Unformatted:
