https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6924b8ff3985224a2d094c...
commit 6924b8ff3985224a2d094ce509e4b843f387ab32 Author: Stanislav Motylkov x86corez@gmail.com AuthorDate: Sun Jun 20 20:16:33 2021 +0300 Commit: Stanislav Motylkov x86corez@gmail.com CommitDate: Sun Jun 20 20:16:33 2021 +0300
[NE2000] Combine two INF files into one for ISA and PCI cards --- drivers/network/dd/ne2000/CMakeLists.txt | 2 +- drivers/network/dd/ne2000/netne2000.inf | 38 ++++++++++++---- drivers/network/dd/ne2000/netrtl8029.inf | 74 -------------------------------- 3 files changed, 31 insertions(+), 83 deletions(-)
diff --git a/drivers/network/dd/ne2000/CMakeLists.txt b/drivers/network/dd/ne2000/CMakeLists.txt index ba6af5b8526..23628771d29 100644 --- a/drivers/network/dd/ne2000/CMakeLists.txt +++ b/drivers/network/dd/ne2000/CMakeLists.txt @@ -11,4 +11,4 @@ add_pch(ne2000 include/ne2000.h SOURCE) set_module_type(ne2000 kernelmodedriver) add_importlibs(ne2000 ndis ntoskrnl hal) add_cd_file(TARGET ne2000 DESTINATION reactos/system32/drivers FOR all) -add_driver_inf(ne2000 netne2000.inf netrtl8029.inf) +add_driver_inf(ne2000 netne2000.inf) diff --git a/drivers/network/dd/ne2000/netne2000.inf b/drivers/network/dd/ne2000/netne2000.inf index cbcc1c41d7d..7f8412c71e2 100644 --- a/drivers/network/dd/ne2000/netne2000.inf +++ b/drivers/network/dd/ne2000/netne2000.inf @@ -1,6 +1,6 @@ -; NETISA.INF +; NETNE2000.INF
-; Installation file for ISA network cards +; Installation file for NE2000-compatible network cards
[Version] Signature = "$Windows NT$" @@ -16,18 +16,28 @@ DefaultDestDir = 12
[Manufacturer] %GenericMfg% = GenericMfg +%RealtekMfg% = RealtekMfg
[GenericMfg] -%*PNP80D6.DeviceDesc% = NE2000_Inst.ndi,*PNP80D6 +%*PNP80D6.DeviceDesc% = NE2000_Inst_Isa.ndi,*PNP80D6 + +[RealtekMfg] +%PCI\VEN_10EC&DEV_8029.DeviceDesc% = NE2000_Inst_Pci.ndi,PCI\VEN_10EC&DEV_8029
;---------------------------- NE2000 DRIVER -----------------------------
-[NE2000_Inst.ndi.NT] +[NE2000_Inst_Isa.ndi.NT] Characteristics = 0x4 ; NCF_PHYSICAL BusType = 14 ; PNPIsaBus AddReg = NE2000_AddReg.NT CopyFiles = NE2000_CopyFiles.NT
+[NE2000_Inst_Pci.ndi.NT] +Characteristics = 0x4 ; NCF_PHYSICAL +BusType = 5 ; PCIBus +AddReg = NE2000_AddReg.NT +CopyFiles = NE2000_CopyFiles.NT + [NE2000_AddReg.NT] HKR,,Port,0x00000000,"c100" HKR,,Irq,0x00000000,"B" @@ -35,7 +45,10 @@ HKR,,Irq,0x00000000,"B" [NE2000_CopyFiles.NT] ne2000.sys
-[NE2000_Inst.ndi.NT.Services] +[NE2000_Inst_Isa.ndi.NT.Services] +AddService = ne2000, 0x00000002, ne2000_Service_Inst + +[NE2000_Inst_Pci.ndi.NT.Services] AddService = ne2000, 0x00000002, ne2000_Service_Inst
[ne2000_Service_Inst] @@ -51,7 +64,10 @@ LoadOrderGroup = NDIS ReactOS = "ReactOS Team"
GenericMfg = "(Generic network cards)" -*PNP80D6.DeviceDesc = "NE2000 Compatible ISA Ethernet Adapter" +*PNP80D6.DeviceDesc = "NE2000-compatible Ethernet Adapter" + +RealtekMfg = "Realtek Semiconductor Co., Ltd." +PCI\VEN_10EC&DEV_8029.DeviceDesc = "Realtek RTL8029 PCI Ethernet Adapter"
[Strings.0405] GenericMfg = "(Generické síťové karty)" @@ -77,22 +93,27 @@ GenericMfg = "(標準 ネットワーク カード)"
[Strings.0415] ReactOS = "Zespół ReactOS" + GenericMfg = "(Standardowe karty sieciowe)" *PNP80D6.DeviceDesc = "Karta sieciowa kompatybilna z NE2000"
+PCI\VEN_10EC&DEV_8029.DeviceDesc = "Karta Realtek RTL8029 PCI Ethernet Adapter" + [Strings.0416] GenericMfg = "(Adaptadores de rede padrão)" *PNP80D6.DeviceDesc = "Compatível com NE2000"
[Strings.0418] ReactOS = "Echipa ReactOS" + GenericMfg = "(placă de rețea generică)" *PNP80D6.DeviceDesc = "Compatibile cu NE2000"
[Strings.0419] ReactOS = "Команда ReactOS" + GenericMfg = "(Стандартные сетевые адаптеры)" -*PNP80D6.DeviceDesc = "NE2000-совместимые" +*PNP80D6.DeviceDesc = "NE2000-совместимый сетевой адаптер"
[Strings.041B] GenericMfg = "(Generické sieťové karty)" @@ -106,8 +127,9 @@ GenericMfg = "(Umûmî Ağ Kartları)"
[Strings.0422] ReactOS = "Команда ReactOS" + GenericMfg = "(Стандартні мережеві адаптери)" -*PNP80D6.DeviceDesc = "NE2000-сумісні" +*PNP80D6.DeviceDesc = "NE2000-сумісний мережевий адаптер"
[Strings.0427] GenericMfg = "(Standartinės tinklo plokštės)" diff --git a/drivers/network/dd/ne2000/netrtl8029.inf b/drivers/network/dd/ne2000/netrtl8029.inf deleted file mode 100644 index 56cd50dc889..00000000000 --- a/drivers/network/dd/ne2000/netrtl8029.inf +++ /dev/null @@ -1,74 +0,0 @@ -; NETRTPNT.INF - -; Installation file for 8029 compatible netcards - -[Version] -Signature = "$Windows NT$" -;Signature = "$ReactOS$" -LayoutFile = layout.inf -Class = Net -ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} -Provider = %ReactOS% -DriverVer = 02/15/2007,1.01 - -[DestinationDirs] -DefaultDestDir = 12 - -[Manufacturer] -%RealtekMfg% = RealtekMfg - -[RealtekMfg] -%PCI\VEN_10EC&DEV_8029.DeviceDesc% = NE2000_Inst.ndi,PCI\VEN_10EC&DEV_8029 - -;---------------------------- NE2000 DRIVER ----------------------------- - -[NE2000_Inst.ndi.NT] -Characteristics = 0x4 ; NCF_PHYSICAL -BusType = 5 ; PCIBus -AddReg = NE2000_AddReg.NT -CopyFiles = NE2000_CopyFiles.NT - -[NE2000_AddReg.NT] -HKR,,Port,0x00000000,"c100" -HKR,,Irq,0x00000000,"B" - -[NE2000_CopyFiles.NT] -ne2000.sys - -[NE2000_Inst.ndi.NT.Services] -AddService = ne2000, 0x00000002, ne2000_Service_Inst - -[ne2000_Service_Inst] -ServiceType = 1 -StartType = 3 -ErrorControl = 1 -ServiceBinary = %12%\ne2000.sys -LoadOrderGroup = NDIS - -;-------------------------------- STRINGS ------------------------------- - -[Strings] -ReactOS = "ReactOS Team" - -RealtekMfg = "Realtek Semiconductor Co., Ltd." -PCI\VEN_10EC&DEV_8029.DeviceDesc = "Realtek RTL8029 PCI Ethernet Adapter" - -[Strings.0a] -ReactOS = "Equipo de ReactOS" - -[Strings.0415] -ReactOS = "Zespół ReactOS" - -PCI\VEN_10EC&DEV_8029.DeviceDesc = "Karta Realtek RTL8029 PCI Ethernet Adapter" - -[Strings.0418] -ReactOS = "Echipa ReactOS" - -[Strings.0419] -ReactOS = "Команда ReactOS" - -[Strings.041f] -ReactOS = "ReactOS Takımı" - -[Strings.0422] -ReactOS = "Команда ReactOS"
-
Stanislav Motylkov