[PATCH 9/15] pcmcia: hostap_cs.c - 0xc00f,0x0000 conflicts with pcnet_cs

[PATCH 9/15] pcmcia: hostap_cs.c - 0xc00f,0x0000 conflicts with pcnet_cs

[Dominik Brodowski]

From: Komuro <komurojun-mbn@nifty.com>
Date: Mon, 17 Apr 2006 21:41:21 +0900
Subject: [PATCH] pcmcia: hostap_cs.c - 0xc00f,0x0000 conflicts with pcnet_cs

Comment out the ID 0xc00f,0x0000 in hostap_cs.c, as it conflicts with the
pcnet_cs driver.

Signed-off-by: komurojun-mbn@nifty.com
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
---
 drivers/net/wireless/hostap/hostap_cs.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index db03dc2..fbb4189 100644
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -844,7 +844,7 @@ static struct pcmcia_device_id hostap_cs
 	PCMCIA_DEVICE_MANF_CARD(0x02d2, 0x0001),
 	PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x0001),
 	PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x7300),
-	PCMCIA_DEVICE_MANF_CARD(0xc00f, 0x0000),
+/*	PCMCIA_DEVICE_MANF_CARD(0xc00f, 0x0000),    conflict with pcnet_cs */
 	PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002),
 	PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005),
 	PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0010),
-- 
1.4.0

[PATCH 14/15] com20020_cs: more device support

[Dominik Brodowski]

From: Marc Sowen <Marc.Sowen@ibeo-as.de>
Date: Sun, 25 Jun 2006 01:56:24 -0700
Subject: [PATCH] com20020_cs: more device support

Enable the com20020_cs arcnet driver to see the SoHard (now Mercury
Computer Systems Inc.) SH ARC-PCMCIA card.

Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
---
 drivers/net/pcmcia/com20020_cs.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/drivers/net/pcmcia/com20020_cs.c b/drivers/net/pcmcia/com20020_cs.c
index 441de82..48434d7 100644
--- a/drivers/net/pcmcia/com20020_cs.c
+++ b/drivers/net/pcmcia/com20020_cs.c
@@ -387,7 +387,10 @@ static int com20020_resume(struct pcmcia
 }
 
 static struct pcmcia_device_id com20020_ids[] = {
-	PCMCIA_DEVICE_PROD_ID12("Contemporary Control Systems, Inc.", "PCM20 Arcnet Adapter", 0x59991666, 0x95dfffaf),
+	PCMCIA_DEVICE_PROD_ID12("Contemporary Control Systems, Inc.",
+			"PCM20 Arcnet Adapter", 0x59991666, 0x95dfffaf),
+	PCMCIA_DEVICE_PROD_ID12("SoHard AG",
+			"SH ARC PCMCIA", 0xf8991729, 0x69dff0c7),
 	PCMCIA_DEVICE_NULL
 };
 MODULE_DEVICE_TABLE(pcmcia, com20020_ids);
-- 
1.4.0

Re: [PATCH 9/15] pcmcia: hostap_cs.c - 0xc00f, 0x0000 conflicts with pcnet_cs

[Pavel Roskin]

Hi Dominik,

On Fri, 2006-06-30 at 21:59 +0200, Dominik Brodowski wrote:
> -	PCMCIA_DEVICE_MANF_CARD(0xc00f, 0x0000),
> +/*	PCMCIA_DEVICE_MANF_CARD(0xc00f, 0x0000),    conflict with pcnet_cs */

That's fine if we also add symbolic names.  I could identify two
hostap_cs compatible cards using this ID :

card "Allied Telesyn AT-WCL452"
 version "Allied Telesyn", "AT-WCL452 Wireless PCMCIA Radio", "Ver.
1.00"
 manfid 0xc00f, 0x0000
 bind "hostap_cs"

card "corega WL PCCL-11"
 version "corega", "WL PCCL-11", "ISL37300P", "RevA"
 manfid 0xc00f, 0x0000
 bind "hostap_cs"

(from http://www.handhelds.org/hypermail/oe-commits/41/4121.html)

-- 
Regards,
Pavel Roskin

Re: [PATCH 9/15] pcmcia: hostap_cs.c - 0xc00f, 0x0000 conflicts with pcnet_cs

[Dominik Brodowski]

Hi Pavel,

On Fri, Jun 30, 2006 at 05:18:43PM -0400, Pavel Roskin wrote:
> On Fri, 2006-06-30 at 21:59 +0200, Dominik Brodowski wrote:
> > -	PCMCIA_DEVICE_MANF_CARD(0xc00f, 0x0000),
> > +/*	PCMCIA_DEVICE_MANF_CARD(0xc00f, 0x0000),    conflict with pcnet_cs */
> 
> That's fine if we also add symbolic names.  I could identify two
> hostap_cs compatible cards using this ID :
> 
> card "Allied Telesyn AT-WCL452"
>  version "Allied Telesyn", "AT-WCL452 Wireless PCMCIA Radio", "Ver.
> 1.00"
>  manfid 0xc00f, 0x0000
>  bind "hostap_cs"
> 
> card "corega WL PCCL-11"
>  version "corega", "WL PCCL-11", "ISL37300P", "RevA"
>  manfid 0xc00f, 0x0000
>  bind "hostap_cs"

Like this?

From: Dominik Brodowski <linux@dominikbrodowski.net>
Date: Sun, 2 Jul 2006 21:21:51 +0200
Subject: [PATCH] pcmcia: add more IDs to hostap_cs.c

As a replacement for the broad manufactor/card ID match we commented out
because of conflicts with pcnet_cs, add two product ID matches.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
---
 drivers/net/wireless/hostap/hostap_cs.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index 52e6df5..f39d735 100644
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -886,6 +886,13 @@ static struct pcmcia_device_id hostap_cs
 	PCMCIA_DEVICE_PROD_ID123(
 		"U.S. Robotics", "IEEE 802.11b PC-CARD", "Version 01.02",
 		0xc7b8df9d, 0x1700d087, 0x4b74baa0),
+	PCMCIA_DEVICE_PROD_ID123(
+		"Allied Telesyn", "AT-WCL452 Wireless PCMCIA Radio",
+		"Ver. 1.00",
+		0x5cd01705, 0x4271660f, 0x9d08ee12),
+	PCMCIA_DEVICE_PROD_ID1234(
+		"corega", "WL PCCL-11", "ISL37300P", "RevA",
+		0xa21501a, 0x59868926, 0xc9049a39, 0x57a66194),
 	PCMCIA_DEVICE_NULL
 };
 MODULE_DEVICE_TABLE(pcmcia, hostap_cs_ids);
-- 
1.4.0

Re: [PATCH 9/15] pcmcia: hostap_cs.c - 0xc00f, 0x0000 conflicts with pcnet_cs

[Pavel Roskin]

Hi Dominik,

On Mon, 2006-07-03 at 10:56 +0200, Dominik Brodowski wrote:

> Like this?

Yes, but I usually drop revisions from the matched IDs, especially in
presence of the chip ID.  Why would we exclude "RevB" if it happens to
be ISL37300P based?  So the new entries would be:

	PCMCIA_DEVICE_PROD_ID123(
		"Allied Telesyn", "AT-WCL452 Wireless PCMCIA Radio",
		"Ver. 1.00",
		0x5cd01705, 0x4271660f, 0x9d08ee12),
	PCMCIA_DEVICE_PROD_ID123(
		"corega", "WL PCCL-11", "ISL37300P",
		0xa21501a, 0x59868926, 0xc9049a39),

-- 
Regards,
Pavel Roskin