From 9c8ef7369fabdea8fd2d1da3e12de0e8e9d02c7e Mon Sep 17 00:00:00 2001 From: Eric Kohl Date: Mon, 3 Feb 2025 01:15:10 +0100 Subject: [PATCH] [e1000][ne2000][pcnet][rtl8139] Add missing UpperRange and LowerRange values to network adapter inf files These values will be used for binding network adapters to protocol drivers. Right now we use hard-coded binding. --- drivers/network/dd/e1000/nete1000.inf | 6 ++++++ drivers/network/dd/ne2000/netne.inf | 3 +++ drivers/network/dd/pcnet/netamd.inf | 3 +++ drivers/network/dd/rtl8139/netrtl.inf | 6 ++++++ 4 files changed, 18 insertions(+) diff --git a/drivers/network/dd/e1000/nete1000.inf b/drivers/network/dd/e1000/nete1000.inf index 7ae4df0d4f1..2540412a129 100644 --- a/drivers/network/dd/e1000/nete1000.inf +++ b/drivers/network/dd/e1000/nete1000.inf @@ -61,11 +61,17 @@ DefaultDestDir = 12 [E1000_Inst.ndi.NT] Characteristics = 0x4 ; NCF_PHYSICAL BusType = 5 ; PCIBus +AddReg = E1000_AddReg.NT CopyFiles = E1000_CopyFiles.NT [E1000_CopyFiles.NT] e1000.sys +[E1000_AddReg.NT] +HKR, Ndi, Service, 0, "e1000" +HKR, Ndi\Interfaces, UpperRange, 0, "ndis5" +HKR, Ndi\Interfaces, LowerRange, 0, "ethernet" + [E1000_Inst.ndi.NT.Services] AddService = e1000, 0x00000002, E1000_Service_Inst diff --git a/drivers/network/dd/ne2000/netne.inf b/drivers/network/dd/ne2000/netne.inf index 208e6c49a29..01a07793207 100644 --- a/drivers/network/dd/ne2000/netne.inf +++ b/drivers/network/dd/ne2000/netne.inf @@ -42,6 +42,9 @@ CopyFiles = NE2000_CopyFiles.NT [NE2000_AddReg.NT] HKR,,Port,0x00000000,"c100" HKR,,Irq,0x00000000,"B" +HKR, Ndi, Service, 0, "ne2000" +HKR, Ndi\Interfaces, UpperRange, 0, "ndis5" +HKR, Ndi\Interfaces, LowerRange, 0, "ethernet" [NE2000_CopyFiles.NT] ne2000.sys diff --git a/drivers/network/dd/pcnet/netamd.inf b/drivers/network/dd/pcnet/netamd.inf index 5792ffd58d3..0ac4fd6f7fe 100644 --- a/drivers/network/dd/pcnet/netamd.inf +++ b/drivers/network/dd/pcnet/netamd.inf @@ -39,6 +39,9 @@ HKR,,LED2,,"10000" HKR,,LED3,,"10000" HKR,,MPMODE,,"0" HKR,,TP,,"1" +HKR, Ndi, Service, 0, "PCNet" +HKR, Ndi\Interfaces, UpperRange, 0, "ndis5" +HKR, Ndi\Interfaces, LowerRange, 0, "ethernet" [PCNet_CopyFiles.NT] pcnet.sys diff --git a/drivers/network/dd/rtl8139/netrtl.inf b/drivers/network/dd/rtl8139/netrtl.inf index 461376d408d..5ffbe9283c0 100644 --- a/drivers/network/dd/rtl8139/netrtl.inf +++ b/drivers/network/dd/rtl8139/netrtl.inf @@ -43,11 +43,17 @@ DefaultDestDir = 12 [RTL8139_Inst.ndi.NT] Characteristics = 0x4 ; NCF_PHYSICAL BusType = 5 ; PCIBus +AddReg = RTL8139_AddReg.NT CopyFiles = RTL8139_CopyFiles.NT [RTL8139_CopyFiles.NT] rtl8139.sys +[RTL8139_AddReg.NT] +HKR, Ndi, Service, 0, "rtl8139" +HKR, Ndi\Interfaces, UpperRange, 0, "ndis5" +HKR, Ndi\Interfaces, LowerRange, 0, "ethernet" + [RTL8139_Inst.ndi.NT.Services] AddService = rtl8139, 0x00000002, RTL8139_Service_Inst