[ros-diffs] [reactos] 02/02: [NVNET] Add more controller descriptions

[Stanislav Motylkov]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=11d3e3252dc01eb529515…

commit 11d3e3252dc01eb529515be79150919d8b47a0ca
Author:     Stanislav Motylkov <x86corez(a)gmail.com>
AuthorDate: Sat May 7 17:24:06 2022 +0300
Commit:     Stanislav Motylkov <x86corez(a)gmail.com>
CommitDate: Sat May 7 18:00:15 2022 +0300

    [NVNET] Add more controller descriptions
    
    Addendum to b79fbe23. Based on NvNetRecognizeHardware function in nic.c
---
 drivers/network/dd/nvnet/netnv.inf | 110 +++++++++++++++++++++++--------------
 1 file changed, 68 insertions(+), 42 deletions(-)

diff --git a/drivers/network/dd/nvnet/netnv.inf b/drivers/network/dd/nvnet/netnv.inf
index 9e1aafd4fee..31a05e9680b 100644
--- a/drivers/network/dd/nvnet/netnv.inf
+++ b/drivers/network/dd/nvnet/netnv.inf
@@ -21,46 +21,46 @@ DefaultDestDir = 12
 ExcludeFromSelect = *
 
 [nVidiaMfg]
-%NVNET.DeviceDesc% = NVNET_Inst_V1.ndi,PCI\VEN_10DE&DEV_01C3
-%NVNET.DeviceDesc% = NVNET_Inst_V1.ndi,PCI\VEN_10DE&DEV_0066
-%NVNET.DeviceDesc% = NVNET_Inst_V1.ndi,PCI\VEN_10DE&DEV_00D6
-%NVNET.DeviceDesc% = NVNET_Inst_V2.ndi,PCI\VEN_10DE&DEV_0086
-%NVNET.DeviceDesc% = NVNET_Inst_V2.ndi,PCI\VEN_10DE&DEV_008C
-%NVNET.DeviceDesc% = NVNET_Inst_V2.ndi,PCI\VEN_10DE&DEV_00E6
-%NVNET.DeviceDesc% = NVNET_Inst_V2.ndi,PCI\VEN_10DE&DEV_00DF
-%NVNET.DeviceDesc% = NVNET_Inst_V2.ndi,PCI\VEN_10DE&DEV_0056
-%NVNET.DeviceDesc% = NVNET_Inst_V2.ndi,PCI\VEN_10DE&DEV_0057
-%NVNET.DeviceDesc% = NVNET_Inst_V2.ndi,PCI\VEN_10DE&DEV_0037
-%NVNET.DeviceDesc% = NVNET_Inst_V2.ndi,PCI\VEN_10DE&DEV_0038
-%NVNET.DeviceDesc% = NVNET_Inst_V1.ndi,PCI\VEN_10DE&DEV_0268
-%NVNET.DeviceDesc% = NVNET_Inst_V1.ndi,PCI\VEN_10DE&DEV_0269
-%NVNET.DeviceDesc% = NVNET_Inst_V3.ndi,PCI\VEN_10DE&DEV_0372
-%NVNET.DeviceDesc% = NVNET_Inst_V3.ndi,PCI\VEN_10DE&DEV_0373
-%NVNET.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_03E5
-%NVNET.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_03E6
-%NVNET.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_03EE
-%NVNET.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_03EF
-%NVNET.DeviceDesc% = NVNET_Inst_V5.ndi,PCI\VEN_10DE&DEV_0450
-%NVNET.DeviceDesc% = NVNET_Inst_V5.ndi,PCI\VEN_10DE&DEV_0451
-%NVNET.DeviceDesc% = NVNET_Inst_V5.ndi,PCI\VEN_10DE&DEV_0452
-%NVNET.DeviceDesc% = NVNET_Inst_V5.ndi,PCI\VEN_10DE&DEV_0453
-%NVNET.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_054C
-%NVNET.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_054D
-%NVNET.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_054E
-%NVNET.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_054F
-%NVNET.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_07DC
-%NVNET.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_07DD
-%NVNET.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_07DE
-%NVNET.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_07DF
-%NVNET.DeviceDesc% = NVNET_Inst_V6.ndi,PCI\VEN_10DE&DEV_0760
-%NVNET.DeviceDesc% = NVNET_Inst_V6.ndi,PCI\VEN_10DE&DEV_0761
-%NVNET.DeviceDesc% = NVNET_Inst_V6.ndi,PCI\VEN_10DE&DEV_0762
-%NVNET.DeviceDesc% = NVNET_Inst_V6.ndi,PCI\VEN_10DE&DEV_0763
-%NVNET.DeviceDesc% = NVNET_Inst_V7.ndi,PCI\VEN_10DE&DEV_0AB0
-%NVNET.DeviceDesc% = NVNET_Inst_V7.ndi,PCI\VEN_10DE&DEV_0AB1
-%NVNET.DeviceDesc% = NVNET_Inst_V7.ndi,PCI\VEN_10DE&DEV_0AB2
-%NVNET.DeviceDesc% = NVNET_Inst_V7.ndi,PCI\VEN_10DE&DEV_0AB3
-%NVNET.DeviceDesc% = NVNET_Inst_V7.ndi,PCI\VEN_10DE&DEV_0D7D
+%nForce.DeviceDesc% = NVNET_Inst_V1.ndi,PCI\VEN_10DE&DEV_01C3
+%nForce2.DeviceDesc% = NVNET_Inst_V1.ndi,PCI\VEN_10DE&DEV_0066
+%nForce2.DeviceDesc% = NVNET_Inst_V1.ndi,PCI\VEN_10DE&DEV_00D6
+%nForce3.DeviceDesc% = NVNET_Inst_V2.ndi,PCI\VEN_10DE&DEV_0086
+%nForce3.DeviceDesc% = NVNET_Inst_V2.ndi,PCI\VEN_10DE&DEV_008C
+%nForce3.DeviceDesc% = NVNET_Inst_V2.ndi,PCI\VEN_10DE&DEV_00E6
+%nForce3.DeviceDesc% = NVNET_Inst_V2.ndi,PCI\VEN_10DE&DEV_00DF
+%CK804.DeviceDesc% = NVNET_Inst_V2.ndi,PCI\VEN_10DE&DEV_0056
+%CK804.DeviceDesc% = NVNET_Inst_V2.ndi,PCI\VEN_10DE&DEV_0057
+%MCP04.DeviceDesc% = NVNET_Inst_V2.ndi,PCI\VEN_10DE&DEV_0037
+%MCP04.DeviceDesc% = NVNET_Inst_V2.ndi,PCI\VEN_10DE&DEV_0038
+%MCP51.DeviceDesc% = NVNET_Inst_V1.ndi,PCI\VEN_10DE&DEV_0268
+%MCP51.DeviceDesc% = NVNET_Inst_V1.ndi,PCI\VEN_10DE&DEV_0269
+%MCP55.DeviceDesc% = NVNET_Inst_V3.ndi,PCI\VEN_10DE&DEV_0372
+%MCP55.DeviceDesc% = NVNET_Inst_V3.ndi,PCI\VEN_10DE&DEV_0373
+%MCP61.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_03E5
+%MCP61.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_03E6
+%MCP61.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_03EE
+%MCP61.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_03EF
+%MCP65.DeviceDesc% = NVNET_Inst_V5.ndi,PCI\VEN_10DE&DEV_0450
+%MCP65.DeviceDesc% = NVNET_Inst_V5.ndi,PCI\VEN_10DE&DEV_0451
+%MCP65.DeviceDesc% = NVNET_Inst_V5.ndi,PCI\VEN_10DE&DEV_0452
+%MCP65.DeviceDesc% = NVNET_Inst_V5.ndi,PCI\VEN_10DE&DEV_0453
+%MCP67.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_054C
+%MCP67.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_054D
+%MCP67.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_054E
+%MCP67.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_054F
+%MCP73.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_07DC
+%MCP73.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_07DD
+%MCP73.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_07DE
+%MCP73.DeviceDesc% = NVNET_Inst_V4.ndi,PCI\VEN_10DE&DEV_07DF
+%MCP77.DeviceDesc% = NVNET_Inst_V6.ndi,PCI\VEN_10DE&DEV_0760
+%MCP77.DeviceDesc% = NVNET_Inst_V6.ndi,PCI\VEN_10DE&DEV_0761
+%MCP77.DeviceDesc% = NVNET_Inst_V6.ndi,PCI\VEN_10DE&DEV_0762
+%MCP77.DeviceDesc% = NVNET_Inst_V6.ndi,PCI\VEN_10DE&DEV_0763
+%MCP79.DeviceDesc% = NVNET_Inst_V7.ndi,PCI\VEN_10DE&DEV_0AB0
+%MCP79.DeviceDesc% = NVNET_Inst_V7.ndi,PCI\VEN_10DE&DEV_0AB1
+%MCP79.DeviceDesc% = NVNET_Inst_V7.ndi,PCI\VEN_10DE&DEV_0AB2
+%MCP79.DeviceDesc% = NVNET_Inst_V7.ndi,PCI\VEN_10DE&DEV_0AB3
+%MCP89.DeviceDesc% = NVNET_Inst_V7.ndi,PCI\VEN_10DE&DEV_0D7D
 
 ;----------------------------- NVNET DRIVER -----------------------------
 
