Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40738f3f authored by Komuro's avatar Komuro Committed by Jeff Garzik
Browse files

PCMCIA-NETDEV : add new ID of lan&modem multifunction card 



fmvj18x_cs:
      NEC PK-UG-J001
      Panasonic CF-VML201
      Panasonic TO-PDL9610

pcnet_cs:
       MICRO-RESEARCH  MC336LAN

Signed-off-by: default avatarKomuro <komurojun-mbn@nifty.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 18ab458f

drivers/net/pcmcia/fmvj18x_cs.c

+22 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ static const struct ethtool_ops netdev_ethtool_ops; 
    card type

 */

typedef enum { MBH10302, MBH10304, TDK, CONTEC, LA501, UNGERMANN, 

	       XXX10304

	       XXX10304, NEC, KME

} cardtype_t;



/*
@@ -374,6 +374,18 @@ static int fmvj18x_config(struct pcmcia_device *link) 
		link->io.NumPorts2 = 8;

	    }

	    break;

	case MANFID_NEC:

	    cardtype = NEC; /* MultiFunction Card */

	    link->conf.ConfigBase = 0x800;

	    link->conf.ConfigIndex = 0x47;

	    link->io.NumPorts2 = 8;

	    break;

	case MANFID_KME:

	    cardtype = KME; /* MultiFunction Card */

	    link->conf.ConfigBase = 0x800;

	    link->conf.ConfigIndex = 0x47;

	    link->io.NumPorts2 = 8;

	    break;

	case MANFID_CONTEC:

	    cardtype = CONTEC;

	    break;
@@ -450,6 +462,8 @@ static int fmvj18x_config(struct pcmcia_device *link) 
    case TDK:

    case LA501:

    case CONTEC:

    case NEC:

    case KME:

	tuple.DesiredTuple = CISTPL_FUNCE;

	tuple.TupleOffset = 0;

	CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
@@ -469,6 +483,10 @@ static int fmvj18x_config(struct pcmcia_device *link) 
		card_name = "TDK LAK-CD021";

	    } else if( cardtype == LA501 ) {

		card_name = "LA501";

	    } else if( cardtype == NEC ) {

		card_name = "PK-UG-J001";

	    } else if( cardtype == KME ) {

		card_name = "Panasonic";

	    } else {

		card_name = "C-NET(PC)C";

	    }
@@ -678,8 +696,11 @@ static struct pcmcia_device_id fmvj18x_ids[] = { 
	PCMCIA_DEVICE_PROD_ID1("PCMCIA MBH10302", 0x8f4005da),

	PCMCIA_DEVICE_PROD_ID1("UBKK,V2.0", 0x90888080),

	PCMCIA_PFC_DEVICE_PROD_ID12(0, "TDK", "GlobalNetworker 3410/3412", 0x1eae9475, 0xd9a93bed),

	PCMCIA_PFC_DEVICE_PROD_ID12(0, "NEC", "PK-UG-J001" ,0x18df0ba0 ,0x831b1064),

	PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0105, 0x0d0a),

	PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0105, 0x0e0a),

	PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0032, 0x0a05),

	PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0032, 0x1101),

	PCMCIA_DEVICE_NULL,

};

MODULE_DEVICE_TABLE(pcmcia, fmvj18x_ids);

drivers/net/pcmcia/pcnet_cs.c

+1 −0
Original line number Diff line number Diff line
@@ -1552,6 +1552,7 @@ static struct pcmcia_device_id pcnet_ids[] = { 
	PCMCIA_PFC_DEVICE_PROD_ID12(0, "Grey Cell", "GCS3000", 0x2a151fac, 0x48b932ae),

	PCMCIA_PFC_DEVICE_PROD_ID12(0, "Linksys", "EtherFast 10&100 + 56K PC Card (PCMLM56)", 0x0733cc81, 0xb3765033),

	PCMCIA_PFC_DEVICE_PROD_ID12(0, "LINKSYS", "PCMLM336", 0xf7cb0b07, 0x7a821b58),

	PCMCIA_PFC_DEVICE_PROD_ID12(0, "MICRO RESEARCH", "COMBO-L/M-336", 0xb2ced065, 0x3ced0555),

	PCMCIA_PFC_DEVICE_PROD_ID12(0, "PCMCIAs", "ComboCard", 0xdcfe12d3, 0xcd8906cc),

	PCMCIA_PFC_DEVICE_PROD_ID12(0, "PCMCIAs", "LanModem", 0xdcfe12d3, 0xc67c648f),

	PCMCIA_MFC_DEVICE_PROD_ID12(0, "IBM", "Home and Away 28.8 PC Card       ", 0xb569a6e5, 0x5bd4ff2c),

drivers/serial/serial_cs.c

+4 −0
Original line number Diff line number Diff line
@@ -842,12 +842,16 @@ static struct pcmcia_device_id serial_ids[] = { 
	PCMCIA_PFC_DEVICE_PROD_ID12(1, "Linksys", "EtherFast 10&100 + 56K PC Card (PCMLM56)", 0x0733cc81, 0xb3765033),

	PCMCIA_PFC_DEVICE_PROD_ID12(1, "LINKSYS", "PCMLM336", 0xf7cb0b07, 0x7a821b58),

	PCMCIA_PFC_DEVICE_PROD_ID12(1, "MEGAHERTZ", "XJEM1144/CCEM1144", 0xf510db04, 0x52d21e1e),

	PCMCIA_PFC_DEVICE_PROD_ID12(1, "MICRO RESEARCH", "COMBO-L/M-336", 0xb2ced065, 0x3ced0555),

	PCMCIA_PFC_DEVICE_PROD_ID12(1, "NEC", "PK-UG-J001" ,0x18df0ba0 ,0x831b1064),

	PCMCIA_PFC_DEVICE_PROD_ID12(1, "Ositech", "Trumpcard:Jack of Diamonds Modem+Ethernet", 0xc2f80cd, 0x656947b9),

	PCMCIA_PFC_DEVICE_PROD_ID12(1, "Ositech", "Trumpcard:Jack of Hearts Modem+Ethernet", 0xc2f80cd, 0xdc9ba5ed),

	PCMCIA_PFC_DEVICE_PROD_ID12(1, "PCMCIAs", "ComboCard", 0xdcfe12d3, 0xcd8906cc),

	PCMCIA_PFC_DEVICE_PROD_ID12(1, "PCMCIAs", "LanModem", 0xdcfe12d3, 0xc67c648f),

	PCMCIA_PFC_DEVICE_PROD_ID12(1, "TDK", "GlobalNetworker 3410/3412", 0x1eae9475, 0xd9a93bed),

	PCMCIA_PFC_DEVICE_PROD_ID12(1, "Xircom", "CreditCard Ethernet+Modem II", 0x2e3ee845, 0xeca401bf),

	PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0032, 0x0a05),

	PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0032, 0x1101),

	PCMCIA_MFC_DEVICE_MANF_CARD(0, 0x0104, 0x0070),

	PCMCIA_MFC_DEVICE_MANF_CARD(1, 0x0101, 0x0562),

	PCMCIA_MFC_DEVICE_MANF_CARD(1, 0x0104, 0x0070),

include/pcmcia/ciscode.h

+2 −0
Original line number Diff line number Diff line
@@ -126,4 +126,6 @@ 
#define MANFID_POSSIO			0x030c

#define PRODID_POSSIO_GCC		0x0003



#define MANFID_NEC			0x0010



#endif /* _LINUX_CISCODE_H */