tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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: Komuro <komurojun-mbn@nifty.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
authored by
Komuro
and committed by
Jeff Garzik
40738f3f
18ab458f
+29
-1
+22
-1
drivers/net/pcmcia/fmvj18x_cs.c
+22
-1
drivers/net/pcmcia/fmvj18x_cs.c
···
109
109
card type
110
110
*/
111
111
typedef enum { MBH10302, MBH10304, TDK, CONTEC, LA501, UNGERMANN,
112
-
XXX10304
112
+
XXX10304, NEC, KME
113
113
} cardtype_t;
114
114
115
115
/*
···
374
374
link->io.NumPorts2 = 8;
375
375
}
376
376
break;
377
+
case MANFID_NEC:
378
+
cardtype = NEC; /* MultiFunction Card */
379
+
link->conf.ConfigBase = 0x800;
380
+
link->conf.ConfigIndex = 0x47;
381
+
link->io.NumPorts2 = 8;
382
+
break;
383
+
case MANFID_KME:
384
+
cardtype = KME; /* MultiFunction Card */
385
+
link->conf.ConfigBase = 0x800;
386
+
link->conf.ConfigIndex = 0x47;
387
+
link->io.NumPorts2 = 8;
388
+
break;
377
389
case MANFID_CONTEC:
378
390
cardtype = CONTEC;
379
391
break;
···
462
450
case TDK:
463
451
case LA501:
464
452
case CONTEC:
453
+
case NEC:
454
+
case KME:
465
455
tuple.DesiredTuple = CISTPL_FUNCE;
466
456
tuple.TupleOffset = 0;
467
457
CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
···
483
469
card_name = "TDK LAK-CD021";
484
470
} else if( cardtype == LA501 ) {
485
471
card_name = "LA501";
472
+
} else if( cardtype == NEC ) {
473
+
card_name = "PK-UG-J001";
474
+
} else if( cardtype == KME ) {
475
+
card_name = "Panasonic";
486
476
} else {
487
477
card_name = "C-NET(PC)C";
488
478
}
···
696
678
PCMCIA_DEVICE_PROD_ID1("PCMCIA MBH10302", 0x8f4005da),
697
679
PCMCIA_DEVICE_PROD_ID1("UBKK,V2.0", 0x90888080),
698
680
PCMCIA_PFC_DEVICE_PROD_ID12(0, "TDK", "GlobalNetworker 3410/3412", 0x1eae9475, 0xd9a93bed),
681
+
PCMCIA_PFC_DEVICE_PROD_ID12(0, "NEC", "PK-UG-J001" ,0x18df0ba0 ,0x831b1064),
699
682
PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0105, 0x0d0a),
700
683
PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0105, 0x0e0a),
684
+
PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0032, 0x0a05),
685
+
PCMCIA_PFC_DEVICE_MANF_CARD(0, 0x0032, 0x1101),
701
686
PCMCIA_DEVICE_NULL,
702
687
};
703
688
MODULE_DEVICE_TABLE(pcmcia, fmvj18x_ids);
+1
drivers/net/pcmcia/pcnet_cs.c
+1
drivers/net/pcmcia/pcnet_cs.c
···
1552
1552
PCMCIA_PFC_DEVICE_PROD_ID12(0, "Grey Cell", "GCS3000", 0x2a151fac, 0x48b932ae),
1553
1553
PCMCIA_PFC_DEVICE_PROD_ID12(0, "Linksys", "EtherFast 10&100 + 56K PC Card (PCMLM56)", 0x0733cc81, 0xb3765033),
1554
1554
PCMCIA_PFC_DEVICE_PROD_ID12(0, "LINKSYS", "PCMLM336", 0xf7cb0b07, 0x7a821b58),
1555
+
PCMCIA_PFC_DEVICE_PROD_ID12(0, "MICRO RESEARCH", "COMBO-L/M-336", 0xb2ced065, 0x3ced0555),
1555
1556
PCMCIA_PFC_DEVICE_PROD_ID12(0, "PCMCIAs", "ComboCard", 0xdcfe12d3, 0xcd8906cc),
1556
1557
PCMCIA_PFC_DEVICE_PROD_ID12(0, "PCMCIAs", "LanModem", 0xdcfe12d3, 0xc67c648f),
1557
1558
PCMCIA_MFC_DEVICE_PROD_ID12(0, "IBM", "Home and Away 28.8 PC Card ", 0xb569a6e5, 0x5bd4ff2c),
+4
drivers/serial/serial_cs.c
+4
drivers/serial/serial_cs.c
···
842
842
PCMCIA_PFC_DEVICE_PROD_ID12(1, "Linksys", "EtherFast 10&100 + 56K PC Card (PCMLM56)", 0x0733cc81, 0xb3765033),
843
843
PCMCIA_PFC_DEVICE_PROD_ID12(1, "LINKSYS", "PCMLM336", 0xf7cb0b07, 0x7a821b58),
844
844
PCMCIA_PFC_DEVICE_PROD_ID12(1, "MEGAHERTZ", "XJEM1144/CCEM1144", 0xf510db04, 0x52d21e1e),
845
+
PCMCIA_PFC_DEVICE_PROD_ID12(1, "MICRO RESEARCH", "COMBO-L/M-336", 0xb2ced065, 0x3ced0555),
846
+
PCMCIA_PFC_DEVICE_PROD_ID12(1, "NEC", "PK-UG-J001" ,0x18df0ba0 ,0x831b1064),
845
847
PCMCIA_PFC_DEVICE_PROD_ID12(1, "Ositech", "Trumpcard:Jack of Diamonds Modem+Ethernet", 0xc2f80cd, 0x656947b9),
846
848
PCMCIA_PFC_DEVICE_PROD_ID12(1, "Ositech", "Trumpcard:Jack of Hearts Modem+Ethernet", 0xc2f80cd, 0xdc9ba5ed),
847
849
PCMCIA_PFC_DEVICE_PROD_ID12(1, "PCMCIAs", "ComboCard", 0xdcfe12d3, 0xcd8906cc),
848
850
PCMCIA_PFC_DEVICE_PROD_ID12(1, "PCMCIAs", "LanModem", 0xdcfe12d3, 0xc67c648f),
849
851
PCMCIA_PFC_DEVICE_PROD_ID12(1, "TDK", "GlobalNetworker 3410/3412", 0x1eae9475, 0xd9a93bed),
850
852
PCMCIA_PFC_DEVICE_PROD_ID12(1, "Xircom", "CreditCard Ethernet+Modem II", 0x2e3ee845, 0xeca401bf),
853
+
PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0032, 0x0a05),
854
+
PCMCIA_PFC_DEVICE_MANF_CARD(1, 0x0032, 0x1101),
851
855
PCMCIA_MFC_DEVICE_MANF_CARD(0, 0x0104, 0x0070),
852
856
PCMCIA_MFC_DEVICE_MANF_CARD(1, 0x0101, 0x0562),
853
857
PCMCIA_MFC_DEVICE_MANF_CARD(1, 0x0104, 0x0070),