@@ -261,7 +261,20 @@ VT = "VLAN Tagging"
 VI = "VLAN ID"
 JF = "Jumbo Frame"
 
-NVNET.DeviceDesc = "nVidia nForce PCI Ethernet Controller"
+nForce.DeviceDesc = "nVidia nForce PCI Ethernet Controller"
+nForce2.DeviceDesc = "nVidia nForce2 PCI Ethernet Controller"
+nForce3.DeviceDesc = "nVidia nForce3 PCI Ethernet Controller"
+CK804.DeviceDesc = "nVidia CK804 PCI Ethernet Controller"
+MCP04.DeviceDesc = "nVidia MCP04 PCI Ethernet Controller"
+MCP51.DeviceDesc = "nVidia MCP51 PCI Ethernet Controller"
+MCP55.DeviceDesc = "nVidia MCP55 PCI Ethernet Controller"
+MCP61.DeviceDesc = "nVidia MCP61 PCI Ethernet Controller"
+MCP65.DeviceDesc = "nVidia MCP65 PCI Ethernet Controller"
+MCP67.DeviceDesc = "nVidia MCP67 PCI Ethernet Controller"
+MCP73.DeviceDesc = "nVidia MCP73 PCI Ethernet Controller"
+MCP77.DeviceDesc = "nVidia MCP77 PCI Ethernet Controller"
+MCP79.DeviceDesc = "nVidia MCP79 PCI Ethernet Controller"
+MCP89.DeviceDesc = "nVidia MCP89 PCI Ethernet Controller"
 
 [Strings.0419]
 ReactOS = "Команда ReactOS"
