[0.4.13][DD] Improve network driver infs

within netne.inf add the missing PCI\VEN_10EC&DEV_8029.DeviceDesc
I noticed it missing when testing with 86box VM selecting adapter "[PCI] Realtek RTL8029AS". Addendum to last commit.

While at it: compactify some of the infs a bit on the older branches:
writing here only the sizes for releases/0.4.14:
- nete1000.inf  9.204 ->  3.050bytes will fit into a single NTFS-cluster now (or within MFT) => endgoal reached
- netne.inf     1.636 ->  1.625bytes will fit into a single NTFS-cluster now (or within MFT) => endgoal reached
- netrtl.inf    4.139 ->  3.956bytes will fit into a single NTFS-cluster now (or within MFT) => endgoal reached

the files on even older branches became either the same size, or smaller.
This commit is contained in:
Joachim Henze 2024-06-20 02:36:39 +02:00
parent 8e5ffc4c3d
commit 82134fa965
3 changed files with 61 additions and 151 deletions

View file

@ -3,159 +3,77 @@
; Installation file for Intel-based NICs ; Installation file for Intel-based NICs
[Version] [Version]
Signature = "$Windows NT$" Signature="$Windows NT$"
;Signature = "$ReactOS$" LayoutFile=layout.inf
LayoutFile = layout.inf Class=Net
Class = Net ClassGUID={4D36E972-E325-11CE-BFC1-08002BE10318}
ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} Provider=%ReactOS%
Provider = %ReactOS% DriverVer=01/22/2019,1.00
DriverVer = 01/22/2019,1.00
[DestinationDirs] [DestinationDirs]
DefaultDestDir = 12 DefaultDestDir=12
[Manufacturer] [Manufacturer]
%IntelMfg% = IntelMfg %IntelMfg%=IntelMfg
[IntelMfg] [IntelMfg]
%IntelE1000_1000.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1000 %IntelE1000.DeviceDesc%=E1000_Inst.ndi,PCI\VEN_8086&DEV_1000
%IntelE1000_1001.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1001 %IntelE1000.DeviceDesc%=E1000_Inst.ndi,PCI\VEN_8086&DEV_1001
%IntelE1000_1004.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1004 %IntelE1000.DeviceDesc%=E1000_Inst.ndi,PCI\VEN_8086&DEV_1004
%IntelE1000_1008.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1008 %IntelE1000.DeviceDesc%=E1000_Inst.ndi,PCI\VEN_8086&DEV_1008
%IntelE1000_1009.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1009 %IntelE1000.DeviceDesc%=E1000_Inst.ndi,PCI\VEN_8086&DEV_1009
%IntelE1000_100A.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_100A %IntelE1000.DeviceDesc%=E1000_Inst.ndi,PCI\VEN_8086&DEV_100A
%IntelE1000_100C.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_100C %IntelE1000.DeviceDesc%=E1000_Inst.ndi,PCI\VEN_8086&DEV_100C
%IntelE1000_100D.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_100D %IntelE1000.DeviceDesc%=E1000_Inst.ndi,PCI\VEN_8086&DEV_100D
%IntelE1000_100E.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_100E %IntelE1000.DeviceDesc%=E1000_Inst.ndi,PCI\VEN_8086&DEV_100E
%IntelE1000_100F.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_100F %IntelE1000.DeviceDesc%=E1000_Inst.ndi,PCI\VEN_8086&DEV_100F
%IntelE1000_1010.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1010 %IntelE1000.DeviceDesc%=E1000_Inst.ndi,PCI\VEN_8086&DEV_1010
%IntelE1000_1011.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1011 %IntelE1000.DeviceDesc%=E1000_Inst.ndi,PCI\VEN_8086&DEV_1011
%IntelE1000_1012.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1012 %IntelE1000.DeviceDesc%=E1000_Inst.ndi,PCI\VEN_8086&DEV_1012
%IntelE1000_1013.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1013 %IntelE1000.DeviceDesc%=E1000_Inst.ndi,PCI\VEN_8086&DEV_1013
%IntelE1000_1014.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1014 %IntelE1000.DeviceDesc%=E1000_Inst.ndi,PCI\VEN_8086&DEV_1014
%IntelE1000_1015.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1015 %IntelE1000.DeviceDesc%=E1000_Inst.ndi,PCI\VEN_8086&DEV_1015
%IntelE1000_1016.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1016 %IntelE1000.DeviceDesc%=E1000_Inst.ndi,PCI\VEN_8086&DEV_1016
%IntelE1000_1017.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1017 %IntelE1000.DeviceDesc%=E1000_Inst.ndi,PCI\VEN_8086&DEV_1017
%IntelE1000_1018.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1018 %IntelE1000.DeviceDesc%=E1000_Inst.ndi,PCI\VEN_8086&DEV_1018
%IntelE1000_1019.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1019 %IntelE1000.DeviceDesc%=E1000_Inst.ndi,PCI\VEN_8086&DEV_1019
%IntelE1000_101A.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_101A %IntelE1000.DeviceDesc%=E1000_Inst.ndi,PCI\VEN_8086&DEV_101A
%IntelE1000_101D.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_101D %IntelE1000.DeviceDesc%=E1000_Inst.ndi,PCI\VEN_8086&DEV_101D
%IntelE1000_101E.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_101E %IntelE1000.DeviceDesc%=E1000_Inst.ndi,PCI\VEN_8086&DEV_101E
%IntelE1000_1026.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1026 %IntelE1000.DeviceDesc%=E1000_Inst.ndi,PCI\VEN_8086&DEV_1026
%IntelE1000_1027.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1027 %IntelE1000.DeviceDesc%=E1000_Inst.ndi,PCI\VEN_8086&DEV_1027
%IntelE1000_1028.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1028 %IntelE1000.DeviceDesc%=E1000_Inst.ndi,PCI\VEN_8086&DEV_1028
%IntelE1000_1075.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1075 %IntelE1000.DeviceDesc%=E1000_Inst.ndi,PCI\VEN_8086&DEV_1075
%IntelE1000_1076.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1076 %IntelE1000.DeviceDesc%=E1000_Inst.ndi,PCI\VEN_8086&DEV_1076
%IntelE1000_1077.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1077 %IntelE1000.DeviceDesc%=E1000_Inst.ndi,PCI\VEN_8086&DEV_1077
%IntelE1000_1078.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1078 %IntelE1000.DeviceDesc%=E1000_Inst.ndi,PCI\VEN_8086&DEV_1078
%IntelE1000_1079.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1079 %IntelE1000.DeviceDesc%=E1000_Inst.ndi,PCI\VEN_8086&DEV_1079
%IntelE1000_107A.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_107A %IntelE1000.DeviceDesc%=E1000_Inst.ndi,PCI\VEN_8086&DEV_107A
%IntelE1000_107B.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_107B %IntelE1000.DeviceDesc%=E1000_Inst.ndi,PCI\VEN_8086&DEV_107B
%IntelE1000_107C.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_107C %IntelE1000.DeviceDesc%=E1000_Inst.ndi,PCI\VEN_8086&DEV_107C
%IntelE1000_108A.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_108A %IntelE1000.DeviceDesc%=E1000_Inst.ndi,PCI\VEN_8086&DEV_108A
%IntelE1000_1099.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_1099 %IntelE1000.DeviceDesc%=E1000_Inst.ndi,PCI\VEN_8086&DEV_1099
%IntelE1000_10B5.DeviceDesc% = E1000_Inst.ndi,PCI\VEN_8086&DEV_10B5 %IntelE1000.DeviceDesc%=E1000_Inst.ndi,PCI\VEN_8086&DEV_10B5
;----------------------------- E1000 DRIVER -----------------------------
[E1000_Inst.ndi.NT] [E1000_Inst.ndi.NT]
Characteristics = 0x4 ; NCF_PHYSICAL Characteristics=0x4
BusType = 5 ; PCIBus BusType=5
CopyFiles = E1000_CopyFiles.NT CopyFiles=E1000_CopyFiles.NT
[E1000_CopyFiles.NT] [E1000_CopyFiles.NT]
e1000.sys e1000.sys
[E1000_Inst.ndi.NT.Services] [E1000_Inst.ndi.NT.Services]
AddService = e1000, 0x00000002, E1000_Service_Inst AddService=e1000,0x00000002,E1000_Service_Inst
[E1000_Service_Inst] [E1000_Service_Inst]
ServiceType = 1 ServiceType=1
StartType = 3 StartType=3
ErrorControl = 0 ErrorControl=0
ServiceBinary = %12%\e1000.sys ServiceBinary=%12%\e1000.sys
LoadOrderGroup = NDIS LoadOrderGroup=NDIS
;-------------------------------- STRINGS -------------------------------
[Strings] [Strings]
ReactOS = "ReactOS Team" ReactOS="ReactOS Team"
IntelMfg="Intel"
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"
[Strings.0415]
IntelE1000_1000.DeviceDesc = "Karta Intel 82542-based PCI Ethernet Adapter"
IntelE1000_1001.DeviceDesc = "Karta Intel 82543GC Fiber PCI Ethernet Adapter"
IntelE1000_1004.DeviceDesc = "Karta Intel 82543GC Copper PCI Ethernet Adapter"
IntelE1000_1008.DeviceDesc = "Karta Intel 82544EI Copper PCI-X Ethernet Adapter"
IntelE1000_1009.DeviceDesc = "Karta Intel 82544EI Fiber PCI-X Ethernet Adapter"
IntelE1000_100A.DeviceDesc = "Karta Intel 82540EM PCI Ethernet Adapter"
IntelE1000_100C.DeviceDesc = "Karta Intel 82544GC Copper PCI Ethernet Adapter"
IntelE1000_100D.DeviceDesc = "Karta Intel 82544GC Integrated PCI Ethernet Adapter"
IntelE1000_100E.DeviceDesc = "Karta Intel 82540EM PCI Ethernet Adapter"
IntelE1000_100F.DeviceDesc = "Karta Intel 82545EM Copper PCI-X Ethernet Adapter"
IntelE1000_1010.DeviceDesc = "Karta Intel 82546EB Copper PCI-X Ethernet Adapter"
IntelE1000_1011.DeviceDesc = "Karta Intel 82545EM Fiber PCI-X Ethernet Adapter"
IntelE1000_1012.DeviceDesc = "Karta Intel 82546EB Fiber PCI-X Ethernet Adapter"
IntelE1000_1013.DeviceDesc = "Karta Intel 82541EI PCI Ethernet Adapter"
IntelE1000_1014.DeviceDesc = "Karta Intel 82541EI Integrated PCI Ethernet Adapter"
IntelE1000_1015.DeviceDesc = "Karta Intel 82540EM Integrated PCI Ethernet Adapter"
IntelE1000_1016.DeviceDesc = "Karta Intel 82540EP Integrated PCI Ethernet Adapter"
IntelE1000_1017.DeviceDesc = "Karta Intel 82540EP PCI Ethernet Adapter"
IntelE1000_1018.DeviceDesc = "Karta Intel 82541EI Mobile PCI Ethernet Adapter"
IntelE1000_1019.DeviceDesc = "Karta Intel 82547EI PCI Ethernet Adapter"
IntelE1000_101A.DeviceDesc = "Karta Intel 82547EI Mobile PCI Ethernet Adapter"
IntelE1000_101D.DeviceDesc = "Karta Intel 82546EB Quad Copper PCI-X Ethernet Adapter"
IntelE1000_101E.DeviceDesc = "Karta Intel 82540EP Low Profile PCI Ethernet Adapter"
IntelE1000_1026.DeviceDesc = "Karta Intel 82545GM Copper PCI-X Ethernet Adapter"
IntelE1000_1027.DeviceDesc = "Karta Intel 82545GM Fiber PCI-X Ethernet Adapter"
IntelE1000_1028.DeviceDesc = "Karta Intel 82545GM SerDes PCI Ethernet Adapter"
IntelE1000_1075.DeviceDesc = "Karta Intel 82547GI PCI Ethernet Adapter"
IntelE1000_1076.DeviceDesc = "Karta Intel 82541GI PCI Ethernet Adapter"
IntelE1000_1077.DeviceDesc = "Karta Intel 82541GI Mobile PCI Ethernet Adapter"
IntelE1000_1078.DeviceDesc = "Karta Intel 82541ER PCI Ethernet Adapter"
IntelE1000_1079.DeviceDesc = "Karta Intel 82546GB Copper PCI-X Ethernet Adapter"
IntelE1000_107A.DeviceDesc = "Karta Intel 82546GB Fiber PCI Ethernet Adapter"
IntelE1000_107B.DeviceDesc = "Karta Intel 82546GB SerDes PCI Ethernet Adapter"
IntelE1000_107C.DeviceDesc = "Karta Intel 82541PI PCI Ethernet Adapter"
IntelE1000_108A.DeviceDesc = "Karta Intel 82546GB PCI-E Ethernet Adapter"
IntelE1000_1099.DeviceDesc = "Karta Intel 82546GB Quad Copper PCI Ethernet Adapter"
IntelE1000_10B5.DeviceDesc = "Karta Intel 82546GB Quad Copper KSP3 PCI-X Ethernet Adapter"

