Subject: kern/18961: Planex cardbus enet card support
To: None <gnats-bugs@gnats.netbsd.org>
From: None <prlw1@cam.ac.uk>
List: netbsd-bugs
Date: 11/07/2002 12:18:21
>Number:         18961
>Category:       kern
>Synopsis:       Support Planex FNW-3606-TX cardbus ethernet card
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    kern-bug-people
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Thu Nov 07 04:19:00 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     Patrick Welche
>Release:        NetBSD 1.6K
>Organization:
	
>Environment:
	
	
NetBSD-1.6K/i386
>Description:
Support Planex FNW-3606-TX cardbus ethernet card.
>How-To-Repeat:
Pop card in :-)
>Fix:
Sorry about the silly <TAB> noise.. Did get rid of the "DO NOT EDIT BY HAND"
part of the patch..

Index: cardbusdevs
===================================================================
RCS file: /cvsroot/syssrc/sys/dev/cardbus/cardbusdevs,v
retrieving revision 1.21
diff -c -r1.21 cardbusdevs
*** cardbusdevs	2002/02/17 21:20:46	1.21
--- cardbusdevs	2002/11/07 12:09:58
***************
*** 50,55 ****
--- 50,56 ----
  vendor ACCTON		0x1113	Accton Technology
  vendor XIRCOM		0x115d	Xircom
  vendor DLINK		0x1186	D-Link Systems
+ vendor PLANEX		0x14ea	Planex Communications Inc
  vendor COREGA		0x1259	Corega
  vendor ALLIEDTELESYN	0x1259	Allied Telesyn International
  vendor ABOCOM		0x13d1	AboCom Systems
***************
*** 74,80 ****
  
  /* 3COM Products */
  product 3COM 3C575TX	0x5057	3c575-TX
! product 3COM 3C575BTX	0x5157  3CCFE575BT
  product 3COM 3C575CTX	0x5257	3CCFE575CT
  product 3COM 3C656_E	0x6560	3CCFEM656 10/100 Ethernet
  product 3COM 3C656B_E	0x6562	3CCFEM656B 10/100 Ethernet
--- 75,81 ----
  
  /* 3COM Products */
  product 3COM 3C575TX	0x5057	3c575-TX
! product 3COM 3C575BTX	0x5157	3CCFE575BT
  product 3COM 3C575CTX	0x5257	3CCFE575CT
  product 3COM 3C656_E	0x6560	3CCFEM656 10/100 Ethernet
  product 3COM 3C656B_E	0x6562	3CCFEM656B 10/100 Ethernet
***************
*** 91,97 ****
  product IODATA CBIDE2	0x0003	CBIDE2 IDE controller
  
  /* Accton products */
! product ACCTON MPX5030  0x1211  MPX 5030/5038 Ethernet
  product ACCTON EN2242	0x1216	EN2242 10/100 Ethernet
  
  /* Xircom products */
--- 92,98 ----
  product IODATA CBIDE2	0x0003	CBIDE2 IDE controller
  
  /* Accton products */
! product ACCTON MPX5030	0x1211	MPX 5030/5038 Ethernet
  product ACCTON EN2242	0x1216	EN2242 10/100 Ethernet
  
  /* Xircom products */
***************
*** 100,109 ****
  product XIRCOM	X3201_3		0x0002	X3201-3 Fast Ethernet Controller
  /* this is the device id `indicating 21143 driver compatibility' */
  product XIRCOM	X3201_3_21143	0x0003	X3201-3 Fast Ethernet Controller (21143)
! product	XIRCOM	MODEM56		0x0103	56k Modem
  
  /* D-Link products */
  product DLINK	DFE_690TXD	0x1340	DFE-690TXD 10/100 Ethernet
  
  /* Corega products */
  product COREGA CB_TXD	0xa117	FEther CB-TXD 10/100 Ethernet
--- 101,113 ----
  product XIRCOM	X3201_3		0x0002	X3201-3 Fast Ethernet Controller
  /* this is the device id `indicating 21143 driver compatibility' */
  product XIRCOM	X3201_3_21143	0x0003	X3201-3 Fast Ethernet Controller (21143)
! product XIRCOM	MODEM56		0x0103	56k Modem
  
  /* D-Link products */
  product DLINK	DFE_690TXD	0x1340	DFE-690TXD 10/100 Ethernet