@@ -285,4 +298,17 @@ PP = "Приоритет кадров"
 VT = "Маркировка кадров"
 JF = "Кадры большого размера"
 
-NVNET.DeviceDesc = "nVidia nForce PCI сетевой контроллер"
+nForce.DeviceDesc = "nVidia nForce PCI сетевой контроллер"
+nForce2.DeviceDesc = "nVidia nForce2 PCI сетевой контроллер"
+nForce3.DeviceDesc = "nVidia nForce3 PCI сетевой контроллер"
+CK804.DeviceDesc = "nVidia CK804 PCI сетевой контроллер"
+MCP04.DeviceDesc = "nVidia MCP04 PCI сетевой контроллер"
+MCP51.DeviceDesc = "nVidia MCP51 PCI сетевой контроллер"
+MCP55.DeviceDesc = "nVidia MCP55 PCI сетевой контроллер"
+MCP61.DeviceDesc = "nVidia MCP61 PCI сетевой контроллер"
+MCP65.DeviceDesc = "nVidia MCP65 PCI сетевой контроллер"
+MCP67.DeviceDesc = "nVidia MCP67 PCI сетевой контроллер"
+MCP73.DeviceDesc = "nVidia MCP73 PCI сетевой контроллер"
+MCP77.DeviceDesc = "nVidia MCP77 PCI сетевой контроллер"
+MCP79.DeviceDesc = "nVidia MCP79 PCI сетевой контроллер"
+MCP89.DeviceDesc = "nVidia MCP89 PCI сетевой контроллер"