From 32d615fc10e183094f9e01e9cf8889a20b8aa28a Mon Sep 17 00:00:00 2001 From: Joachim Henze Date: Mon, 17 Jun 2024 22:41:31 +0200 Subject: [PATCH] [DD] Keep the network drivers infs 8.3 like on MS Windows (#7007) Windows has all its network drivers inf files in 8.3. This is an addendum to 0.4.15-dev-52-g 019f21ee1d764dff8586acc847a299714e83977a which moved us further away from our target. The commit on its own was a good idea actually to get the inf into the drivers directory and therefore simplifies adding and excluding drivers more locally (e.g. excluding works by adding a single hashtag within the specific drivers CMakeLists.txt now). But that cool feature doesn't require us to move away from our target. For the record: The historic netrtpnt.inf and netisa.inf (both 8.3) have been merged to netne2000.inf (not 8.3) by 0.4.15-dev-2763-g 6924b8ff3985224a2d094ce509e4b843f387ab32 Unification of that was cool too, but again: 8.3 is superior. Therefore netne.inf for that. Worst of all: Since the .inf files did contain their filename within a comment also, that means the historic renaming by the mentioned commit invalidated that comment. netamd.inf fixed by restoring the ancient filename before 0.4.15-dev-52-g 019f21ee1d764dff8586acc847a299714e83977a netrtl.inf fixed by restoring the ancient filename before 0.4.15-dev-52-g 019f21ee1d764dff8586acc847a299714e83977a netne.inf I fixed the comment manually. --- drivers/network/dd/ne2000/CMakeLists.txt | 2 +- drivers/network/dd/ne2000/{netne2000.inf => netne.inf} | 2 +- drivers/network/dd/pcnet/CMakeLists.txt | 2 +- drivers/network/dd/pcnet/{netpcnet.inf => netamd.inf} | 0 drivers/network/dd/rtl8139/CMakeLists.txt | 2 +- drivers/network/dd/rtl8139/{netrtl8139.inf => netrtl.inf} | 0 6 files changed, 4 insertions(+), 4 deletions(-) rename drivers/network/dd/ne2000/{netne2000.inf => netne.inf} (99%) rename drivers/network/dd/pcnet/{netpcnet.inf => netamd.inf} (100%) rename drivers/network/dd/rtl8139/{netrtl8139.inf => netrtl.inf} (100%) diff --git a/drivers/network/dd/ne2000/CMakeLists.txt b/drivers/network/dd/ne2000/CMakeLists.txt index 23628771d29..9f1ac11ffa0 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) +add_driver_inf(ne2000 netne.inf) diff --git a/drivers/network/dd/ne2000/netne2000.inf b/drivers/network/dd/ne2000/netne.inf similarity index 99% rename from drivers/network/dd/ne2000/netne2000.inf rename to drivers/network/dd/ne2000/netne.inf index 9dbd221dea8..208e6c49a29 100644 --- a/drivers/network/dd/ne2000/netne2000.inf +++ b/drivers/network/dd/ne2000/netne.inf @@ -1,4 +1,4 @@ -; NETNE2000.INF +; NETNE.INF ; Installation file for NE2000-compatible network cards diff --git a/drivers/network/dd/pcnet/CMakeLists.txt b/drivers/network/dd/pcnet/CMakeLists.txt index 439073eaff7..6ec5cfe0d82 100644 --- a/drivers/network/dd/pcnet/CMakeLists.txt +++ b/drivers/network/dd/pcnet/CMakeLists.txt @@ -15,4 +15,4 @@ add_pch(pcnet pcnet.h SOURCE) set_module_type(pcnet kernelmodedriver) add_importlibs(pcnet ndis ntoskrnl hal) add_cd_file(TARGET pcnet DESTINATION reactos/system32/drivers FOR all) -add_driver_inf(pcnet netpcnet.inf) +add_driver_inf(pcnet netamd.inf) diff --git a/drivers/network/dd/pcnet/netpcnet.inf b/drivers/network/dd/pcnet/netamd.inf similarity index 100% rename from drivers/network/dd/pcnet/netpcnet.inf rename to drivers/network/dd/pcnet/netamd.inf diff --git a/drivers/network/dd/rtl8139/CMakeLists.txt b/drivers/network/dd/rtl8139/CMakeLists.txt index 82b7aecf929..b56dea75ee8 100644 --- a/drivers/network/dd/rtl8139/CMakeLists.txt +++ b/drivers/network/dd/rtl8139/CMakeLists.txt @@ -16,4 +16,4 @@ add_pch(rtl8139 nic.h SOURCE) set_module_type(rtl8139 kernelmodedriver) add_importlibs(rtl8139 ndis ntoskrnl hal) add_cd_file(TARGET rtl8139 DESTINATION reactos/system32/drivers FOR all) -add_driver_inf(rtl8139 netrtl8139.inf) +add_driver_inf(rtl8139 netrtl.inf) diff --git a/drivers/network/dd/rtl8139/netrtl8139.inf b/drivers/network/dd/rtl8139/netrtl.inf similarity index 100% rename from drivers/network/dd/rtl8139/netrtl8139.inf rename to drivers/network/dd/rtl8139/netrtl.inf