+ 
+ /* Planex products */
+ product PLANEX FNW_3603_TX	0xab06	FNW-3603-TX 10/100 Ethernet
  
  /* Corega products */
  product COREGA CB_TXD	0xa117	FEther CB-TXD 10/100 Ethernet
Index: cardbusdevs.h
===================================================================
RCS file: /cvsroot/syssrc/sys/dev/cardbus/cardbusdevs.h,v
retrieving revision 1.18
diff -c -r1.18 cardbusdevs.h
*** cardbusdevs.h	2002/02/17 21:21:15	1.18
--- cardbusdevs.h	2002/11/07 12:09:58
***************
*** 57,62 ****
--- 57,63 ----
  #define	CARDBUS_VENDOR_ACCTON	0x1113		/* Accton Technology */
  #define	CARDBUS_VENDOR_XIRCOM	0x115d		/* Xircom */
  #define	CARDBUS_VENDOR_DLINK	0x1186		/* D-Link Systems */
+ #define	CARDBUS_VENDOR_PLANEX	0x14ea		/* Planex Communications Inc */
  #define	CARDBUS_VENDOR_COREGA	0x1259		/* Corega */
  #define	CARDBUS_VENDOR_ALLIEDTELESYN	0x1259		/* Allied Telesyn International */
  #define	CARDBUS_VENDOR_ABOCOM	0x13d1		/* AboCom Systems */
***************
*** 111,116 ****
--- 112,120 ----
  
  /* D-Link products */
  #define	CARDBUS_PRODUCT_DLINK_DFE_690TXD	0x1340		/* DFE-690TXD 10/100 Ethernet */
+ 
+ /* Planex products */
+ #define	CARDBUS_PRODUCT_PLANEX_FNW_3603_TX	0xab06		/* FNW-3603-TX 10/100 Ethernet */
  
  /* Corega products */
  #define	CARDBUS_PRODUCT_COREGA_CB_TXD	0xa117		/* FEther CB-TXD 10/100 Ethernet */
Index: cardbusdevs_data.h
===================================================================
RCS file: /cvsroot/syssrc/sys/dev/cardbus/cardbusdevs_data.h,v
retrieving revision 1.18
diff -c -r1.18 cardbusdevs_data.h
*** cardbusdevs_data.h	2002/02/17 21:21:16	1.18
--- cardbusdevs_data.h	2002/11/07 12:09:58
***************
*** 164,169 ****
--- 164,175 ----
  	    "DFE-690TXD 10/100 Ethernet",
  	},
  	{
+ 	    CARDBUS_VENDOR_PLANEX, CARDBUS_PRODUCT_PLANEX_FNW_3603_TX,
+ 	    0,
+ 	    "Planex Communications Inc",
+ 	    "FNW-3603-TX 10/100 Ethernet",
+ 	},
+ 	{
  	    CARDBUS_VENDOR_COREGA, CARDBUS_PRODUCT_COREGA_CB_TXD,
  	    0,
  	    "Corega",
***************
*** 263,268 ****
--- 269,280 ----
  	    CARDBUS_VENDOR_DLINK, 0,
  	    CARDBUS_KNOWNDEV_NOPROD,
  	    "D-Link Systems",
+ 	    NULL,
+ 	},
+ 	{
+ 	    CARDBUS_VENDOR_PLANEX, 0,
+ 	    CARDBUS_KNOWNDEV_NOPROD,
+ 	    "Planex Communications Inc",
  	    NULL,
  	},
  	{
Index: if_rtk_cardbus.c
===================================================================
RCS file: /cvsroot/syssrc/sys/dev/cardbus/if_rtk_cardbus.c,v
retrieving revision 1.11
diff -c -r1.11 if_rtk_cardbus.c
*** if_rtk_cardbus.c	2002/10/02 16:33:42	1.11
--- if_rtk_cardbus.c	2002/11/07 12:09:59
***************
*** 114,119 ****
--- 114,121 ----
  		"RealTek 8139 10/100BaseTX", RTK_8139 },
  	{ CARDBUS_VENDOR_COREGA, CARDBUS_PRODUCT_COREGA_CB_TXD,
  		"Corega FEther CB-TXD 10/100BaseTX", RTK_8139 },
+         { CARDBUS_VENDOR_PLANEX, CARDBUS_PRODUCT_PLANEX_FNW_3603_TX,
+                 "Planex FNW-3603 10/100BaseTX", RTK_8139 },
  	{ 0, 0, NULL, 0 }
  };
  
>Release-Note:
>Audit-Trail:
>Unformatted: