소스 검색

[pci] Add driver_data field to struct pci_device_id

Modified-by: Michael Brown <mcb30@etherboot.org>
Signed-off-by: Michael Brown <mcb30@etherboot.org>
tags/v0.9.8
Thomas Miletich 15 년 전
부모
커밋
3da6f1c7bd

+ 1
- 1
src/arch/i386/drivers/net/undi.c 파일 보기

@@ -135,7 +135,7 @@ static void undipci_remove ( struct pci_device *pci ) {
135 135
 }
136 136
 
137 137
 static struct pci_device_id undipci_nics[] = {
138
-PCI_ROM ( 0xffff, 0xffff, "undipci", "UNDI (PCI)" ),
138
+PCI_ROM ( 0xffff, 0xffff, "undipci", "UNDI (PCI)", 0 ),
139 139
 };
140 140
 
141 141
 struct pci_driver undipci_driver __pci_driver = {

+ 2
- 2
src/drivers/infiniband/arbel.c 파일 보기

@@ -2241,8 +2241,8 @@ static void arbel_remove ( struct pci_device *pci ) {
2241 2241
 }
2242 2242
 
2243 2243
 static struct pci_device_id arbel_nics[] = {
2244
-	PCI_ROM ( 0x15b3, 0x6282, "mt25218", "MT25218 HCA driver" ),
2245
-	PCI_ROM ( 0x15b3, 0x6274, "mt25204", "MT25204 HCA driver" ),
2244
+	PCI_ROM ( 0x15b3, 0x6282, "mt25218", "MT25218 HCA driver", 0 ),
2245
+	PCI_ROM ( 0x15b3, 0x6274, "mt25204", "MT25204 HCA driver", 0 ),
2246 2246
 };
2247 2247
 
2248 2248
 struct pci_driver arbel_driver __pci_driver = {

+ 4
- 4
src/drivers/infiniband/hermon.c 파일 보기

@@ -2310,10 +2310,10 @@ static void hermon_remove ( struct pci_device *pci ) {
2310 2310
 }
2311 2311
 
2312 2312
 static struct pci_device_id hermon_nics[] = {
2313
-	PCI_ROM ( 0x15b3, 0x6340, "mt25408", "MT25408 HCA driver" ),
2314
-	PCI_ROM ( 0x15b3, 0x634a, "mt25418", "MT25418 HCA driver" ),
2315
-	PCI_ROM ( 0x15b3, 0x6732, "mt26418", "MT26418 HCA driver" ),
2316
-	PCI_ROM ( 0x15b3, 0x673c, "mt26428", "MT26428 HCA driver" ),
2313
+	PCI_ROM ( 0x15b3, 0x6340, "mt25408", "MT25408 HCA driver", 0 ),
2314
+	PCI_ROM ( 0x15b3, 0x634a, "mt25418", "MT25418 HCA driver", 0 ),
2315
+	PCI_ROM ( 0x15b3, 0x6732, "mt26418", "MT26418 HCA driver", 0 ),
2316
+	PCI_ROM ( 0x15b3, 0x673c, "mt26428", "MT26428 HCA driver", 0 ),
2317 2317
 };
2318 2318
 
2319 2319
 struct pci_driver hermon_driver __pci_driver = {

+ 1
- 1
src/drivers/infiniband/linda.c 파일 보기

@@ -2386,7 +2386,7 @@ static void linda_remove ( struct pci_device *pci ) {
2386 2386
 }
2387 2387
 
2388 2388
 static struct pci_device_id linda_nics[] = {
2389
-	PCI_ROM ( 0x1077, 0x7220, "iba7220", "QLE7240/7280 HCA driver" ),
2389
+	PCI_ROM ( 0x1077, 0x7220, "iba7220", "QLE7240/7280 HCA driver", 0 ),
2390 2390
 };
2391 2391
 
2392 2392
 struct pci_driver linda_driver __pci_driver = {

+ 14
- 14
src/drivers/net/3c595.c 파일 보기

@@ -521,20 +521,20 @@ static struct nic_operations t595_operations = {
521 521
 };
522 522
 
523 523
 static struct pci_device_id t595_nics[] = {
524
-PCI_ROM(0x10b7, 0x5900, "3c590",           "3Com590"),		/* Vortex 10Mbps */
525
-PCI_ROM(0x10b7, 0x5950, "3c595",           "3Com595"),		/* Vortex 100baseTx */
526
-PCI_ROM(0x10b7, 0x5951, "3c595-1",         "3Com595"),		/* Vortex 100baseT4 */
527
-PCI_ROM(0x10b7, 0x5952, "3c595-2",         "3Com595"),		/* Vortex 100base-MII */
528
-PCI_ROM(0x10b7, 0x9000, "3c900-tpo",       "3Com900-TPO"),	/* 10 Base TPO */
529
-PCI_ROM(0x10b7, 0x9001, "3c900-t4",        "3Com900-Combo"),	/* 10/100 T4 */
530
-PCI_ROM(0x10b7, 0x9004, "3c900b-tpo",      "3Com900B-TPO"),	/* 10 Base TPO */
531
-PCI_ROM(0x10b7, 0x9005, "3c900b-combo",    "3Com900B-Combo"),	/* 10 Base Combo */
532
-PCI_ROM(0x10b7, 0x9006, "3c900b-tpb2",     "3Com900B-2/T"),	/* 10 Base TP and Base2 */
533
-PCI_ROM(0x10b7, 0x900a, "3c900b-fl",       "3Com900B-FL"),	/* 10 Base F */
534
-PCI_ROM(0x10b7, 0x9800, "3c980-cyclone-1", "3Com980-Cyclone"),	/* Cyclone */
535
-PCI_ROM(0x10b7, 0x9805, "3c9805-1",        "3Com9805"),		/* Dual Port Server Cyclone */
536
-PCI_ROM(0x10b7, 0x7646, "3csoho100-tx-1",  "3CSOHO100-TX"),	/* Hurricane */
537
-PCI_ROM(0x10b7, 0x4500, "3c450-1",         "3Com450 HomePNA Tornado"),
524
+PCI_ROM(0x10b7, 0x5900, "3c590",           "3Com590", 0),		/* Vortex 10Mbps */
525
+PCI_ROM(0x10b7, 0x5950, "3c595",           "3Com595", 0),		/* Vortex 100baseTx */
526
+PCI_ROM(0x10b7, 0x5951, "3c595-1",         "3Com595", 0),		/* Vortex 100baseT4 */
527
+PCI_ROM(0x10b7, 0x5952, "3c595-2",         "3Com595", 0),		/* Vortex 100base-MII */
528
+PCI_ROM(0x10b7, 0x9000, "3c900-tpo",       "3Com900-TPO", 0),	/* 10 Base TPO */
529
+PCI_ROM(0x10b7, 0x9001, "3c900-t4",        "3Com900-Combo", 0),	/* 10/100 T4 */
530
+PCI_ROM(0x10b7, 0x9004, "3c900b-tpo",      "3Com900B-TPO", 0),	/* 10 Base TPO */
531
+PCI_ROM(0x10b7, 0x9005, "3c900b-combo",    "3Com900B-Combo", 0),	/* 10 Base Combo */
532
+PCI_ROM(0x10b7, 0x9006, "3c900b-tpb2",     "3Com900B-2/T", 0),	/* 10 Base TP and Base2 */
533
+PCI_ROM(0x10b7, 0x900a, "3c900b-fl",       "3Com900B-FL", 0),	/* 10 Base F */
534
+PCI_ROM(0x10b7, 0x9800, "3c980-cyclone-1", "3Com980-Cyclone", 0),	/* Cyclone */
535
+PCI_ROM(0x10b7, 0x9805, "3c9805-1",        "3Com9805", 0),		/* Dual Port Server Cyclone */
536
+PCI_ROM(0x10b7, 0x7646, "3csoho100-tx-1",  "3CSOHO100-TX", 0),	/* Hurricane */
537
+PCI_ROM(0x10b7, 0x4500, "3c450-1",         "3Com450 HomePNA Tornado", 0),
538 538
 };
539 539
 
540 540
 PCI_DRIVER ( t595_driver, t595_nics, PCI_NO_CLASS );

+ 22
- 22
src/drivers/net/3c90x.c 파일 보기

@@ -950,30 +950,30 @@ static int a3c90x_probe(struct pci_device *pci,
950 950
 
951 951
 static struct pci_device_id a3c90x_nics[] = {
952 952
 /* Original 90x revisions: */
953
-	PCI_ROM(0x10b7, 0x6055, "3c556", "3C556"),	/* Huricane */
954
-	PCI_ROM(0x10b7, 0x9000, "3c905-tpo", "3Com900-TPO"),	/* 10 Base TPO */
955
-	PCI_ROM(0x10b7, 0x9001, "3c905-t4", "3Com900-Combo"),	/* 10/100 T4 */
956
-	PCI_ROM(0x10b7, 0x9050, "3c905-tpo100", "3Com905-TX"),	/* 100 Base TX / 10/100 TPO */
957
-	PCI_ROM(0x10b7, 0x9051, "3c905-combo", "3Com905-T4"),	/* 100 Base T4 / 10 Base Combo */
953
+	PCI_ROM(0x10b7, 0x6055, "3c556", "3C556", 0),	/* Huricane */
954
+	PCI_ROM(0x10b7, 0x9000, "3c905-tpo", "3Com900-TPO", 0),	/* 10 Base TPO */
955
+	PCI_ROM(0x10b7, 0x9001, "3c905-t4", "3Com900-Combo", 0),	/* 10/100 T4 */
956
+	PCI_ROM(0x10b7, 0x9050, "3c905-tpo100", "3Com905-TX", 0),	/* 100 Base TX / 10/100 TPO */
957
+	PCI_ROM(0x10b7, 0x9051, "3c905-combo", "3Com905-T4", 0),	/* 100 Base T4 / 10 Base Combo */
958 958
 /* Newer 90xB revisions: */
959
-	PCI_ROM(0x10b7, 0x9004, "3c905b-tpo", "3Com900B-TPO"),	/* 10 Base TPO */
960
-	PCI_ROM(0x10b7, 0x9005, "3c905b-combo", "3Com900B-Combo"),	/* 10 Base Combo */
961
-	PCI_ROM(0x10b7, 0x9006, "3c905b-tpb2", "3Com900B-2/T"),	/* 10 Base TP and Base2 */
962
-	PCI_ROM(0x10b7, 0x900a, "3c905b-fl", "3Com900B-FL"),	/* 10 Base FL */
963
-	PCI_ROM(0x10b7, 0x9055, "3c905b-tpo100", "3Com905B-TX"),	/* 10/100 TPO */
964
-	PCI_ROM(0x10b7, 0x9056, "3c905b-t4", "3Com905B-T4"),	/* 10/100 T4 */
965
-	PCI_ROM(0x10b7, 0x9058, "3c905b-9058", "3Com905B-9058"),	/* Cyclone 10/100/BNC */
966
-	PCI_ROM(0x10b7, 0x905a, "3c905b-fx", "3Com905B-FL"),	/* 100 Base FX / 10 Base FX */
959
+	PCI_ROM(0x10b7, 0x9004, "3c905b-tpo", "3Com900B-TPO", 0),	/* 10 Base TPO */
960
+	PCI_ROM(0x10b7, 0x9005, "3c905b-combo", "3Com900B-Combo", 0),	/* 10 Base Combo */
961
+	PCI_ROM(0x10b7, 0x9006, "3c905b-tpb2", "3Com900B-2/T", 0),	/* 10 Base TP and Base2 */
962
+	PCI_ROM(0x10b7, 0x900a, "3c905b-fl", "3Com900B-FL", 0),	/* 10 Base FL */
963
+	PCI_ROM(0x10b7, 0x9055, "3c905b-tpo100", "3Com905B-TX", 0),	/* 10/100 TPO */
964
+	PCI_ROM(0x10b7, 0x9056, "3c905b-t4", "3Com905B-T4", 0),	/* 10/100 T4 */
965
+	PCI_ROM(0x10b7, 0x9058, "3c905b-9058", "3Com905B-9058", 0),	/* Cyclone 10/100/BNC */
966
+	PCI_ROM(0x10b7, 0x905a, "3c905b-fx", "3Com905B-FL", 0),	/* 100 Base FX / 10 Base FX */
967 967
 /* Newer 90xC revision: */
968
-	PCI_ROM(0x10b7, 0x9200, "3c905c-tpo", "3Com905C-TXM"),	/* 10/100 TPO (3C905C-TXM) */
969
-	PCI_ROM(0x10b7, 0x9202, "3c920b-emb-ati", "3c920B-EMB-WNM (ATI Radeon 9100 IGP)"),	/* 3c920B-EMB-WNM (ATI Radeon 9100 IGP) */
970
-	PCI_ROM(0x10b7, 0x9210, "3c920b-emb-wnm", "3Com20B-EMB WNM"),
971
-	PCI_ROM(0x10b7, 0x9800, "3c980", "3Com980-Cyclone"),	/* Cyclone */
972
-	PCI_ROM(0x10b7, 0x9805, "3c9805", "3Com9805"),	/* Dual Port Server Cyclone */
973
-	PCI_ROM(0x10b7, 0x7646, "3csoho100-tx", "3CSOHO100-TX"),	/* Hurricane */
974
-	PCI_ROM(0x10b7, 0x4500, "3c450", "3Com450 HomePNA Tornado"),
975
-	PCI_ROM(0x10b7, 0x1201, "3c982a", "3Com982A"),
976
-	PCI_ROM(0x10b7, 0x1202, "3c982b", "3Com982B"),
968
+	PCI_ROM(0x10b7, 0x9200, "3c905c-tpo", "3Com905C-TXM", 0),	/* 10/100 TPO (3C905C-TXM) */
969
+	PCI_ROM(0x10b7, 0x9202, "3c920b-emb-ati", "3c920B-EMB-WNM (ATI Radeon 9100 IGP)", 0),	/* 3c920B-EMB-WNM (ATI Radeon 9100 IGP) */
970
+	PCI_ROM(0x10b7, 0x9210, "3c920b-emb-wnm", "3Com20B-EMB WNM", 0),
971
+	PCI_ROM(0x10b7, 0x9800, "3c980", "3Com980-Cyclone", 0),	/* Cyclone */
972
+	PCI_ROM(0x10b7, 0x9805, "3c9805", "3Com9805", 0),	/* Dual Port Server Cyclone */
973
+	PCI_ROM(0x10b7, 0x7646, "3csoho100-tx", "3CSOHO100-TX", 0),	/* Hurricane */
974
+	PCI_ROM(0x10b7, 0x4500, "3c450", "3Com450 HomePNA Tornado", 0),
975
+	PCI_ROM(0x10b7, 0x1201, "3c982a", "3Com982A", 0),
976
+	PCI_ROM(0x10b7, 0x1202, "3c982b", "3Com982B", 0),
977 977
 };
978 978
 
979 979
 struct pci_driver a3c90x_driver __pci_driver = {

+ 1
- 1
src/drivers/net/amd8111e.c 파일 보기

@@ -674,7 +674,7 @@ static int amd8111e_probe(struct nic *nic, struct pci_device *pdev)
674 674
 }
675 675
 
676 676
 static struct pci_device_id amd8111e_nics[] = {
677
-	PCI_ROM(0x1022, 0x7462, "amd8111e",	"AMD8111E"),
677
+	PCI_ROM(0x1022, 0x7462, "amd8111e",	"AMD8111E", 0),
678 678
 };
679 679
 
680 680
 PCI_DRIVER ( amd8111e_driver, amd8111e_nics, PCI_NO_CLASS );

+ 3
- 3
src/drivers/net/b44.c 파일 보기

@@ -935,9 +935,9 @@ static struct net_device_operations b44_operations = {
935 935
 
936 936
 
937 937
 static struct pci_device_id b44_nics[] = {
938
-	PCI_ROM(0x14e4, 0x4401, "BCM4401", "BCM4401"),
939
-	PCI_ROM(0x14e4, 0x170c, "BCM4401-B0", "BCM4401-B0"),
940
-	PCI_ROM(0x14e4, 0x4402, "BCM4401-B1", "BCM4401-B1"),
938
+	PCI_ROM(0x14e4, 0x4401, "BCM4401", "BCM4401", 0),
939
+	PCI_ROM(0x14e4, 0x170c, "BCM4401-B0", "BCM4401-B0", 0),
940
+	PCI_ROM(0x14e4, 0x4402, "BCM4401-B1", "BCM4401-B1", 0),
941 941
 };
942 942
 
943 943
 

+ 4
- 4
src/drivers/net/bnx2.c 파일 보기

@@ -2673,10 +2673,10 @@ err_out_disable:
2673 2673
 }
2674 2674
 
2675 2675
 static struct pci_device_id bnx2_nics[] = {
2676
-	PCI_ROM(0x14e4, 0x164a, "bnx2-5706",        "Broadcom NetXtreme II BCM5706"),
2677
-	PCI_ROM(0x14e4, 0x164c, "bnx2-5708",        "Broadcom NetXtreme II BCM5708"),
2678
-	PCI_ROM(0x14e4, 0x16aa, "bnx2-5706S",       "Broadcom NetXtreme II BCM5706S"),
2679
-	PCI_ROM(0x14e4, 0x16ac, "bnx2-5708S",       "Broadcom NetXtreme II BCM5708S"),
2676
+	PCI_ROM(0x14e4, 0x164a, "bnx2-5706",        "Broadcom NetXtreme II BCM5706", 0),
2677
+	PCI_ROM(0x14e4, 0x164c, "bnx2-5708",        "Broadcom NetXtreme II BCM5708", 0),
2678
+	PCI_ROM(0x14e4, 0x16aa, "bnx2-5706S",       "Broadcom NetXtreme II BCM5706S", 0),
2679
+	PCI_ROM(0x14e4, 0x16ac, "bnx2-5708S",       "Broadcom NetXtreme II BCM5708S", 0),
2680 2680
 };
2681 2681
 
2682 2682
 PCI_DRIVER ( bnx2_driver, bnx2_nics, PCI_NO_CLASS );

+ 4
- 4
src/drivers/net/davicom.c 파일 보기

@@ -705,10 +705,10 @@ static struct nic_operations davicom_operations = {
705 705
 };
706 706
 
707 707
 static struct pci_device_id davicom_nics[] = {
708
-PCI_ROM(0x1282, 0x9100, "davicom9100", "Davicom 9100"),
709
-PCI_ROM(0x1282, 0x9102, "davicom9102", "Davicom 9102"),
710
-PCI_ROM(0x1282, 0x9009, "davicom9009", "Davicom 9009"),
711
-PCI_ROM(0x1282, 0x9132, "davicom9132", "Davicom 9132"),	/* Needs probably some fixing */
708
+PCI_ROM(0x1282, 0x9100, "davicom9100", "Davicom 9100", 0),
709
+PCI_ROM(0x1282, 0x9102, "davicom9102", "Davicom 9102", 0),
710
+PCI_ROM(0x1282, 0x9009, "davicom9009", "Davicom 9009", 0),
711
+PCI_ROM(0x1282, 0x9132, "davicom9132", "Davicom 9132", 0),	/* Needs probably some fixing */
712 712
 };
713 713
 
714 714
 PCI_DRIVER ( davicom_driver, davicom_nics, PCI_NO_CLASS );

+ 4
- 4
src/drivers/net/dmfe.c 파일 보기

@@ -1204,10 +1204,10 @@ static struct nic_operations dmfe_operations = {
1204 1204
 };
1205 1205
 
1206 1206
 static struct pci_device_id dmfe_nics[] = {
1207
-	PCI_ROM(0x1282, 0x9100, "dmfe9100", "Davicom 9100"),
1208
-	PCI_ROM(0x1282, 0x9102, "dmfe9102", "Davicom 9102"),
1209
-	PCI_ROM(0x1282, 0x9009, "dmfe9009", "Davicom 9009"),
1210
-	PCI_ROM(0x1282, 0x9132, "dmfe9132", "Davicom 9132"),	/* Needs probably some fixing */
1207
+	PCI_ROM(0x1282, 0x9100, "dmfe9100", "Davicom 9100", 0),
1208
+	PCI_ROM(0x1282, 0x9102, "dmfe9102", "Davicom 9102", 0),
1209
+	PCI_ROM(0x1282, 0x9009, "dmfe9009", "Davicom 9009", 0),
1210
+	PCI_ROM(0x1282, 0x9132, "dmfe9132", "Davicom 9132", 0),	/* Needs probably some fixing */
1211 1211
 };
1212 1212
 
1213 1213
 PCI_DRIVER ( dmfe_driver, dmfe_nics, PCI_NO_CLASS );

+ 62
- 62
src/drivers/net/e1000/e1000.c 파일 보기

@@ -1039,68 +1039,68 @@ e1000_io_write ( struct e1000_hw *hw  __unused, unsigned long port, uint32_t val
1039 1039
 }
1040 1040
 
1041 1041
 static struct pci_device_id e1000_nics[] = {
1042
-	PCI_ROM(0x8086, 0x1000, "e1000-0x1000", "e1000-0x1000"),
1043
-	PCI_ROM(0x8086, 0x1001, "e1000-0x1001", "e1000-0x1001"),
1044
-	PCI_ROM(0x8086, 0x1004, "e1000-0x1004", "e1000-0x1004"),
1045
-	PCI_ROM(0x8086, 0x1008, "e1000-0x1008", "e1000-0x1008"),
1046
-	PCI_ROM(0x8086, 0x1009, "e1000-0x1009", "e1000-0x1009"),
1047
-	PCI_ROM(0x8086, 0x100c, "e1000-0x100c", "e1000-0x100c"),
1048
-	PCI_ROM(0x8086, 0x100d, "e1000-0x100d", "e1000-0x100d"),
1049
-	PCI_ROM(0x8086, 0x100e, "e1000-0x100e", "e1000-0x100e"),
1050
-	PCI_ROM(0x8086, 0x100f, "e1000-0x100f", "e1000-0x100f"),
1051
-	PCI_ROM(0x8086, 0x1010, "e1000-0x1010", "e1000-0x1010"),
1052
-	PCI_ROM(0x8086, 0x1011, "e1000-0x1011", "e1000-0x1011"),
1053
-	PCI_ROM(0x8086, 0x1012, "e1000-0x1012", "e1000-0x1012"),
1054
-	PCI_ROM(0x8086, 0x1013, "e1000-0x1013", "e1000-0x1013"),
1055
-	PCI_ROM(0x8086, 0x1014, "e1000-0x1014", "e1000-0x1014"),
1056
-	PCI_ROM(0x8086, 0x1015, "e1000-0x1015", "e1000-0x1015"),
1057
-	PCI_ROM(0x8086, 0x1016, "e1000-0x1016", "e1000-0x1016"),
1058
-	PCI_ROM(0x8086, 0x1017, "e1000-0x1017", "e1000-0x1017"),
1059
-	PCI_ROM(0x8086, 0x1018, "e1000-0x1018", "e1000-0x1018"),
1060
-	PCI_ROM(0x8086, 0x1019, "e1000-0x1019", "e1000-0x1019"),
1061
-	PCI_ROM(0x8086, 0x101a, "e1000-0x101a", "e1000-0x101a"),
1062
-	PCI_ROM(0x8086, 0x101d, "e1000-0x101d", "e1000-0x101d"),
1063
-	PCI_ROM(0x8086, 0x101e, "e1000-0x101e", "e1000-0x101e"),
1064
-	PCI_ROM(0x8086, 0x1026, "e1000-0x1026", "e1000-0x1026"),
1065
-	PCI_ROM(0x8086, 0x1027, "e1000-0x1027", "e1000-0x1027"),
1066
-	PCI_ROM(0x8086, 0x1028, "e1000-0x1028", "e1000-0x1028"),
1067
-	PCI_ROM(0x8086, 0x1049, "e1000-0x1049", "e1000-0x1049"),
1068
-	PCI_ROM(0x8086, 0x104a, "e1000-0x104a", "e1000-0x104a"),
1069
-	PCI_ROM(0x8086, 0x104b, "e1000-0x104b", "e1000-0x104b"),
1070
-	PCI_ROM(0x8086, 0x104c, "e1000-0x104c", "e1000-0x104c"),
1071
-	PCI_ROM(0x8086, 0x104d, "e1000-0x104d", "e1000-0x104d"),
1072
-	PCI_ROM(0x8086, 0x105e, "e1000-0x105e", "e1000-0x105e"),
1073
-	PCI_ROM(0x8086, 0x105f, "e1000-0x105f", "e1000-0x105f"),
1074
-	PCI_ROM(0x8086, 0x1060, "e1000-0x1060", "e1000-0x1060"),
1075
-	PCI_ROM(0x8086, 0x1075, "e1000-0x1075", "e1000-0x1075"),
1076
-	PCI_ROM(0x8086, 0x1076, "e1000-0x1076", "e1000-0x1076"),
1077
-	PCI_ROM(0x8086, 0x1077, "e1000-0x1077", "e1000-0x1077"),
1078
-	PCI_ROM(0x8086, 0x1078, "e1000-0x1078", "e1000-0x1078"),
1079
-	PCI_ROM(0x8086, 0x1079, "e1000-0x1079", "e1000-0x1079"),
1080
-	PCI_ROM(0x8086, 0x107a, "e1000-0x107a", "e1000-0x107a"),
1081
-	PCI_ROM(0x8086, 0x107b, "e1000-0x107b", "e1000-0x107b"),
1082
-	PCI_ROM(0x8086, 0x107c, "e1000-0x107c", "e1000-0x107c"),
1083
-	PCI_ROM(0x8086, 0x107d, "e1000-0x107d", "e1000-0x107d"),
1084
-	PCI_ROM(0x8086, 0x107e, "e1000-0x107e", "e1000-0x107e"),
1085
-	PCI_ROM(0x8086, 0x107f, "e1000-0x107f", "e1000-0x107f"),
1086
-	PCI_ROM(0x8086, 0x108a, "e1000-0x108a", "e1000-0x108a"),
1087
-	PCI_ROM(0x8086, 0x108b, "e1000-0x108b", "e1000-0x108b"),
1088
-	PCI_ROM(0x8086, 0x108c, "e1000-0x108c", "e1000-0x108c"),
1089
-	PCI_ROM(0x8086, 0x1096, "e1000-0x1096", "e1000-0x1096"),
1090
-	PCI_ROM(0x8086, 0x1098, "e1000-0x1098", "e1000-0x1098"),
1091
-	PCI_ROM(0x8086, 0x1099, "e1000-0x1099", "e1000-0x1099"),
1092
-	PCI_ROM(0x8086, 0x109a, "e1000-0x109a", "e1000-0x109a"),
1093
-	PCI_ROM(0x8086, 0x10a4, "e1000-0x10a4", "e1000-0x10a4"),
1094
-	PCI_ROM(0x8086, 0x10a5, "e1000-0x10a5", "e1000-0x10a5"),
1095
-	PCI_ROM(0x8086, 0x10b5, "e1000-0x10b5", "e1000-0x10b5"),
1096
-	PCI_ROM(0x8086, 0x10b9, "e1000-0x10b9", "e1000-0x10b9"),
1097
-	PCI_ROM(0x8086, 0x10ba, "e1000-0x10ba", "e1000-0x10ba"),
1098
-	PCI_ROM(0x8086, 0x10bb, "e1000-0x10bb", "e1000-0x10bb"),
1099
-	PCI_ROM(0x8086, 0x10bc, "e1000-0x10bc", "e1000-0x10bc"),
1100
-	PCI_ROM(0x8086, 0x10c4, "e1000-0x10c4", "e1000-0x10c4"),
1101
-	PCI_ROM(0x8086, 0x10c5, "e1000-0x10c5", "e1000-0x10c5"),
1102
-	PCI_ROM(0x8086, 0x10d9, "e1000-0x10d9", "e1000-0x10d9"),
1103
-	PCI_ROM(0x8086, 0x10da, "e1000-0x10da", "e1000-0x10da"),
1042
+	PCI_ROM(0x8086, 0x1000, "e1000-0x1000", "e1000-0x1000", 0),
1043
+	PCI_ROM(0x8086, 0x1001, "e1000-0x1001", "e1000-0x1001", 0),
1044
+	PCI_ROM(0x8086, 0x1004, "e1000-0x1004", "e1000-0x1004", 0),
1045
+	PCI_ROM(0x8086, 0x1008, "e1000-0x1008", "e1000-0x1008", 0),
1046
+	PCI_ROM(0x8086, 0x1009, "e1000-0x1009", "e1000-0x1009", 0),
1047
+	PCI_ROM(0x8086, 0x100c, "e1000-0x100c", "e1000-0x100c", 0),
1048
+	PCI_ROM(0x8086, 0x100d, "e1000-0x100d", "e1000-0x100d", 0),
1049
+	PCI_ROM(0x8086, 0x100e, "e1000-0x100e", "e1000-0x100e", 0),
1050
+	PCI_ROM(0x8086, 0x100f, "e1000-0x100f", "e1000-0x100f", 0),
1051
+	PCI_ROM(0x8086, 0x1010, "e1000-0x1010", "e1000-0x1010", 0),
1052
+	PCI_ROM(0x8086, 0x1011, "e1000-0x1011", "e1000-0x1011", 0),
1053
+	PCI_ROM(0x8086, 0x1012, "e1000-0x1012", "e1000-0x1012", 0),
1054
+	PCI_ROM(0x8086, 0x1013, "e1000-0x1013", "e1000-0x1013", 0),
1055
+	PCI_ROM(0x8086, 0x1014, "e1000-0x1014", "e1000-0x1014", 0),
1056
+	PCI_ROM(0x8086, 0x1015, "e1000-0x1015", "e1000-0x1015", 0),
1057
+	PCI_ROM(0x8086, 0x1016, "e1000-0x1016", "e1000-0x1016", 0),
1058
+	PCI_ROM(0x8086, 0x1017, "e1000-0x1017", "e1000-0x1017", 0),
1059
+	PCI_ROM(0x8086, 0x1018, "e1000-0x1018", "e1000-0x1018", 0),
1060
+	PCI_ROM(0x8086, 0x1019, "e1000-0x1019", "e1000-0x1019", 0),
1061
+	PCI_ROM(0x8086, 0x101a, "e1000-0x101a", "e1000-0x101a", 0),
1062
+	PCI_ROM(0x8086, 0x101d, "e1000-0x101d", "e1000-0x101d", 0),
1063
+	PCI_ROM(0x8086, 0x101e, "e1000-0x101e", "e1000-0x101e", 0),
1064
+	PCI_ROM(0x8086, 0x1026, "e1000-0x1026", "e1000-0x1026", 0),
1065
+	PCI_ROM(0x8086, 0x1027, "e1000-0x1027", "e1000-0x1027", 0),
1066
+	PCI_ROM(0x8086, 0x1028, "e1000-0x1028", "e1000-0x1028", 0),
1067
+	PCI_ROM(0x8086, 0x1049, "e1000-0x1049", "e1000-0x1049", 0),
1068
+	PCI_ROM(0x8086, 0x104a, "e1000-0x104a", "e1000-0x104a", 0),
1069
+	PCI_ROM(0x8086, 0x104b, "e1000-0x104b", "e1000-0x104b", 0),
1070
+	PCI_ROM(0x8086, 0x104c, "e1000-0x104c", "e1000-0x104c", 0),
1071
+	PCI_ROM(0x8086, 0x104d, "e1000-0x104d", "e1000-0x104d", 0),
1072
+	PCI_ROM(0x8086, 0x105e, "e1000-0x105e", "e1000-0x105e", 0),
1073
+	PCI_ROM(0x8086, 0x105f, "e1000-0x105f", "e1000-0x105f", 0),
1074
+	PCI_ROM(0x8086, 0x1060, "e1000-0x1060", "e1000-0x1060", 0),
1075
+	PCI_ROM(0x8086, 0x1075, "e1000-0x1075", "e1000-0x1075", 0),
1076
+	PCI_ROM(0x8086, 0x1076, "e1000-0x1076", "e1000-0x1076", 0),
1077
+	PCI_ROM(0x8086, 0x1077, "e1000-0x1077", "e1000-0x1077", 0),
1078
+	PCI_ROM(0x8086, 0x1078, "e1000-0x1078", "e1000-0x1078", 0),
1079
+	PCI_ROM(0x8086, 0x1079, "e1000-0x1079", "e1000-0x1079", 0),
1080
+	PCI_ROM(0x8086, 0x107a, "e1000-0x107a", "e1000-0x107a", 0),
1081
+	PCI_ROM(0x8086, 0x107b, "e1000-0x107b", "e1000-0x107b", 0),
1082
+	PCI_ROM(0x8086, 0x107c, "e1000-0x107c", "e1000-0x107c", 0),
1083
+	PCI_ROM(0x8086, 0x107d, "e1000-0x107d", "e1000-0x107d", 0),
1084
+	PCI_ROM(0x8086, 0x107e, "e1000-0x107e", "e1000-0x107e", 0),
1085
+	PCI_ROM(0x8086, 0x107f, "e1000-0x107f", "e1000-0x107f", 0),
1086
+	PCI_ROM(0x8086, 0x108a, "e1000-0x108a", "e1000-0x108a", 0),
1087
+	PCI_ROM(0x8086, 0x108b, "e1000-0x108b", "e1000-0x108b", 0),
1088
+	PCI_ROM(0x8086, 0x108c, "e1000-0x108c", "e1000-0x108c", 0),
1089
+	PCI_ROM(0x8086, 0x1096, "e1000-0x1096", "e1000-0x1096", 0),
1090
+	PCI_ROM(0x8086, 0x1098, "e1000-0x1098", "e1000-0x1098", 0),
1091
+	PCI_ROM(0x8086, 0x1099, "e1000-0x1099", "e1000-0x1099", 0),
1092
+	PCI_ROM(0x8086, 0x109a, "e1000-0x109a", "e1000-0x109a", 0),
1093
+	PCI_ROM(0x8086, 0x10a4, "e1000-0x10a4", "e1000-0x10a4", 0),
1094
+	PCI_ROM(0x8086, 0x10a5, "e1000-0x10a5", "e1000-0x10a5", 0),
1095
+	PCI_ROM(0x8086, 0x10b5, "e1000-0x10b5", "e1000-0x10b5", 0),
1096
+	PCI_ROM(0x8086, 0x10b9, "e1000-0x10b9", "e1000-0x10b9", 0),
1097
+	PCI_ROM(0x8086, 0x10ba, "e1000-0x10ba", "e1000-0x10ba", 0),
1098
+	PCI_ROM(0x8086, 0x10bb, "e1000-0x10bb", "e1000-0x10bb", 0),
1099
+	PCI_ROM(0x8086, 0x10bc, "e1000-0x10bc", "e1000-0x10bc", 0),
1100
+	PCI_ROM(0x8086, 0x10c4, "e1000-0x10c4", "e1000-0x10c4", 0),
1101
+	PCI_ROM(0x8086, 0x10c5, "e1000-0x10c5", "e1000-0x10c5", 0),
1102
+	PCI_ROM(0x8086, 0x10d9, "e1000-0x10d9", "e1000-0x10d9", 0),
1103
+	PCI_ROM(0x8086, 0x10da, "e1000-0x10da", "e1000-0x10da", 0),
1104 1104
 };
1105 1105
 
1106 1106
 struct pci_driver e1000_driver __pci_driver = {

+ 30
- 30
src/drivers/net/eepro100.c 파일 보기

@@ -800,36 +800,36 @@ static struct nic_operations eepro100_operations = {
800 800
 };
801 801
 
802 802
 static struct pci_device_id eepro100_nics[] = {
803
-PCI_ROM(0x8086, 0x1029, "id1029",        "Intel EtherExpressPro100 ID1029"),
804
-PCI_ROM(0x8086, 0x1030, "id1030",        "Intel EtherExpressPro100 ID1030"),
805
-PCI_ROM(0x8086, 0x1031, "82801cam",      "Intel 82801CAM (ICH3) Chipset Ethernet Controller"),
806
-PCI_ROM(0x8086, 0x1032, "eepro100-1032", "Intel PRO/100 VE Network Connection"),
807
-PCI_ROM(0x8086, 0x1033, "eepro100-1033", "Intel PRO/100 VM Network Connection"),
808
-PCI_ROM(0x8086, 0x1034, "eepro100-1034", "Intel PRO/100 VM Network Connection"),
809
-PCI_ROM(0x8086, 0x1035, "eepro100-1035", "Intel 82801CAM (ICH3) Chipset Ethernet Controller"),
810
-PCI_ROM(0x8086, 0x1036, "eepro100-1036", "Intel 82801CAM (ICH3) Chipset Ethernet Controller"),
811
-PCI_ROM(0x8086, 0x1037, "eepro100-1037", "Intel 82801CAM (ICH3) Chipset Ethernet Controller"),
812
-PCI_ROM(0x8086, 0x1038, "id1038",        "Intel PRO/100 VM Network Connection"),
813
-PCI_ROM(0x8086, 0x1039, "82562et",       "Intel PRO100 VE 82562ET"),
814
-PCI_ROM(0x8086, 0x103a, "id103a",        "Intel Corporation 82559 InBusiness 10/100"),
815
-PCI_ROM(0x8086, 0x103b, "82562etb",      "Intel PRO100 VE 82562ETB"),
816
-PCI_ROM(0x8086, 0x103c, "eepro100-103c", "Intel PRO/100 VM Network Connection"),
817
-PCI_ROM(0x8086, 0x103d, "eepro100-103d", "Intel PRO/100 VE Network Connection"),
818
-PCI_ROM(0x8086, 0x103e, "eepro100-103e", "Intel PRO/100 VM Network Connection"),
819
-PCI_ROM(0x8086, 0x1051, "prove",       "Intel PRO/100 VE Network Connection"),
820
-PCI_ROM(0x8086, 0x1059, "82551qm",       "Intel PRO/100 M Mobile Connection"),
821
-PCI_ROM(0x8086, 0x1209, "82559er",       "Intel EtherExpressPro100 82559ER"),
822
-PCI_ROM(0x8086, 0x1227, "82865",         "Intel 82865 EtherExpress PRO/100A"),
823
-PCI_ROM(0x8086, 0x1228, "82556",         "Intel 82556 EtherExpress PRO/100 Smart"),
824
-PCI_ROM(0x8086, 0x1229, "eepro100",      "Intel EtherExpressPro100"),
825
-PCI_ROM(0x8086, 0x2449, "82562em",       "Intel EtherExpressPro100 82562EM"),
826
-PCI_ROM(0x8086, 0x2459, "82562-1",       "Intel 82562 based Fast Ethernet Connection"),
827
-PCI_ROM(0x8086, 0x245d, "82562-2",       "Intel 82562 based Fast Ethernet Connection"),
828
-PCI_ROM(0x8086, 0x1050, "82562ez",       "Intel 82562EZ Network Connection"),
829
-PCI_ROM(0x8086, 0x1051, "eepro100-1051", "Intel 82801EB/ER (ICH5/ICH5R) Chipset Ethernet Controller"),
830
-PCI_ROM(0x8086, 0x1065, "82562-3",       "Intel 82562 based Fast Ethernet Connection"),
831
-PCI_ROM(0x8086, 0x5200, "eepro100-5200", "Intel EtherExpress PRO/100 Intelligent Server"),
832
-PCI_ROM(0x8086, 0x5201, "eepro100-5201", "Intel EtherExpress PRO/100 Intelligent Server"),
803
+PCI_ROM(0x8086, 0x1029, "id1029",        "Intel EtherExpressPro100 ID1029", 0),
804
+PCI_ROM(0x8086, 0x1030, "id1030",        "Intel EtherExpressPro100 ID1030", 0),
805
+PCI_ROM(0x8086, 0x1031, "82801cam",      "Intel 82801CAM (ICH3) Chipset Ethernet Controller", 0),
806
+PCI_ROM(0x8086, 0x1032, "eepro100-1032", "Intel PRO/100 VE Network Connection", 0),
807
+PCI_ROM(0x8086, 0x1033, "eepro100-1033", "Intel PRO/100 VM Network Connection", 0),
808
+PCI_ROM(0x8086, 0x1034, "eepro100-1034", "Intel PRO/100 VM Network Connection", 0),
809
+PCI_ROM(0x8086, 0x1035, "eepro100-1035", "Intel 82801CAM (ICH3) Chipset Ethernet Controller", 0),
810
+PCI_ROM(0x8086, 0x1036, "eepro100-1036", "Intel 82801CAM (ICH3) Chipset Ethernet Controller", 0),
811
+PCI_ROM(0x8086, 0x1037, "eepro100-1037", "Intel 82801CAM (ICH3) Chipset Ethernet Controller", 0),
812
+PCI_ROM(0x8086, 0x1038, "id1038",        "Intel PRO/100 VM Network Connection", 0),
813
+PCI_ROM(0x8086, 0x1039, "82562et",       "Intel PRO100 VE 82562ET", 0),
814
+PCI_ROM(0x8086, 0x103a, "id103a",        "Intel Corporation 82559 InBusiness 10/100", 0),
815
+PCI_ROM(0x8086, 0x103b, "82562etb",      "Intel PRO100 VE 82562ETB", 0),
816
+PCI_ROM(0x8086, 0x103c, "eepro100-103c", "Intel PRO/100 VM Network Connection", 0),
817
+PCI_ROM(0x8086, 0x103d, "eepro100-103d", "Intel PRO/100 VE Network Connection", 0),
818
+PCI_ROM(0x8086, 0x103e, "eepro100-103e", "Intel PRO/100 VM Network Connection", 0),
819
+PCI_ROM(0x8086, 0x1051, "prove",       "Intel PRO/100 VE Network Connection", 0),
820
+PCI_ROM(0x8086, 0x1059, "82551qm",       "Intel PRO/100 M Mobile Connection", 0),
821
+PCI_ROM(0x8086, 0x1209, "82559er",       "Intel EtherExpressPro100 82559ER", 0),
822
+PCI_ROM(0x8086, 0x1227, "82865",         "Intel 82865 EtherExpress PRO/100A", 0),
823
+PCI_ROM(0x8086, 0x1228, "82556",         "Intel 82556 EtherExpress PRO/100 Smart", 0),
824
+PCI_ROM(0x8086, 0x1229, "eepro100",      "Intel EtherExpressPro100", 0),
825
+PCI_ROM(0x8086, 0x2449, "82562em",       "Intel EtherExpressPro100 82562EM", 0),
826
+PCI_ROM(0x8086, 0x2459, "82562-1",       "Intel 82562 based Fast Ethernet Connection", 0),
827
+PCI_ROM(0x8086, 0x245d, "82562-2",       "Intel 82562 based Fast Ethernet Connection", 0),
828
+PCI_ROM(0x8086, 0x1050, "82562ez",       "Intel 82562EZ Network Connection", 0),
829
+PCI_ROM(0x8086, 0x1051, "eepro100-1051", "Intel 82801EB/ER (ICH5/ICH5R) Chipset Ethernet Controller", 0),
830
+PCI_ROM(0x8086, 0x1065, "82562-3",       "Intel 82562 based Fast Ethernet Connection", 0),
831
+PCI_ROM(0x8086, 0x5200, "eepro100-5200", "Intel EtherExpress PRO/100 Intelligent Server", 0),
832
+PCI_ROM(0x8086, 0x5201, "eepro100-5201", "Intel EtherExpress PRO/100 Intelligent Server", 0),
833 833
 };
834 834
 
835 835
 /* Cards with device ids 0x1030 to 0x103F, 0x2449, 0x2459 or 0x245D might need

+ 2
- 2
src/drivers/net/epic100.c 파일 보기

@@ -519,8 +519,8 @@ static struct nic_operations epic100_operations = {
519 519
 };
520 520
 
521 521
 static struct pci_device_id epic100_nics[] = {
522
-PCI_ROM(0x10b8, 0x0005, "epic100",    "SMC EtherPowerII"),		/* SMC 83c170 EPIC/100 */
523
-PCI_ROM(0x10b8, 0x0006, "smc-83c175", "SMC EPIC/C 83c175"),
522
+PCI_ROM(0x10b8, 0x0005, "epic100",    "SMC EtherPowerII", 0),		/* SMC 83c170 EPIC/100 */
523
+PCI_ROM(0x10b8, 0x0006, "smc-83c175", "SMC EPIC/C 83c175", 0),
524 524
 };
525 525
 
526 526
 PCI_DRIVER ( epic100_driver, epic100_nics, PCI_NO_CLASS );

+ 2
- 2
src/drivers/net/etherfabric.c 파일 보기

@@ -4228,8 +4228,8 @@ fail1:
4228 4228
 
4229 4229
 
4230 4230
 static struct pci_device_id efab_nics[] = {
4231
-	PCI_ROM(0x1924, 0x0703, "falcon", "EtherFabric Falcon"),
4232
-	PCI_ROM(0x1924, 0x0710, "falconb0", "EtherFabric FalconB0"),
4231
+	PCI_ROM(0x1924, 0x0703, "falcon", "EtherFabric Falcon", 0),
4232
+	PCI_ROM(0x1924, 0x0710, "falconb0", "EtherFabric FalconB0", 0),
4233 4233
 };
4234 4234
 
4235 4235
 struct pci_driver etherfabric_driver __pci_driver = {

+ 12
- 12
src/drivers/net/forcedeth.c 파일 보기

@@ -1412,18 +1412,18 @@ static int forcedeth_probe ( struct nic *nic, struct pci_device *pci ) {
1412 1412
 }
1413 1413
 
1414 1414
 static struct pci_device_id forcedeth_nics[] = {
1415
-PCI_ROM(0x10de, 0x01C3, "nforce", "nForce NVENET_1 Ethernet Controller"),
1416
-PCI_ROM(0x10de, 0x0066, "nforce2", "nForce NVENET_2 Ethernet Controller"),
1417
-PCI_ROM(0x10de, 0x00D6, "nforce3", "nForce NVENET_3 Ethernet Controller"),
1418
-PCI_ROM(0x10de, 0x0086, "nforce4", "nForce NVENET_4 Ethernet Controller"),
1419
-PCI_ROM(0x10de, 0x008c, "nforce5", "nForce NVENET_5 Ethernet Controller"),
1420
-PCI_ROM(0x10de, 0x00e6, "nforce6", "nForce NVENET_6 Ethernet Controller"),
1421
-PCI_ROM(0x10de, 0x00df, "nforce7", "nForce NVENET_7 Ethernet Controller"),
1422
-PCI_ROM(0x10de, 0x0056, "nforce8", "nForce NVENET_8 Ethernet Controller"),
1423
-PCI_ROM(0x10de, 0x0057, "nforce9", "nForce NVENET_9 Ethernet Controller"),
1424
-PCI_ROM(0x10de, 0x0037, "nforce10", "nForce NVENET_10 Ethernet Controller"),
1425
-PCI_ROM(0x10de, 0x0038, "nforce11", "nForce NVENET_11 Ethernet Controller"),
1426
-PCI_ROM(0x10de, 0x0373, "nforce15", "nForce NVENET_15 Ethernet Controller")
1415
+PCI_ROM(0x10de, 0x01C3, "nforce", "nForce NVENET_1 Ethernet Controller", 0),
1416
+PCI_ROM(0x10de, 0x0066, "nforce2", "nForce NVENET_2 Ethernet Controller", 0),
1417
+PCI_ROM(0x10de, 0x00D6, "nforce3", "nForce NVENET_3 Ethernet Controller", 0),
1418
+PCI_ROM(0x10de, 0x0086, "nforce4", "nForce NVENET_4 Ethernet Controller", 0),
1419
+PCI_ROM(0x10de, 0x008c, "nforce5", "nForce NVENET_5 Ethernet Controller", 0),
1420
+PCI_ROM(0x10de, 0x00e6, "nforce6", "nForce NVENET_6 Ethernet Controller", 0),
1421
+PCI_ROM(0x10de, 0x00df, "nforce7", "nForce NVENET_7 Ethernet Controller", 0),
1422
+PCI_ROM(0x10de, 0x0056, "nforce8", "nForce NVENET_8 Ethernet Controller", 0),
1423
+PCI_ROM(0x10de, 0x0057, "nforce9", "nForce NVENET_9 Ethernet Controller", 0),
1424
+PCI_ROM(0x10de, 0x0037, "nforce10", "nForce NVENET_10 Ethernet Controller", 0),
1425
+PCI_ROM(0x10de, 0x0038, "nforce11", "nForce NVENET_11 Ethernet Controller", 0),
1426
+PCI_ROM(0x10de, 0x0373, "nforce15", "nForce NVENET_15 Ethernet Controller", 0)
1427 1427
 };
1428 1428
 
1429 1429
 PCI_DRIVER ( forcedeth_driver, forcedeth_nics, PCI_NO_CLASS );

+ 3
- 3
src/drivers/net/mtd80x.c 파일 보기

@@ -656,9 +656,9 @@ static struct nic_operations mtd_operations = {
656 656
 };
657 657
 
658 658
 static struct pci_device_id mtd80x_nics[] = {
659
-        PCI_ROM(0x1516, 0x0800, "MTD800", "Myson MTD800"),
660
-        PCI_ROM(0x1516, 0x0803, "MTD803", "Surecom EP-320X"),
661
-        PCI_ROM(0x1516, 0x0891, "MTD891", "Myson MTD891"),
659
+        PCI_ROM(0x1516, 0x0800, "MTD800", "Myson MTD800", 0),
660
+        PCI_ROM(0x1516, 0x0803, "MTD803", "Surecom EP-320X", 0),
661
+        PCI_ROM(0x1516, 0x0891, "MTD891", "Myson MTD891", 0),
662 662
 };
663 663
 
664 664
 PCI_DRIVER ( mtd80x_driver, mtd80x_nics, PCI_NO_CLASS );

+ 4
- 4
src/drivers/net/mtnic.c 파일 보기

@@ -1835,10 +1835,10 @@ err_init_card:
1835 1835
 
1836 1836
 
1837 1837
 static struct pci_device_id mtnic_nics[] = {
1838
-	PCI_ROM ( 0x15b3, 0x6368, "mt25448", "Mellanox ConnectX EN driver" ),
1839
-	PCI_ROM ( 0x15b3, 0x6372, "mt25458", "Mellanox ConnectX ENt driver" ),
1840
-	PCI_ROM ( 0x15b3, 0x6750, "mt26448", "Mellanox ConnectX EN GEN2 driver" ),
1841
-	PCI_ROM ( 0x15b3, 0x675a, "mt26458", "Mellanox ConnectX ENt GEN2 driver" ),
1838
+	PCI_ROM ( 0x15b3, 0x6368, "mt25448", "Mellanox ConnectX EN driver", 0 ),
1839
+	PCI_ROM ( 0x15b3, 0x6372, "mt25458", "Mellanox ConnectX ENt driver", 0 ),
1840
+	PCI_ROM ( 0x15b3, 0x6750, "mt26448", "Mellanox ConnectX EN GEN2 driver", 0 ),
1841
+	PCI_ROM ( 0x15b3, 0x675a, "mt26458", "Mellanox ConnectX ENt GEN2 driver", 0 ),
1842 1842
 };
1843 1843
 
1844 1844
 struct pci_driver mtnic_driver __pci_driver = {

+ 1
- 1
src/drivers/net/natsemi.c 파일 보기

@@ -596,7 +596,7 @@ static void natsemi_irq (struct net_device *netdev, int enable)
596 596
 }
597 597
 
598 598
 static struct pci_device_id natsemi_nics[] = {
599
-	PCI_ROM(0x100b, 0x0020, "dp83815", "DP83815"),
599
+	PCI_ROM(0x100b, 0x0020, "dp83815", "DP83815", 0),
600 600
 };
601 601
 
602 602
 struct pci_driver natsemi_driver __pci_driver = {

+ 1
- 1
src/drivers/net/ns83820.c 파일 보기

@@ -802,7 +802,7 @@ static struct nic_operations ns83820_operations = {
802 802
 };
803 803
 
804 804
 static struct pci_device_id ns83820_nics[] = {
805
-	PCI_ROM(0x100b, 0x0022, "ns83820", "National Semiconductor 83820"),
805
+	PCI_ROM(0x100b, 0x0022, "ns83820", "National Semiconductor 83820", 0),
806 806
 };
807 807
 
808 808
 PCI_DRIVER ( ns83820_driver, ns83820_nics, PCI_NO_CLASS );

+ 11
- 11
src/drivers/net/ns8390.c 파일 보기

@@ -1004,17 +1004,17 @@ ISA_ROM("ne","NE1000/2000 and clones");
1004 1004
 #ifdef	INCLUDE_NS8390
1005 1005
 static struct pci_device_id nepci_nics[] = {
1006 1006
 /* A few NE2000 PCI clones, list not exhaustive */
1007
-PCI_ROM(0x10ec, 0x8029, "rtl8029",      "Realtek 8029"),
1008
-PCI_ROM(0x1186, 0x0300, "dlink-528",    "D-Link DE-528"),
1009
-PCI_ROM(0x1050, 0x0940, "winbond940",   "Winbond NE2000-PCI"),		/* Winbond 86C940 / 89C940 */
1010
-PCI_ROM(0x1050, 0x5a5a, "winbond940f",  "Winbond W89c940F"),		/* Winbond 89C940F */
1011
-PCI_ROM(0x11f6, 0x1401, "compexrl2000", "Compex ReadyLink 2000"),
1012
-PCI_ROM(0x8e2e, 0x3000, "ktiet32p2",    "KTI ET32P2"),
1013
-PCI_ROM(0x4a14, 0x5000, "nv5000sc",     "NetVin NV5000SC"),
1014
-PCI_ROM(0x12c3, 0x0058, "holtek80232",  "Holtek HT80232"),
1015
-PCI_ROM(0x12c3, 0x5598, "holtek80229",  "Holtek HT80229"),
1016
-PCI_ROM(0x10bd, 0x0e34, "surecom-ne34", "Surecom NE34"),
1017
-PCI_ROM(0x1106, 0x0926, "via86c926",    "Via 86c926"),
1007
+PCI_ROM(0x10ec, 0x8029, "rtl8029",      "Realtek 8029", 0),
1008
+PCI_ROM(0x1186, 0x0300, "dlink-528",    "D-Link DE-528", 0),
1009
+PCI_ROM(0x1050, 0x0940, "winbond940",   "Winbond NE2000-PCI", 0),		/* Winbond 86C940 / 89C940 */
1010
+PCI_ROM(0x1050, 0x5a5a, "winbond940f",  "Winbond W89c940F", 0),		/* Winbond 89C940F */
1011
+PCI_ROM(0x11f6, 0x1401, "compexrl2000", "Compex ReadyLink 2000", 0),
1012
+PCI_ROM(0x8e2e, 0x3000, "ktiet32p2",    "KTI ET32P2", 0),
1013
+PCI_ROM(0x4a14, 0x5000, "nv5000sc",     "NetVin NV5000SC", 0),
1014
+PCI_ROM(0x12c3, 0x0058, "holtek80232",  "Holtek HT80232", 0),
1015
+PCI_ROM(0x12c3, 0x5598, "holtek80229",  "Holtek HT80229", 0),
1016
+PCI_ROM(0x10bd, 0x0e34, "surecom-ne34", "Surecom NE34", 0),
1017
+PCI_ROM(0x1106, 0x0926, "via86c926",    "Via 86c926", 0),
1018 1018
 };
1019 1019
 
1020 1020
 PCI_DRIVER ( nepci_driver, nepci_nics, PCI_NO_CLASS );

+ 3
- 3
src/drivers/net/pcnet32.c 파일 보기

@@ -1006,9 +1006,9 @@ static struct nic_operations pcnet32_operations = {
1006 1006
 };
1007 1007
 
1008 1008
 static struct pci_device_id pcnet32_nics[] = {
1009
-	PCI_ROM(0x1022, 0x2000, "pcnet32", "AMD PCnet/PCI"),
1010
-	PCI_ROM(0x1022, 0x2625, "pcnetfastiii", "AMD PCNet FAST III"),
1011
-	PCI_ROM(0x1022, 0x2001, "amdhomepna", "AMD PCnet/HomePNA"),
1009
+	PCI_ROM(0x1022, 0x2000, "pcnet32", "AMD PCnet/PCI", 0),
1010
+	PCI_ROM(0x1022, 0x2625, "pcnetfastiii", "AMD PCNet FAST III", 0),
1011
+	PCI_ROM(0x1022, 0x2001, "amdhomepna", "AMD PCnet/HomePNA", 0),
1012 1012
 };
1013 1013
 
1014 1014
 PCI_DRIVER ( pcnet32_driver, pcnet32_nics, PCI_NO_CLASS );

+ 1
- 1
src/drivers/net/phantom/phantom.c 파일 보기

@@ -2100,7 +2100,7 @@ static void phantom_remove ( struct pci_device *pci ) {
2100 2100
 
2101 2101
 /** Phantom PCI IDs */
2102 2102
 static struct pci_device_id phantom_nics[] = {
2103
-	PCI_ROM ( 0x4040, 0x0100, "nx", "NX" ),
2103
+	PCI_ROM ( 0x4040, 0x0100, "nx", "NX", 0 ),
2104 2104
 };
2105 2105
 
2106 2106
 /** Phantom PCI driver */

+ 1
- 1
src/drivers/net/pnic.c 파일 보기

@@ -268,7 +268,7 @@ static int pnic_probe ( struct pci_device *pci,
268 268
 
269 269
 static struct pci_device_id pnic_nics[] = {
270 270
 /* genrules.pl doesn't let us use macros for PCI IDs...*/
271
-PCI_ROM ( 0xfefe, 0xefef, "pnic", "Bochs Pseudo NIC Adaptor" ),
271
+PCI_ROM ( 0xfefe, 0xefef, "pnic", "Bochs Pseudo NIC Adaptor", 0 ),
272 272
 };
273 273
 
274 274
 struct pci_driver pnic_driver __pci_driver = {

+ 3
- 3
src/drivers/net/prism2_pci.c 파일 보기

@@ -37,9 +37,9 @@ static void prism2_pci_disable ( struct nic *nic ) {
37 37
 }
38 38
 
39 39
 static struct pci_device_id prism2_pci_nics[] = {
40
-PCI_ROM(0x1260, 0x3873, "prism2_pci",	"Harris Semiconductor Prism2.5 clone"),
41
-PCI_ROM(0x1260, 0x3873, "hwp01170",	"ActionTec HWP01170"),
42
-PCI_ROM(0x1260, 0x3873, "dwl520",	"DLink DWL-520"),
40
+PCI_ROM(0x1260, 0x3873, "prism2_pci",	"Harris Semiconductor Prism2.5 clone", 0),
41
+PCI_ROM(0x1260, 0x3873, "hwp01170",	"ActionTec HWP01170", 0),
42
+PCI_ROM(0x1260, 0x3873, "dwl520",	"DLink DWL-520", 0),
43 43
 };
44 44
 
45 45
 PCI_DRIVER ( prism2_pci_driver, prism2_pci_nics, PCI_NO_CLASS );

+ 11
- 11
src/drivers/net/prism2_plx.c 파일 보기

@@ -92,17 +92,17 @@ static void prism2_plx_disable ( struct nic *nic ) {
92 92
 }
93 93
 
94 94
 static struct pci_device_id prism2_plx_nics[] = {
95
-PCI_ROM(0x1385, 0x4100, "ma301",         "Netgear MA301"),
96
-PCI_ROM(0x10b7, 0x7770, "3c-airconnect", "3Com AirConnect"),
97
-PCI_ROM(0x111a, 0x1023, "ss1023",        "Siemens SpeedStream SS1023"),
98
-PCI_ROM(0x15e8, 0x0130, "correga",       "Correga"),
99
-PCI_ROM(0x1638, 0x1100, "smc2602w",      "SMC EZConnect SMC2602W"),	/* or Eumitcom PCI WL11000, Addtron AWA-100 */
100
-PCI_ROM(0x16ab, 0x1100, "gl24110p",      "Global Sun Tech GL24110P"),
101
-PCI_ROM(0x16ab, 0x1101, "16ab-1101",     "Unknown"),
102
-PCI_ROM(0x16ab, 0x1102, "wdt11",         "Linksys WDT11"),
103
-PCI_ROM(0x16ec, 0x3685, "usr2415",       "USR 2415"),
104
-PCI_ROM(0xec80, 0xec00, "f5d6000",       "Belkin F5D6000"),
105
-PCI_ROM(0x126c, 0x8030, "emobility",     "Nortel emobility"),
95
+PCI_ROM(0x1385, 0x4100, "ma301",         "Netgear MA301", 0),
96
+PCI_ROM(0x10b7, 0x7770, "3c-airconnect", "3Com AirConnect", 0),
97
+PCI_ROM(0x111a, 0x1023, "ss1023",        "Siemens SpeedStream SS1023", 0),
98
+PCI_ROM(0x15e8, 0x0130, "correga",       "Correga", 0),
99
+PCI_ROM(0x1638, 0x1100, "smc2602w",      "SMC EZConnect SMC2602W", 0),	/* or Eumitcom PCI WL11000, Addtron AWA-100 */
100
+PCI_ROM(0x16ab, 0x1100, "gl24110p",      "Global Sun Tech GL24110P", 0),
101
+PCI_ROM(0x16ab, 0x1101, "16ab-1101",     "Unknown", 0),
102
+PCI_ROM(0x16ab, 0x1102, "wdt11",         "Linksys WDT11", 0),
103
+PCI_ROM(0x16ec, 0x3685, "usr2415",       "USR 2415", 0),
104
+PCI_ROM(0xec80, 0xec00, "f5d6000",       "Belkin F5D6000", 0),
105
+PCI_ROM(0x126c, 0x8030, "emobility",     "Nortel emobility", 0),
106 106
 };
107 107
 
108 108
 PCI_DRIVER ( prism2_plx_driver, prism2_plx_nics, PCI_NO_CLASS );

+ 10
- 10
src/drivers/net/r8169.c 파일 보기

@@ -2254,16 +2254,16 @@ rtl8169_remove ( struct pci_device *pdev )
2254 2254
 }
2255 2255
 
2256 2256
 static struct pci_device_id rtl8169_nics[] = {
2257
-	PCI_ROM(0x10ec, 0x8129, "rtl8169-0x8129", "rtl8169-0x8129"),
2258
-	PCI_ROM(0x10ec, 0x8136, "rtl8169-0x8136", "rtl8169-0x8136"),
2259
-	PCI_ROM(0x10ec, 0x8167, "rtl8169-0x8167", "rtl8169-0x8167"),
2260
-	PCI_ROM(0x10ec, 0x8168, "rtl8169-0x8168", "rtl8169-0x8168"),
2261
-	PCI_ROM(0x10ec, 0x8169, "rtl8169-0x8169", "rtl8169-0x8169"),
2262
-	PCI_ROM(0x1186, 0x4300, "rtl8169-0x4300", "rtl8169-0x4300"),
2263
-	PCI_ROM(0x1259, 0xc107, "rtl8169-0xc107", "rtl8169-0xc107"),
2264
-	PCI_ROM(0x16ec, 0x0116, "rtl8169-0x0116", "rtl8169-0x0116"),
2265
-	PCI_ROM(0x1737, 0x1032, "rtl8169-0x1032", "rtl8169-0x1032"),
2266
-	PCI_ROM(0x0001, 0x8168, "rtl8169-0x8168", "rtl8169-0x8168"),
2257
+	PCI_ROM(0x10ec, 0x8129, "rtl8169-0x8129", "rtl8169-0x8129", 0),
2258
+	PCI_ROM(0x10ec, 0x8136, "rtl8169-0x8136", "rtl8169-0x8136", 0),
2259
+	PCI_ROM(0x10ec, 0x8167, "rtl8169-0x8167", "rtl8169-0x8167", 0),
2260
+	PCI_ROM(0x10ec, 0x8168, "rtl8169-0x8168", "rtl8169-0x8168", 0),
2261
+	PCI_ROM(0x10ec, 0x8169, "rtl8169-0x8169", "rtl8169-0x8169", 0),
2262
+	PCI_ROM(0x1186, 0x4300, "rtl8169-0x4300", "rtl8169-0x4300", 0),
2263
+	PCI_ROM(0x1259, 0xc107, "rtl8169-0xc107", "rtl8169-0xc107", 0),
2264
+	PCI_ROM(0x16ec, 0x0116, "rtl8169-0x0116", "rtl8169-0x0116", 0),
2265
+	PCI_ROM(0x1737, 0x1032, "rtl8169-0x1032", "rtl8169-0x1032", 0),
2266
+	PCI_ROM(0x0001, 0x8168, "rtl8169-0x8168", "rtl8169-0x8168", 0),
2267 2267
 };
2268 2268
 
2269 2269
 struct pci_driver rtl8169_driver __pci_driver = {

+ 14
- 14
src/drivers/net/rtl8139.c 파일 보기

@@ -563,20 +563,20 @@ static void rtl_remove ( struct pci_device *pci ) {
563 563
 }
564 564
 
565 565
 static struct pci_device_id rtl8139_nics[] = {
566
-PCI_ROM(0x10ec, 0x8129, "rtl8129",       "Realtek 8129"),
567
-PCI_ROM(0x10ec, 0x8139, "rtl8139",       "Realtek 8139"),
568
-PCI_ROM(0x10ec, 0x8138, "rtl8139b",      "Realtek 8139B"),
569
-PCI_ROM(0x1186, 0x1300, "dfe538",        "DFE530TX+/DFE538TX"),
570
-PCI_ROM(0x1113, 0x1211, "smc1211-1",     "SMC EZ10/100"),
571
-PCI_ROM(0x1112, 0x1211, "smc1211",       "SMC EZ10/100"),
572
-PCI_ROM(0x1500, 0x1360, "delta8139",     "Delta Electronics 8139"),
573
-PCI_ROM(0x4033, 0x1360, "addtron8139",   "Addtron Technology 8139"),
574
-PCI_ROM(0x1186, 0x1340, "dfe690txd",     "D-Link DFE690TXD"),
575
-PCI_ROM(0x13d1, 0xab06, "fe2000vx",      "AboCom FE2000VX"),
576
-PCI_ROM(0x1259, 0xa117, "allied8139",    "Allied Telesyn 8139"),
577
-PCI_ROM(0x14ea, 0xab06, "fnw3603tx",     "Planex FNW-3603-TX"),
578
-PCI_ROM(0x14ea, 0xab07, "fnw3800tx",     "Planex FNW-3800-TX"),
579
-PCI_ROM(0xffff, 0x8139, "clone-rtl8139", "Cloned 8139"),
566
+PCI_ROM(0x10ec, 0x8129, "rtl8129",       "Realtek 8129", 0),
567
+PCI_ROM(0x10ec, 0x8139, "rtl8139",       "Realtek 8139", 0),
568
+PCI_ROM(0x10ec, 0x8138, "rtl8139b",      "Realtek 8139B", 0),
569
+PCI_ROM(0x1186, 0x1300, "dfe538",        "DFE530TX+/DFE538TX", 0),
570
+PCI_ROM(0x1113, 0x1211, "smc1211-1",     "SMC EZ10/100", 0),
571
+PCI_ROM(0x1112, 0x1211, "smc1211",       "SMC EZ10/100", 0),
572
+PCI_ROM(0x1500, 0x1360, "delta8139",     "Delta Electronics 8139", 0),
573
+PCI_ROM(0x4033, 0x1360, "addtron8139",   "Addtron Technology 8139", 0),
574
+PCI_ROM(0x1186, 0x1340, "dfe690txd",     "D-Link DFE690TXD", 0),
575
+PCI_ROM(0x13d1, 0xab06, "fe2000vx",      "AboCom FE2000VX", 0),
576
+PCI_ROM(0x1259, 0xa117, "allied8139",    "Allied Telesyn 8139", 0),
577
+PCI_ROM(0x14ea, 0xab06, "fnw3603tx",     "Planex FNW-3603-TX", 0),
578
+PCI_ROM(0x14ea, 0xab07, "fnw3800tx",     "Planex FNW-3800-TX", 0),
579
+PCI_ROM(0xffff, 0x8139, "clone-rtl8139", "Cloned 8139", 0),
580 580
 };
581 581
 
582 582
 struct pci_driver rtl8139_driver __pci_driver = {

+ 2
- 2
src/drivers/net/sis900.c 파일 보기

@@ -1278,8 +1278,8 @@ static struct nic_operations sis900_operations = {
1278 1278
 };
1279 1279
 
1280 1280
 static struct pci_device_id sis900_nics[] = {
1281
-PCI_ROM(0x1039, 0x0900, "sis900",  "SIS900"),
1282
-PCI_ROM(0x1039, 0x7016, "sis7016", "SIS7016"),
1281
+PCI_ROM(0x1039, 0x0900, "sis900",  "SIS900", 0),
1282
+PCI_ROM(0x1039, 0x7016, "sis7016", "SIS7016", 0),
1283 1283
 };
1284 1284
 
1285 1285
 PCI_DRIVER ( sis900_driver, sis900_nics, PCI_NO_CLASS );

+ 3
- 3
src/drivers/net/sundance.c 파일 보기

@@ -883,9 +883,9 @@ static void set_rx_mode(struct nic *nic __unused)
883 883
 }
884 884
 
885 885
 static struct pci_device_id sundance_nics[] = {
886
-	PCI_ROM(0x13f0, 0x0201, "sundance", "ST201 Sundance 'Alta' based Adaptor"),
887
-	PCI_ROM(0x1186, 0x1002, "dfe530txs", "D-Link DFE530TXS (Sundance ST201 Alta)"),
888
-	PCI_ROM(0x13f0, 0x0200, "ip100a", "IC+ IP100A"),
886
+	PCI_ROM(0x13f0, 0x0201, "sundance", "ST201 Sundance 'Alta' based Adaptor", 0),
887
+	PCI_ROM(0x1186, 0x1002, "dfe530txs", "D-Link DFE530TXS (Sundance ST201 Alta)", 0),
888
+	PCI_ROM(0x13f0, 0x0200, "ip100a", "IC+ IP100A", 0),
889 889
 };
890 890
 
891 891
 PCI_DRIVER ( sundance_driver, sundance_nics, PCI_NO_CLASS );

+ 32
- 32
src/drivers/net/tg3.c 파일 보기

@@ -3384,38 +3384,38 @@ static int tg3_probe ( struct nic *nic, struct pci_device *pdev ) {
3384 3384
 
3385 3385
 
3386 3386
 static struct pci_device_id tg3_nics[] = {
3387
-PCI_ROM(0x14e4, 0x1644, "tg3-5700",        "Broadcom Tigon 3 5700"),
3388
-PCI_ROM(0x14e4, 0x1645, "tg3-5701",        "Broadcom Tigon 3 5701"),
3389
-PCI_ROM(0x14e4, 0x1646, "tg3-5702",        "Broadcom Tigon 3 5702"),
3390
-PCI_ROM(0x14e4, 0x1647, "tg3-5703",        "Broadcom Tigon 3 5703"),
3391
-PCI_ROM(0x14e4, 0x1648, "tg3-5704",        "Broadcom Tigon 3 5704"),
3392
-PCI_ROM(0x14e4, 0x164d, "tg3-5702FE",      "Broadcom Tigon 3 5702FE"),
3393
-PCI_ROM(0x14e4, 0x1653, "tg3-5705",        "Broadcom Tigon 3 5705"),
3394
-PCI_ROM(0x14e4, 0x1654, "tg3-5705_2",      "Broadcom Tigon 3 5705_2"),
3395
-PCI_ROM(0x14e4, 0x1659, "tg3-5721",        "Broadcom Tigon 3 5721"),
3396
-PCI_ROM(0x14e4, 0x165d, "tg3-5705M",       "Broadcom Tigon 3 5705M"),
3397
-PCI_ROM(0x14e4, 0x165e, "tg3-5705M_2",     "Broadcom Tigon 3 5705M_2"),
3398
-PCI_ROM(0x14e4, 0x1677, "tg3-5751",        "Broadcom Tigon 3 5751"),
3399
-PCI_ROM(0x14e4, 0x167a, "tg3-5754",        "Broadcom Tigon 3 5754"),
3400
-PCI_ROM(0x14e4, 0x1693, "tg3-5787",	   "Broadcom Tigon 3 5787"),
3401
-PCI_ROM(0x14e4, 0x1696, "tg3-5782",        "Broadcom Tigon 3 5782"),
3402
-PCI_ROM(0x14e4, 0x169a, "tg3-5786",        "Broadcom Tigon 3 5786"),
3403
-PCI_ROM(0x14e4, 0x169c, "tg3-5788",        "Broadcom Tigon 3 5788"),
3404
-PCI_ROM(0x14e4, 0x169d, "tg3-5789",        "Broadcom Tigon 3 5789"),
3405
-PCI_ROM(0x14e4, 0x16a6, "tg3-5702X",       "Broadcom Tigon 3 5702X"),
3406
-PCI_ROM(0x14e4, 0x16a7, "tg3-5703X",       "Broadcom Tigon 3 5703X"),
3407
-PCI_ROM(0x14e4, 0x16a8, "tg3-5704S",       "Broadcom Tigon 3 5704S"),
3408
-PCI_ROM(0x14e4, 0x16c6, "tg3-5702A3",      "Broadcom Tigon 3 5702A3"),
3409
-PCI_ROM(0x14e4, 0x16c7, "tg3-5703A3",      "Broadcom Tigon 3 5703A3"),
3410
-PCI_ROM(0x14e4, 0x170d, "tg3-5901",        "Broadcom Tigon 3 5901"),
3411
-PCI_ROM(0x14e4, 0x170e, "tg3-5901_2",      "Broadcom Tigon 3 5901_2"),
3412
-PCI_ROM(0x1148, 0x4400, "tg3-9DXX",        "Syskonnect 9DXX"),
3413
-PCI_ROM(0x1148, 0x4500, "tg3-9MXX",        "Syskonnect 9MXX"),
3414
-PCI_ROM(0x173b, 0x03e8, "tg3-ac1000",      "Altima AC1000"),
3415
-PCI_ROM(0x173b, 0x03e9, "tg3-ac1001",      "Altima AC1001"),
3416
-PCI_ROM(0x173b, 0x03ea, "tg3-ac9100",      "Altima AC9100"),
3417
-PCI_ROM(0x173b, 0x03eb, "tg3-ac1003",      "Altima AC1003"),
3418
-PCI_ROM(0x0e11, 0x00ca, "tg3-hp",	   "HP Tigon 3"),
3387
+PCI_ROM(0x14e4, 0x1644, "tg3-5700",        "Broadcom Tigon 3 5700", 0),
3388
+PCI_ROM(0x14e4, 0x1645, "tg3-5701",        "Broadcom Tigon 3 5701", 0),
3389
+PCI_ROM(0x14e4, 0x1646, "tg3-5702",        "Broadcom Tigon 3 5702", 0),
3390
+PCI_ROM(0x14e4, 0x1647, "tg3-5703",        "Broadcom Tigon 3 5703", 0),
3391
+PCI_ROM(0x14e4, 0x1648, "tg3-5704",        "Broadcom Tigon 3 5704", 0),
3392
+PCI_ROM(0x14e4, 0x164d, "tg3-5702FE",      "Broadcom Tigon 3 5702FE", 0),
3393
+PCI_ROM(0x14e4, 0x1653, "tg3-5705",        "Broadcom Tigon 3 5705", 0),
3394
+PCI_ROM(0x14e4, 0x1654, "tg3-5705_2",      "Broadcom Tigon 3 5705_2", 0),
3395
+PCI_ROM(0x14e4, 0x1659, "tg3-5721",        "Broadcom Tigon 3 5721", 0),
3396
+PCI_ROM(0x14e4, 0x165d, "tg3-5705M",       "Broadcom Tigon 3 5705M", 0),
3397
+PCI_ROM(0x14e4, 0x165e, "tg3-5705M_2",     "Broadcom Tigon 3 5705M_2", 0),
3398
+PCI_ROM(0x14e4, 0x1677, "tg3-5751",        "Broadcom Tigon 3 5751", 0),
3399
+PCI_ROM(0x14e4, 0x167a, "tg3-5754",        "Broadcom Tigon 3 5754", 0),
3400
+PCI_ROM(0x14e4, 0x1693, "tg3-5787",	   "Broadcom Tigon 3 5787", 0),
3401
+PCI_ROM(0x14e4, 0x1696, "tg3-5782",        "Broadcom Tigon 3 5782", 0),
3402
+PCI_ROM(0x14e4, 0x169a, "tg3-5786",        "Broadcom Tigon 3 5786", 0),
3403
+PCI_ROM(0x14e4, 0x169c, "tg3-5788",        "Broadcom Tigon 3 5788", 0),
3404
+PCI_ROM(0x14e4, 0x169d, "tg3-5789",        "Broadcom Tigon 3 5789", 0),
3405
+PCI_ROM(0x14e4, 0x16a6, "tg3-5702X",       "Broadcom Tigon 3 5702X", 0),
3406
+PCI_ROM(0x14e4, 0x16a7, "tg3-5703X",       "Broadcom Tigon 3 5703X", 0),
3407
+PCI_ROM(0x14e4, 0x16a8, "tg3-5704S",       "Broadcom Tigon 3 5704S", 0),
3408
+PCI_ROM(0x14e4, 0x16c6, "tg3-5702A3",      "Broadcom Tigon 3 5702A3", 0),
3409
+PCI_ROM(0x14e4, 0x16c7, "tg3-5703A3",      "Broadcom Tigon 3 5703A3", 0),
3410
+PCI_ROM(0x14e4, 0x170d, "tg3-5901",        "Broadcom Tigon 3 5901", 0),
3411
+PCI_ROM(0x14e4, 0x170e, "tg3-5901_2",      "Broadcom Tigon 3 5901_2", 0),
3412
+PCI_ROM(0x1148, 0x4400, "tg3-9DXX",        "Syskonnect 9DXX", 0),
3413
+PCI_ROM(0x1148, 0x4500, "tg3-9MXX",        "Syskonnect 9MXX", 0),
3414
+PCI_ROM(0x173b, 0x03e8, "tg3-ac1000",      "Altima AC1000", 0),
3415
+PCI_ROM(0x173b, 0x03e9, "tg3-ac1001",      "Altima AC1001", 0),
3416
+PCI_ROM(0x173b, 0x03ea, "tg3-ac9100",      "Altima AC9100", 0),
3417
+PCI_ROM(0x173b, 0x03eb, "tg3-ac1003",      "Altima AC1003", 0),
3418
+PCI_ROM(0x0e11, 0x00ca, "tg3-hp",	   "HP Tigon 3", 0),
3419 3419
 };
3420 3420
 
3421 3421
 PCI_DRIVER ( tg3_driver, tg3_nics, PCI_NO_CLASS );

+ 13
- 13
src/drivers/net/tlan.c 파일 보기

@@ -1691,19 +1691,19 @@ void TLan_PhyMonitor(struct net_device *dev)
1691 1691
 #endif				/* MONITOR */
1692 1692
 
1693 1693
 static struct pci_device_id tlan_nics[] = {
1694
-	PCI_ROM(0x0e11, 0xae34, "netel10", "Compaq Netelligent 10 T PCI UTP"),
1695
-	PCI_ROM(0x0e11, 0xae32, "netel100","Compaq Netelligent 10/100 TX PCI UTP"),
1696
-	PCI_ROM(0x0e11, 0xae35, "netflex3i", "Compaq Integrated NetFlex-3/P"),
1697
-	PCI_ROM(0x0e11, 0xf130, "thunder", "Compaq NetFlex-3/P"),
1698
-	PCI_ROM(0x0e11, 0xf150, "netflex3b", "Compaq NetFlex-3/P"),
1699
-	PCI_ROM(0x0e11, 0xae43, "netel100pi", "Compaq Netelligent Integrated 10/100 TX UTP"),
1700
-	PCI_ROM(0x0e11, 0xae40, "netel100d", "Compaq Netelligent Dual 10/100 TX PCI UTP"),
1701
-	PCI_ROM(0x0e11, 0xb011, "netel100i", "Compaq Netelligent 10/100 TX Embedded UTP"),
1702
-	PCI_ROM(0x108d, 0x0013, "oc2183", "Olicom OC-2183/2185"),
1703
-	PCI_ROM(0x108d, 0x0012, "oc2325", "Olicom OC-2325"),
1704
-	PCI_ROM(0x108d, 0x0014, "oc2326", "Olicom OC-2326"),
1705
-	PCI_ROM(0x0e11, 0xb030, "netelligent_10_100_ws_5100", "Compaq Netelligent 10/100 TX UTP"),
1706
-	PCI_ROM(0x0e11, 0xb012, "netelligent_10_t2", "Compaq Netelligent 10 T/2 PCI UTP/Coax"),
1694
+	PCI_ROM(0x0e11, 0xae34, "netel10", "Compaq Netelligent 10 T PCI UTP", 0),
1695
+	PCI_ROM(0x0e11, 0xae32, "netel100","Compaq Netelligent 10/100 TX PCI UTP", 0),
1696
+	PCI_ROM(0x0e11, 0xae35, "netflex3i", "Compaq Integrated NetFlex-3/P", 0),
1697
+	PCI_ROM(0x0e11, 0xf130, "thunder", "Compaq NetFlex-3/P", 0),
1698
+	PCI_ROM(0x0e11, 0xf150, "netflex3b", "Compaq NetFlex-3/P", 0),
1699
+	PCI_ROM(0x0e11, 0xae43, "netel100pi", "Compaq Netelligent Integrated 10/100 TX UTP", 0),
1700
+	PCI_ROM(0x0e11, 0xae40, "netel100d", "Compaq Netelligent Dual 10/100 TX PCI UTP", 0),
1701
+	PCI_ROM(0x0e11, 0xb011, "netel100i", "Compaq Netelligent 10/100 TX Embedded UTP", 0),
1702
+	PCI_ROM(0x108d, 0x0013, "oc2183", "Olicom OC-2183/2185", 0),
1703
+	PCI_ROM(0x108d, 0x0012, "oc2325", "Olicom OC-2325", 0),
1704
+	PCI_ROM(0x108d, 0x0014, "oc2326", "Olicom OC-2326", 0),
1705
+	PCI_ROM(0x0e11, 0xb030, "netelligent_10_100_ws_5100", "Compaq Netelligent 10/100 TX UTP", 0),
1706
+	PCI_ROM(0x0e11, 0xb012, "netelligent_10_t2", "Compaq Netelligent 10 T/2 PCI UTP/Coax", 0),
1707 1707
 };
1708 1708
 
1709 1709
 PCI_DRIVER ( tlan_driver, tlan_nics, PCI_NO_CLASS );

+ 36
- 36
src/drivers/net/tulip.c 파일 보기

@@ -2045,42 +2045,42 @@ static int tulip_check_duplex(struct nic *nic)
2045 2045
 }
2046 2046
 
2047 2047
 static struct pci_device_id tulip_nics[] = {
2048
-PCI_ROM(0x1011, 0x0002, "dc21040",     "Digital Tulip"),
2049
-PCI_ROM(0x1011, 0x0009, "ds21140",     "Digital Tulip Fast"),
2050
-PCI_ROM(0x1011, 0x0014, "dc21041",     "Digital Tulip+"),
2051
-PCI_ROM(0x1011, 0x0019, "ds21142",     "Digital Tulip 21142"),
2052
-PCI_ROM(0x10b7, 0x9300, "3csoho100b-tx","3ComSOHO100B-TX"),
2053
-PCI_ROM(0x10b9, 0x5261, "ali1563",     "ALi 1563 integrated ethernet"),
2054
-PCI_ROM(0x10d9, 0x0512, "mx98713",     "Macronix MX987x3"),
2055
-PCI_ROM(0x10d9, 0x0531, "mx98715",     "Macronix MX987x5"),
2056
-PCI_ROM(0x1113, 0x1217, "mxic-98715",  "Macronix MX987x5"),
2057
-PCI_ROM(0x11ad, 0xc115, "lc82c115",    "LinkSys LNE100TX"),
2058
-PCI_ROM(0x11ad, 0x0002, "82c168",      "Netgear FA310TX"),
2059
-PCI_ROM(0x1282, 0x9100, "dm9100",      "Davicom 9100"),
2060
-PCI_ROM(0x1282, 0x9102, "dm9102",      "Davicom 9102"),
2061
-PCI_ROM(0x1282, 0x9009, "dm9009",      "Davicom 9009"),
2062
-PCI_ROM(0x1282, 0x9132, "dm9132",      "Davicom 9132"),
2063
-PCI_ROM(0x1317, 0x0985, "centaur-p",   "ADMtek Centaur-P"),
2064
-PCI_ROM(0x1317, 0x0981, "an981",       "ADMtek AN981 Comet"),		/* ADMTek Centaur-P (stmicro) */
2065
-PCI_ROM(0x1113, 0x1216, "an983",       "ADMTek AN983 Comet"),
2066
-PCI_ROM(0x1317, 0x9511, "an983b",      "ADMTek Comet 983b"),
2067
-PCI_ROM(0x1317, 0x1985, "centaur-c",   "ADMTek Centaur-C"),
2068
-PCI_ROM(0x8086, 0x0039, "intel21145",  "Intel Tulip"),
2069
-PCI_ROM(0x125b, 0x1400, "ax88140",     "ASIX AX88140"),
2070
-PCI_ROM(0x11f6, 0x9881, "rl100tx",     "Compex RL100-TX"),
2071
-PCI_ROM(0x115d, 0x0003, "xircomtulip", "Xircom Tulip"),
2072
-PCI_ROM(0x104a, 0x0981, "tulip-0981",  "Tulip 0x104a 0x0981"),
2073
-PCI_ROM(0x104a, 0x2774, "SGThomson-STE10100A", "Tulip 0x104a 0x2774"),	/*Modified by Ramesh Chander*/
2074
-PCI_ROM(0x1113, 0x9511, "tulip-9511",  "Tulip 0x1113 0x9511"),
2075
-PCI_ROM(0x1186, 0x1561, "tulip-1561",  "Tulip 0x1186 0x1561"),
2076
-PCI_ROM(0x1259, 0xa120, "tulip-a120",  "Tulip 0x1259 0xa120"),
2077
-PCI_ROM(0x13d1, 0xab02, "tulip-ab02",  "Tulip 0x13d1 0xab02"),
2078
-PCI_ROM(0x13d1, 0xab03, "tulip-ab03",  "Tulip 0x13d1 0xab03"),
2079
-PCI_ROM(0x13d1, 0xab08, "tulip-ab08",  "Tulip 0x13d1 0xab08"),
2080
-PCI_ROM(0x14f1, 0x1803, "lanfinity",   "Conexant LANfinity"),
2081
-PCI_ROM(0x1626, 0x8410, "tulip-8410",  "Tulip 0x1626 0x8410"),
2082
-PCI_ROM(0x1737, 0xab08, "tulip-1737-ab08","Tulip 0x1737 0xab08"),
2083
-PCI_ROM(0x1737, 0xab09, "tulip-ab09",  "Tulip 0x1737 0xab09"),
2048
+PCI_ROM(0x1011, 0x0002, "dc21040",     "Digital Tulip", 0),
2049
+PCI_ROM(0x1011, 0x0009, "ds21140",     "Digital Tulip Fast", 0),
2050
+PCI_ROM(0x1011, 0x0014, "dc21041",     "Digital Tulip+", 0),
2051
+PCI_ROM(0x1011, 0x0019, "ds21142",     "Digital Tulip 21142", 0),
2052
+PCI_ROM(0x10b7, 0x9300, "3csoho100b-tx","3ComSOHO100B-TX", 0),
2053
+PCI_ROM(0x10b9, 0x5261, "ali1563",     "ALi 1563 integrated ethernet", 0),
2054
+PCI_ROM(0x10d9, 0x0512, "mx98713",     "Macronix MX987x3", 0),
2055
+PCI_ROM(0x10d9, 0x0531, "mx98715",     "Macronix MX987x5", 0),
2056
+PCI_ROM(0x1113, 0x1217, "mxic-98715",  "Macronix MX987x5", 0),
2057
+PCI_ROM(0x11ad, 0xc115, "lc82c115",    "LinkSys LNE100TX", 0),
2058
+PCI_ROM(0x11ad, 0x0002, "82c168",      "Netgear FA310TX", 0),
2059
+PCI_ROM(0x1282, 0x9100, "dm9100",      "Davicom 9100", 0),
2060
+PCI_ROM(0x1282, 0x9102, "dm9102",      "Davicom 9102", 0),
2061
+PCI_ROM(0x1282, 0x9009, "dm9009",      "Davicom 9009", 0),
2062
+PCI_ROM(0x1282, 0x9132, "dm9132",      "Davicom 9132", 0),
2063
+PCI_ROM(0x1317, 0x0985, "centaur-p",   "ADMtek Centaur-P", 0),
2064
+PCI_ROM(0x1317, 0x0981, "an981",       "ADMtek AN981 Comet", 0),		/* ADMTek Centaur-P (stmicro) */
2065
+PCI_ROM(0x1113, 0x1216, "an983",       "ADMTek AN983 Comet", 0),
2066
+PCI_ROM(0x1317, 0x9511, "an983b",      "ADMTek Comet 983b", 0),
2067
+PCI_ROM(0x1317, 0x1985, "centaur-c",   "ADMTek Centaur-C", 0),
2068
+PCI_ROM(0x8086, 0x0039, "intel21145",  "Intel Tulip", 0),
2069
+PCI_ROM(0x125b, 0x1400, "ax88140",     "ASIX AX88140", 0),
2070
+PCI_ROM(0x11f6, 0x9881, "rl100tx",     "Compex RL100-TX", 0),
2071
+PCI_ROM(0x115d, 0x0003, "xircomtulip", "Xircom Tulip", 0),
2072
+PCI_ROM(0x104a, 0x0981, "tulip-0981",  "Tulip 0x104a 0x0981", 0),
2073
+PCI_ROM(0x104a, 0x2774, "SGThomson-STE10100A", "Tulip 0x104a 0x2774", 0),	/*Modified by Ramesh Chander*/
2074
+PCI_ROM(0x1113, 0x9511, "tulip-9511",  "Tulip 0x1113 0x9511", 0),
2075
+PCI_ROM(0x1186, 0x1561, "tulip-1561",  "Tulip 0x1186 0x1561", 0),
2076
+PCI_ROM(0x1259, 0xa120, "tulip-a120",  "Tulip 0x1259 0xa120", 0),
2077
+PCI_ROM(0x13d1, 0xab02, "tulip-ab02",  "Tulip 0x13d1 0xab02", 0),
2078
+PCI_ROM(0x13d1, 0xab03, "tulip-ab03",  "Tulip 0x13d1 0xab03", 0),
2079
+PCI_ROM(0x13d1, 0xab08, "tulip-ab08",  "Tulip 0x13d1 0xab08", 0),
2080
+PCI_ROM(0x14f1, 0x1803, "lanfinity",   "Conexant LANfinity", 0),
2081
+PCI_ROM(0x1626, 0x8410, "tulip-8410",  "Tulip 0x1626 0x8410", 0),
2082
+PCI_ROM(0x1737, 0xab08, "tulip-1737-ab08","Tulip 0x1737 0xab08", 0),
2083
+PCI_ROM(0x1737, 0xab09, "tulip-ab09",  "Tulip 0x1737 0xab09", 0),
2084 2084
 };
2085 2085
 
2086 2086
 PCI_DRIVER ( tulip_driver, tulip_nics, PCI_NO_CLASS );

+ 5
- 5
src/drivers/net/via-rhine.c 파일 보기

@@ -1424,11 +1424,11 @@ static struct nic_operations rhine_operations = {
1424 1424
 };
1425 1425
 
1426 1426
 static struct pci_device_id rhine_nics[] = {
1427
-PCI_ROM(0x1106, 0x3065, "dlink-530tx",     "VIA 6102"),
1428
-PCI_ROM(0x1106, 0x3106, "via-rhine-6105",  "VIA 6105"),
1429
-PCI_ROM(0x1106, 0x3043, "dlink-530tx-old", "VIA 3043"),		/* Rhine-I 86c100a */
1430
-PCI_ROM(0x1106, 0x3053, "via6105m",        "VIA 6105M"),	
1431
-PCI_ROM(0x1106, 0x6100, "via-rhine-old",   "VIA 86C100A"),	/* Rhine-II */
1427
+PCI_ROM(0x1106, 0x3065, "dlink-530tx",     "VIA 6102", 0),
1428
+PCI_ROM(0x1106, 0x3106, "via-rhine-6105",  "VIA 6105", 0),
1429
+PCI_ROM(0x1106, 0x3043, "dlink-530tx-old", "VIA 3043", 0),		/* Rhine-I 86c100a */
1430
+PCI_ROM(0x1106, 0x3053, "via6105m",        "VIA 6105M", 0),
1431
+PCI_ROM(0x1106, 0x6100, "via-rhine-old",   "VIA 86C100A", 0),	/* Rhine-II */
1432 1432
 };
1433 1433
 
1434 1434
 PCI_DRIVER ( rhine_driver, rhine_nics, PCI_NO_CLASS );

+ 1
- 1
src/drivers/net/via-velocity.c 파일 보기

@@ -1930,7 +1930,7 @@ int pci_set_power_state(struct pci_device *dev, int state)
1930 1930
 }
1931 1931
 
1932 1932
 static struct pci_device_id velocity_nics[] = {
1933
-	PCI_ROM(0x1106, 0x3119, "via-velocity", "VIA Networking Velocity Family Gigabit Ethernet Adapter"),
1933
+	PCI_ROM(0x1106, 0x3119, "via-velocity", "VIA Networking Velocity Family Gigabit Ethernet Adapter", 0),
1934 1934
 };
1935 1935
 
1936 1936
 PCI_DRIVER ( velocity_driver, velocity_nics, PCI_NO_CLASS );

+ 1
- 1
src/drivers/net/virtio-net.c 파일 보기

@@ -298,7 +298,7 @@ static int virtnet_probe(struct nic *nic, struct pci_device *pci)
298 298
 }
299 299
 
300 300
 static struct pci_device_id virtnet_nics[] = {
301
-PCI_ROM(0x1af4, 0x1000, "virtio-net",              "Virtio Network Interface"),
301
+PCI_ROM(0x1af4, 0x1000, "virtio-net",              "Virtio Network Interface", 0),
302 302
 };
303 303
 
304 304
 PCI_DRIVER ( virtnet_driver, virtnet_nics, PCI_NO_CLASS );

+ 2
- 2
src/drivers/net/w89c840.c 파일 보기

@@ -610,8 +610,8 @@ static struct nic_operations w89c840_operations = {
610 610
 };
611 611
 
612 612
 static struct pci_device_id w89c840_nics[] = {
613
-PCI_ROM(0x1050, 0x0840, "winbond840",     "Winbond W89C840F"),
614
-PCI_ROM(0x11f6, 0x2011, "compexrl100atx", "Compex RL100ATX"),
613
+PCI_ROM(0x1050, 0x0840, "winbond840",     "Winbond W89C840F", 0),
614
+PCI_ROM(0x11f6, 0x2011, "compexrl100atx", "Compex RL100ATX", 0),
615 615
 };
616 616
 
617 617
 PCI_DRIVER ( w89c840_driver, w89c840_nics, PCI_NO_CLASS );

+ 7
- 4
src/include/gpxe/pci.h 파일 보기

@@ -241,6 +241,8 @@ struct pci_device_id {
241 241
 	uint16_t vendor;
242 242
 	/** PCI device ID */
243 243
 	uint16_t device;
244
+	/** Arbitrary driver data */
245
+	unsigned long driver_data;
244 246
 };
245 247
 
246 248
 /** Match-anything ID */
@@ -328,10 +330,11 @@ struct pci_driver {
328 330
  * is also parsed by parserom.pl to generate Makefile rules and files
329 331
  * for rom-o-matic.
330 332
  */
331
-#define PCI_ROM( _vendor, _device, _name, _description ) {	\
332
-	.vendor = _vendor,					\
333
-	.device = _device,					\
334
-	.name = _name,						\
333
+#define PCI_ROM( _vendor, _device, _name, _description, _data ) {	\
334
+	.vendor = _vendor,						\
335
+	.device = _device,						\
336
+	.name = _name,							\
337
+	.driver_data = _data						\
335 338
 }
336 339
 
337 340
 extern void adjust_pci_device ( struct pci_device *pci );

+ 2
- 1
src/util/parserom.pl 파일 보기

@@ -45,7 +45,8 @@ while ( <DRV> ) {
45 45
          \s*0x([0-9A-Fa-f]{4})\s*, # PCI vendor
46 46
          \s*0x([0-9A-Fa-f]{4})\s*, # PCI device
47 47
          \s*\"([^\"]*)\"\s*,	   # Image
48
-         \s*\"([^\"]*)\"\s*	   # Description
48
+         \s*\"([^\"]*)\"\s*,	   # Description
49
+         \s*.*\s*		   # Driver data
49 50
        \)/x ) {
50 51
     ( my $vendor, my $device, my $image, my $desc ) = ( lc $1, lc $2, $3, $4 );
51 52
     rom ( "pci", $image, $desc, $vendor, $device );

Loading…
취소
저장