From c6690034187dccac5aa79430e1a7d6ae04012a43 Mon Sep 17 00:00:00 2001 From: Stanislav Motylkov Date: Sat, 9 Mar 2019 21:00:54 +0300 Subject: [PATCH] [MEDIA][INF] Improve network adapter names --- media/inf/netamd.inf | 2 +- media/inf/nete1000.inf | 112 +++++++++++++++++++++++++++-------------- media/inf/netisa.inf | 2 +- media/inf/netrtl.inf | 10 ++-- media/inf/netrtpnt.inf | 2 +- 5 files changed, 82 insertions(+), 46 deletions(-) diff --git a/media/inf/netamd.inf b/media/inf/netamd.inf index 2e799de8346..00f361c99ab 100644 --- a/media/inf/netamd.inf +++ b/media/inf/netamd.inf @@ -59,7 +59,7 @@ LoadOrderGroup = NDIS ReactOS = "ReactOS Team" AMDMfg = "Advanced Micro Devices (AMD)" -PCNET.DeviceDesc = "AMD 79c970 [PCnet32 LANCE]" +PCNET.DeviceDesc = "AMD PCnet Am79C970 PCI Ethernet Adapter" [Strings.0a] ReactOS = "Equipo de ReactOS" diff --git a/media/inf/nete1000.inf b/media/inf/nete1000.inf index 9eabcecfad2..128d86cddef 100644 --- a/media/inf/nete1000.inf +++ b/media/inf/nete1000.inf @@ -18,43 +18,43 @@ DefaultDestDir = 12 %IntelMfg% = IntelMfg [IntelMfg] -%IntelE1000.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1000 -%IntelE1000.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1001 -%IntelE1000.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1004 -%IntelE1000.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1008 -%IntelE1000.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1009 -%IntelE1000.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_100A -%IntelE1000.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_100C -%IntelE1000.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_100D -%IntelE1000.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_100E -%IntelE1000.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_100F -%IntelE1000.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1010 -%IntelE1000.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1011 -%IntelE1000.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1012 -%IntelE1000.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1013 -%IntelE1000.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1014 -%IntelE1000.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1015 -%IntelE1000.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1016 -%IntelE1000.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1017 -%IntelE1000.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1018 -%IntelE1000.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1019 -%IntelE1000.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_101A -%IntelE1000.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_101D -%IntelE1000.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_101E -%IntelE1000.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1026 -%IntelE1000.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1027 -%IntelE1000.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1028 -%IntelE1000.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1075 -%IntelE1000.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1076 -%IntelE1000.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1077 -%IntelE1000.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1078 -%IntelE1000.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1079 -%IntelE1000.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_107A -%IntelE1000.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_107B -%IntelE1000.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_107C -%IntelE1000.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_108A -%IntelE1000.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1099 -%IntelE1000.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_10B5 +%IntelE1000_1000.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1000 +%IntelE1000_1001.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1001 +%IntelE1000_1004.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1004 +%IntelE1000_1008.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1008 +%IntelE1000_1009.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1009 +%IntelE1000_100A.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_100A +%IntelE1000_100C.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_100C +%IntelE1000_100D.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_100D +%IntelE1000_100E.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_100E +%IntelE1000_100F.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_100F +%IntelE1000_1010.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1010 +%IntelE1000_1011.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1011 +%IntelE1000_1012.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1012 +%IntelE1000_1013.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1013 +%IntelE1000_1014.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1014 +%IntelE1000_1015.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1015 +%IntelE1000_1016.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1016 +%IntelE1000_1017.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1017 +%IntelE1000_1018.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1018 +%IntelE1000_1019.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1019 +%IntelE1000_101A.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_101A +%IntelE1000_101D.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_101D +%IntelE1000_101E.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_101E +%IntelE1000_1026.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1026 +%IntelE1000_1027.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1027 +%IntelE1000_1028.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1028 +%IntelE1000_1075.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1075 +%IntelE1000_1076.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1076 +%IntelE1000_1077.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1077 +%IntelE1000_1078.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1078 +%IntelE1000_1079.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1079 +%IntelE1000_107A.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_107A +%IntelE1000_107B.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_107B +%IntelE1000_107C.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_107C +%IntelE1000_108A.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_108A +%IntelE1000_1099.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1099 +%IntelE1000_10B5.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_10B5 ;----------------------------- E1000 DRIVER ----------------------------- @@ -83,4 +83,40 @@ ReactOS = "ReactOS Team" IntelMfg = "Intel" -IntelE1000.DeviceDesc = "Intel PRO/1000 Ethernet Adapter" +IntelE1000_1000.DeviceDesc = "Intel 82542-based PCI Ethernet Adapter" +IntelE1000_1001.DeviceDesc = "Intel 82543GC Fiber PCI Ethernet Adapter" +IntelE1000_1004.DeviceDesc = "Intel 82543GC Copper PCI Ethernet Adapter" +IntelE1000_1008.DeviceDesc = "Intel 82544EI Copper PCI-X Ethernet Adapter" +IntelE1000_1009.DeviceDesc = "Intel 82544EI Fiber PCI-X Ethernet Adapter" +IntelE1000_100A.DeviceDesc = "Intel 82540EM PCI Ethernet Adapter" +IntelE1000_100C.DeviceDesc = "Intel 82544GC Copper PCI Ethernet Adapter" +IntelE1000_100D.DeviceDesc = "Intel 82544GC Integrated PCI Ethernet Adapter" +IntelE1000_100E.DeviceDesc = "Intel 82540EM PCI Ethernet Adapter" +IntelE1000_100F.DeviceDesc = "Intel 82545EM Copper PCI-X Ethernet Adapter" +IntelE1000_1010.DeviceDesc = "Intel 82546EB Copper PCI-X Ethernet Adapter" +IntelE1000_1011.DeviceDesc = "Intel 82545EM Fiber PCI-X Ethernet Adapter" +IntelE1000_1012.DeviceDesc = "Intel 82546EB Fiber PCI-X Ethernet Adapter" +IntelE1000_1013.DeviceDesc = "Intel 82541EI PCI Ethernet Adapter" +IntelE1000_1014.DeviceDesc = "Intel 82541EI Integrated PCI Ethernet Adapter" +IntelE1000_1015.DeviceDesc = "Intel 82540EM Integrated PCI Ethernet Adapter" +IntelE1000_1016.DeviceDesc = "Intel 82540EP Integrated PCI Ethernet Adapter" +IntelE1000_1017.DeviceDesc = "Intel 82540EP PCI Ethernet Adapter" +IntelE1000_1018.DeviceDesc = "Intel 82541EI Mobile PCI Ethernet Adapter" +IntelE1000_1019.DeviceDesc = "Intel 82547EI PCI Ethernet Adapter" +IntelE1000_101A.DeviceDesc = "Intel 82547EI Mobile PCI Ethernet Adapter" +IntelE1000_101D.DeviceDesc = "Intel 82546EB Quad Copper PCI-X Ethernet Adapter" +IntelE1000_101E.DeviceDesc = "Intel 82540EP Low Profile PCI Ethernet Adapter" +IntelE1000_1026.DeviceDesc = "Intel 82545GM Copper PCI-X Ethernet Adapter" +IntelE1000_1027.DeviceDesc = "Intel 82545GM Fiber PCI-X Ethernet Adapter" +IntelE1000_1028.DeviceDesc = "Intel 82545GM SerDes PCI Ethernet Adapter" +IntelE1000_1075.DeviceDesc = "Intel 82547GI PCI Ethernet Adapter" +IntelE1000_1076.DeviceDesc = "Intel 82541GI PCI Ethernet Adapter" +IntelE1000_1077.DeviceDesc = "Intel 82541GI Mobile PCI Ethernet Adapter" +IntelE1000_1078.DeviceDesc = "Intel 82541ER PCI Ethernet Adapter" +IntelE1000_1079.DeviceDesc = "Intel 82546GB Copper PCI-X Ethernet Adapter" +IntelE1000_107A.DeviceDesc = "Intel 82546GB Fiber PCI Ethernet Adapter" +IntelE1000_107B.DeviceDesc = "Intel 82546GB SerDes PCI Ethernet Adapter" +IntelE1000_107C.DeviceDesc = "Intel 82541PI PCI Ethernet Adapter" +IntelE1000_108A.DeviceDesc = "Intel 82546GB PCI-E Ethernet Adapter" +IntelE1000_1099.DeviceDesc = "Intel 82546GB Quad Copper PCI Ethernet Adapter" +IntelE1000_10B5.DeviceDesc = "Intel 82546GB Quad Copper KSP3 PCI-X Ethernet Adapter" diff --git a/media/inf/netisa.inf b/media/inf/netisa.inf index 2f967014dd6..a9532686d2b 100644 --- a/media/inf/netisa.inf +++ b/media/inf/netisa.inf @@ -52,7 +52,7 @@ LoadOrderGroup = NDIS ReactOS = "ReactOS Team" GenericMfg = "(Generic network cards)" -*PNP80D6.DeviceDesc = "NE2000 Compatible" +*PNP80D6.DeviceDesc = "NE2000 Compatible ISA Ethernet Adapter" [Strings.0405] GenericMfg = "(Generické síťové karty)" diff --git a/media/inf/netrtl.inf b/media/inf/netrtl.inf index eefe9051523..4e8c3588630 100644 --- a/media/inf/netrtl.inf +++ b/media/inf/netrtl.inf @@ -69,11 +69,11 @@ DLinkMfg = "D-Link" LevelOneMfg = "LevelOne" CompaqMfg = "Compaq" -Realtek8139.DeviceDesc = "Realtek RTL8139 Ethernet Adapter" -AcctonEN1207D.DeviceDesc = "Accton EN-1207D (RTL8139) Ethernet Adapter" -DLinkDFE538TX.DeviceDesc = "D-Link DFE-538TX (RTL8139) Ethernet Adapter" -LevelOneFPC0106TX.DeviceDesc = "LevelOne FPC-0106Tx (RTL8139) Ethernet Adapter" -CompaqHNE300.DeviceDesc = "Compaq HNE-300 (RTL8139C) Ethernet Adapter" +Realtek8139.DeviceDesc = "Realtek RTL8139 PCI Ethernet Adapter" +AcctonEN1207D.DeviceDesc = "Accton EN-1207D (RTL8139) PCI Ethernet Adapter" +DLinkDFE538TX.DeviceDesc = "D-Link DFE-538TX (RTL8139) PCI Ethernet Adapter" +LevelOneFPC0106TX.DeviceDesc = "LevelOne FPC-0106Tx (RTL8139) PCI Ethernet Adapter" +CompaqHNE300.DeviceDesc = "Compaq HNE-300 (RTL8139C) PCI Ethernet Adapter" [Strings.0a] ReactOS = "Equipo de ReactOS" diff --git a/media/inf/netrtpnt.inf b/media/inf/netrtpnt.inf index af93d709250..14723ccf105 100644 --- a/media/inf/netrtpnt.inf +++ b/media/inf/netrtpnt.inf @@ -52,7 +52,7 @@ LoadOrderGroup = NDIS ReactOS = "ReactOS Team" RealtekMfg = "Realtek Semiconductor Co., Ltd." -PCI\VEN_10EC&DEV_8029.DeviceDesc = "RTL-8029(AS)" +PCI\VEN_10EC&DEV_8029.DeviceDesc = "Realtek RTL8029 PCI Ethernet Adapter" [Strings.0a] ReactOS = "Equipo de ReactOS"