View file

@ -4,7 +4,6 @@
[Version] [Version]
Signature = "$Windows NT$" Signature = "$Windows NT$"
;Signature = "$ReactOS$"
LayoutFile = layout.inf LayoutFile = layout.inf
Class = Net Class = Net
ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318}
@ -25,8 +24,6 @@ DefaultDestDir = 12
%*RTL8019.DeviceDesc% = NE2000_Inst_Isa.ndi,*RTL8019 %*RTL8019.DeviceDesc% = NE2000_Inst_Isa.ndi,*RTL8019
%PCI\VEN_10EC&DEV_8029.DeviceDesc% = NE2000_Inst_Pci.ndi,PCI\VEN_10EC&DEV_8029 %PCI\VEN_10EC&DEV_8029.DeviceDesc% = NE2000_Inst_Pci.ndi,PCI\VEN_10EC&DEV_8029
;---------------------------- NE2000 DRIVER -----------------------------
[NE2000_Inst_Isa.ndi.NT] [NE2000_Inst_Isa.ndi.NT]
Characteristics = 0x4 ; NCF_PHYSICAL Characteristics = 0x4 ; NCF_PHYSICAL
BusType = 14 ; PNPIsaBus BusType = 14 ; PNPIsaBus
@ -59,10 +56,10 @@ ErrorControl = 1
ServiceBinary = %12%\ne2000.sys ServiceBinary = %12%\ne2000.sys
LoadOrderGroup = NDIS LoadOrderGroup = NDIS
;-------------------------------- STRINGS -------------------------------
[Strings] [Strings]
ReactOS = "ReactOS Team" ReactOS = "ReactOS Team"
RealtekMfg = "Realtek"
GenericMfg = "(Generic network cards)" GenericMfg = "(Generic network cards)"
*PNP80D6.DeviceDesc = "NE2000 compatible" *PNP80D6.DeviceDesc = "NE2000-compatible Ethernet Adapter"
*RTL8019.DeviceDesc = "Realtek RTL8019AS Ethernet Adapter"
PCI\VEN_10EC&DEV_8029.DeviceDesc = "Realtek RTL8029 Ethernet Adapter"

View file

@ -4,7 +4,6 @@
[Version] [Version]
Signature = "$Windows NT$" Signature = "$Windows NT$"
;Signature = "$ReactOS$"
LayoutFile = layout.inf LayoutFile = layout.inf
Class = Net Class = Net
ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318} ClassGUID = {4D36E972-E325-11CE-BFC1-08002BE10318}
@ -38,8 +37,6 @@ DefaultDestDir = 12
[CompaqMfg] [CompaqMfg]
%CompaqHNE300.DeviceDesc% = RTL8139_Inst.ndi,PCI\VEN_021B&DEV_8139 %CompaqHNE300.DeviceDesc% = RTL8139_Inst.ndi,PCI\VEN_021B&DEV_8139
;----------------------------- RTL8139 DRIVER -----------------------------
[RTL8139_Inst.ndi.NT] [RTL8139_Inst.ndi.NT]
Characteristics = 0x4 ; NCF_PHYSICAL Characteristics = 0x4 ; NCF_PHYSICAL
BusType = 5 ; PCIBus BusType = 5 ; PCIBus
@ -58,8 +55,6 @@ ErrorControl = 0
ServiceBinary = %12%\rtl8139.sys ServiceBinary = %12%\rtl8139.sys
LoadOrderGroup = NDIS LoadOrderGroup = NDIS
;-------------------------------- STRINGS -------------------------------
[Strings] [Strings]
ReactOS = "ReactOS Team" ReactOS = "ReactOS Team"