From 7e8beadd577aa27c7d0d6748302de492b0473ca9 Mon Sep 17 00:00:00 2001 From: Liav A Date: Sat, 25 Dec 2021 11:09:34 +0200 Subject: [PATCH] Kernel/Net: Move Realtek network adapters code to a separate directory --- Kernel/CMakeLists.txt | 4 ++-- Kernel/Net/NetworkingManagement.cpp | 4 ++-- Kernel/Net/{ => Realtek}/RTL8139NetworkAdapter.cpp | 2 +- Kernel/Net/{ => Realtek}/RTL8139NetworkAdapter.h | 0 Kernel/Net/{ => Realtek}/RTL8168NetworkAdapter.cpp | 2 +- Kernel/Net/{ => Realtek}/RTL8168NetworkAdapter.h | 0 6 files changed, 6 insertions(+), 6 deletions(-) rename Kernel/Net/{ => Realtek}/RTL8139NetworkAdapter.cpp (99%) rename Kernel/Net/{ => Realtek}/RTL8139NetworkAdapter.h (100%) rename Kernel/Net/{ => Realtek}/RTL8168NetworkAdapter.cpp (99%) rename Kernel/Net/{ => Realtek}/RTL8168NetworkAdapter.h (100%) diff --git a/Kernel/CMakeLists.txt b/Kernel/CMakeLists.txt index 0ffb83efe9..ab48d2dc5e 100644 --- a/Kernel/CMakeLists.txt +++ b/Kernel/CMakeLists.txt @@ -167,14 +167,14 @@ set(KERNEL_SOURCES Net/Intel/E1000ENetworkAdapter.cpp Net/Intel/E1000NetworkAdapter.cpp Net/NE2000/NetworkAdapter.cpp + Net/Realtek/RTL8139NetworkAdapter.cpp + Net/Realtek/RTL8168NetworkAdapter.cpp Net/IPv4Socket.cpp Net/LocalSocket.cpp Net/LoopbackAdapter.cpp Net/NetworkAdapter.cpp Net/NetworkTask.cpp Net/NetworkingManagement.cpp - Net/RTL8139NetworkAdapter.cpp - Net/RTL8168NetworkAdapter.cpp Net/Routing.cpp Net/Socket.cpp Net/TCPSocket.cpp diff --git a/Kernel/Net/NetworkingManagement.cpp b/Kernel/Net/NetworkingManagement.cpp index 57759470ad..87ce7c2bb8 100644 --- a/Kernel/Net/NetworkingManagement.cpp +++ b/Kernel/Net/NetworkingManagement.cpp @@ -16,8 +16,8 @@ #include #include #include -#include -#include +#include +#include #include namespace Kernel { diff --git a/Kernel/Net/RTL8139NetworkAdapter.cpp b/Kernel/Net/Realtek/RTL8139NetworkAdapter.cpp similarity index 99% rename from Kernel/Net/RTL8139NetworkAdapter.cpp rename to Kernel/Net/Realtek/RTL8139NetworkAdapter.cpp index 249adeedf9..e380e315d8 100644 --- a/Kernel/Net/RTL8139NetworkAdapter.cpp +++ b/Kernel/Net/Realtek/RTL8139NetworkAdapter.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include namespace Kernel { diff --git a/Kernel/Net/RTL8139NetworkAdapter.h b/Kernel/Net/Realtek/RTL8139NetworkAdapter.h similarity index 100% rename from Kernel/Net/RTL8139NetworkAdapter.h rename to Kernel/Net/Realtek/RTL8139NetworkAdapter.h diff --git a/Kernel/Net/RTL8168NetworkAdapter.cpp b/Kernel/Net/Realtek/RTL8168NetworkAdapter.cpp similarity index 99% rename from Kernel/Net/RTL8168NetworkAdapter.cpp rename to Kernel/Net/Realtek/RTL8168NetworkAdapter.cpp index 5ff7c90d89..a99a963005 100644 --- a/Kernel/Net/RTL8168NetworkAdapter.cpp +++ b/Kernel/Net/Realtek/RTL8168NetworkAdapter.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include namespace Kernel { diff --git a/Kernel/Net/RTL8168NetworkAdapter.h b/Kernel/Net/Realtek/RTL8168NetworkAdapter.h similarity index 100% rename from Kernel/Net/RTL8168NetworkAdapter.h rename to Kernel/Net/Realtek/RTL8168NetworkAdapter.h