From 1c9beb246ba6e3891d77570a3cdbedfcded04fca Mon Sep 17 00:00:00 2001 From: Andrea Odetti Date: Wed, 28 Apr 2021 20:32:01 +0100 Subject: [PATCH] Uthernet2: move to separate folder. Signed-off-by: Andrea Odetti --- source/CMakeLists.txt | 8 ++++---- source/frontends/sdl/imgui/sdlsettings.cpp | 2 +- source/linux/{ => network}/tfe2.cpp | 2 +- source/linux/{ => network}/tfe2.h | 0 source/linux/{ => network}/uthernet2.cpp | 8 ++++---- source/linux/{ => network}/uthernet2.h | 0 6 files changed, 10 insertions(+), 10 deletions(-) rename source/linux/{ => network}/tfe2.cpp (99%) rename source/linux/{ => network}/tfe2.h (100%) rename source/linux/{ => network}/uthernet2.cpp (99%) rename source/linux/{ => network}/uthernet2.h (100%) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 6acc8323..c4b50001 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -73,8 +73,8 @@ set(SOURCE_FILES linux/keyboard.cpp linux/linuxframe.cpp linux/context.cpp - linux/uthernet2.cpp - linux/tfe2.cpp + linux/network/uthernet2.cpp + linux/network/tfe2.cpp linux/duplicates/Debug.cpp linux/duplicates/Debug_Display.cpp @@ -161,8 +161,8 @@ set(HEADER_FILES linux/registry.h linux/keyboard.h linux/linuxframe.h - linux/uthernet2.h - linux/tfe2.h + linux/network/uthernet2.h + linux/network/tfe2.h linux/win.h Z80VICE/z80.h diff --git a/source/frontends/sdl/imgui/sdlsettings.cpp b/source/frontends/sdl/imgui/sdlsettings.cpp index 4508db52..0f368694 100644 --- a/source/frontends/sdl/imgui/sdlsettings.cpp +++ b/source/frontends/sdl/imgui/sdlsettings.cpp @@ -23,7 +23,7 @@ #include "Tfe/tfe.h" #include "Tfe/tfesupp.h" -#include "linux/uthernet2.h" +#include "linux/network/uthernet2.h" #include "imgui_internal.h" diff --git a/source/linux/tfe2.cpp b/source/linux/network/tfe2.cpp similarity index 99% rename from source/linux/tfe2.cpp rename to source/linux/network/tfe2.cpp index 8546c423..36f5019b 100644 --- a/source/linux/tfe2.cpp +++ b/source/linux/network/tfe2.cpp @@ -1,5 +1,5 @@ #include "StdAfx.h" -#include "tfe2.h" +#include "linux/network/tfe2.h" #include "Tfe/tfearch.h" #include "Tfe/tfe.h" diff --git a/source/linux/tfe2.h b/source/linux/network/tfe2.h similarity index 100% rename from source/linux/tfe2.h rename to source/linux/network/tfe2.h diff --git a/source/linux/uthernet2.cpp b/source/linux/network/uthernet2.cpp similarity index 99% rename from source/linux/uthernet2.cpp rename to source/linux/network/uthernet2.cpp index 26f23e51..a07396bf 100644 --- a/source/linux/uthernet2.cpp +++ b/source/linux/network/uthernet2.cpp @@ -1,13 +1,13 @@ #include -#include "linux/uthernet2.h" -#include "linux/tfe2.h" +#include "linux/network/uthernet2.h" +#include "linux/network/tfe2.h" #include "Memory.h" #include "Log.h" #define MAX_RXLENGTH 1518 // #define U2_LOG_VERBOSE -// #define U2_LOG_TRAFFIC +#define U2_LOG_TRAFFIC #define U2_LOG_UNKNOWN namespace @@ -614,7 +614,7 @@ namespace receiveOnePacket(i); } - BYTE res = write ? 0 : MemReadFloatingBus(nCycles); + BYTE res = write ? 0 : MemReadFloatingBus(nCycles); const uint8_t loc = address & 0x0F; diff --git a/source/linux/uthernet2.h b/source/linux/network/uthernet2.h similarity index 100% rename from source/linux/uthernet2.h rename to source/linux/network/uthernet2.h