Reorganization of libcommon directories (Part 1)

Audio.cpp

@@ -24,7 +24,7 @@ This file is part of VCC (Virtual Color Computer).
 #include "config.h"
 #include "coco3.h"
 #include "audio.h"
-#include <vcc/common/logger.h>
+#include <vcc/utils/logger.h>
 #include "BuildConfig.h"
 #include "Cassette.h"
 

CartridgeMenu.cpp

@@ -17,7 +17,7 @@ This file is part of VCC (Virtual Color Computer).
 */
 
 #include "CartridgeMenu.h"
-#include <vcc/common/logger.h>
+#include <vcc/utils/logger.h>
 #include "defines.h"
 
 CartridgeMenu::CartridgeMenu() {};

Cassette.cpp

@@ -25,7 +25,7 @@ This file is part of VCC (Virtual Color Computer).
 #include <vcc/common/DialogOps.h>
 #include "Cassette.h"
 #include "stdio.h"
-#include <vcc/common/logger.h>
+#include <vcc/utils/logger.h>
 #include <functional>
 
 unsigned char MotorState=0,TapeMode=STOP,WriteProtect=0,Quiet=30;

CommandLine.cpp

@@ -81,7 +81,7 @@ This file is part of VCC (Virtual Color Computer).
 #include <string.h>
 #include "BuildConfig.h"
 #include "CommandLine.h"
-#include <vcc/common/logger.h>
+#include <vcc/utils/logger.h>
 
 // Define global command line settings
 struct CmdLineArguments CmdArg;

Disassembler.cpp

@@ -33,7 +33,7 @@
 #include "defines.h"
 #include "Vcc.h"
 #include "resource.h"
-#include <vcc/common/logger.h>
+#include <vcc/utils/logger.h>
 #include "tcc1014mmu.h"
 #include "Debugger.h"
 #include "DebuggerUtils.h"

ExecutionTrace.cpp

@@ -28,9 +28,9 @@ This file is part of VCC (Virtual Color Computer).
 #include <cstddef>
 #include <array>
 #include <windowsx.h>
-#include <vcc/common/FileOps.h>
 #include <vcc/common/DialogOps.h>
-#include <vcc/common/logger.h>
+#include <vcc/utils/FileOps.h>
+#include <vcc/utils/logger.h>
 
 static HINSTANCE g_hinstDLG;
 

FD502/fd502.cpp

@@ -22,10 +22,10 @@
 #include "fd502.h"
 #include "utils.h"
 #include "../CartridgeMenu.h"
-#include <vcc/devices/becker/beckerport.h>
-#include <vcc/common/FileOps.h>
+#include <vcc/devices/serial/beckerport.h>
 #include <vcc/common/DialogOps.h>
-#include <vcc/common/logger.h>
+#include <vcc/utils/FileOps.h>
+#include <vcc/utils/logger.h>
 #include <vcc/utils/winapi.h>
 #include <vcc/devices/rtc/oki_m6242b.h>
 #include <vcc/devices/rom/rom_image.h>
@@ -75,7 +75,7 @@ static char TempRomFileName[MAX_PATH]="";
 
 
 static ::vcc::devices::rtc::oki_m6242b gDistoRtc;
-static ::vcc::devices::beckerport::Becker gBecker;
+static ::vcc::devices::serial::Becker gBecker;
 
 unsigned char SetChip(unsigned char);
 

FD502/fd502.h

@@ -16,7 +16,7 @@
 //	VCC (Virtual Color Computer). If not, see <http://www.gnu.org/licenses/>.
 ////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include <vcc/core/cartridge_capi.h>
+#include <vcc/bus/cartridge_capi.h>
 
 extern void*const& gHostKey;
 extern PakAssertInteruptHostCallback AssertInt;

FD502/wd1793.cpp

@@ -20,7 +20,7 @@
 #include "defines.h"
 #include "fd502.h"
 #include "fdrawcmd.h"	// http://simonowen.com/fdrawcmd/
-#include <vcc/core/interrupts.h>
+#include <vcc/bus/interrupts.h>
 #include <winioctl.h>
 #include <Windows.h>
 #include <stdio.h>

GMC/gmc_cartridge.h

@@ -1,17 +1,17 @@
 #pragma once
 #include "sn76496.h"
 #include <vcc/devices/rom/banked_rom_image.h>
-#include <vcc/core/cartridge.h>
-#include <vcc/core/cartridge_context.h>
+#include <vcc/bus/cartridge.h>
+#include <vcc/bus/cartridge_context.h>
 #include <memory>
 #include <Windows.h>
 
 
-class gmc_cartridge : public ::vcc::core::cartridge
+class gmc_cartridge : public ::vcc::bus::cartridge
 {
 public:
 
-	using context_type = ::vcc::core::cartridge_context;
+	using context_type = ::vcc::bus::cartridge_context;
 	using path_type = ::std::string;
 	using rom_image_type = ::vcc::devices::rom::banked_rom_image;
 

GMC/main.cpp

@@ -1,5 +1,5 @@
 #include "gmc_cartridge.h"
-#include <vcc/core/cartridge_factory.h>
+#include <vcc/bus/cartridge_factory.h>
 #include <Windows.h>
 
 
@@ -20,8 +20,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved)
 extern "C" __declspec(dllexport) CreatePakFactoryFunction GetPakFactory()
 {
 	return [](
-		[[maybe_unused]] std::unique_ptr<::vcc::core::cartridge_context> context,
-		[[maybe_unused]] const cartridge_capi_context& capi_context) -> std::unique_ptr<::vcc::core::cartridge>
+		[[maybe_unused]] std::unique_ptr<::vcc::bus::cartridge_context> context,
+		[[maybe_unused]] const cartridge_capi_context& capi_context) -> std::unique_ptr<::vcc::bus::cartridge>
 	{
 		return std::make_unique<gmc_cartridge>(move(context), gModuleInstance);
 	};

HardDisk/cc3vhd.cpp

@@ -55,7 +55,7 @@ This file is part of VCC (Virtual Color Computer).
 #include <stdio.h>
 #include "cc3vhd.h"
 #include "harddisk.h"
-#include <vcc/common/FileOps.h>
+#include <vcc/utils/FileOps.h>
 
 typedef union {
     unsigned int All;

HardDisk/harddisk.cpp

@@ -24,12 +24,12 @@ This file is part of VCC (Virtual Color Computer).
 #include "resource.h"
 #include "cc3vhd.h"
 #include <vcc/devices/rtc/ds1315.h>
-#include <vcc/common/FileOps.h>
+#include <vcc/utils/FileOps.h>
 #include <vcc/common/DialogOps.h>
 #include "../CartridgeMenu.h"
 #include <vcc/utils/winapi.h>
-#include <vcc/core/interrupts.h>
-#include <vcc/core/cartridge_capi.h>
+#include <vcc/bus/interrupts.h>
+#include <vcc/bus/cartridge_capi.h>
 
 constexpr auto DEF_HD_SIZE = 132480u;
 

MachineDefs.h

@@ -2,7 +2,7 @@
 #include <array>
 #include <vector>
 #include <string>
-#include <vcc/core/interrupts.h>
+#include <vcc/bus/interrupts.h>
 
 namespace VCC
 {

MemoryMap.cpp

@@ -30,7 +30,7 @@
 #include "tcc1014mmu.h"
 #include "resource.h"
 #include "pakinterface.h"
-#include <vcc/common/logger.h>
+#include <vcc/utils/logger.h>
 #include <vcc/common/DialogOps.h>
 #include <fstream>
 

OpenGL.cpp

@@ -24,7 +24,7 @@
 #include <gl/GL.h>
 #include "GL/glext.h"
 #include "GL/wglext.h"
-#include <vcc/common/logger.h>
+#include <vcc/utils/logger.h>
 
 #if USE_OPENGL
 

Ramdisk/main.cpp

@@ -16,7 +16,7 @@
 //	VCC (Virtual Color Computer). If not, see <http://www.gnu.org/licenses/>.
 ////////////////////////////////////////////////////////////////////////////////
 #include "ramdisk_cartridge.h"
-#include <vcc/core/cartridge_factory.h>
+#include <vcc/bus/cartridge_factory.h>
 #include <memory>
 #include <Windows.h>
 
@@ -38,8 +38,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved)
 //
 extern "C" __declspec(dllexport) CreatePakFactoryFunction GetPakFactory()
 {
-	return []([[maybe_unused]] std::unique_ptr<::vcc::core::cartridge_context> context,
-			  [[maybe_unused]] const cartridge_capi_context& capi_context) -> std::unique_ptr<::vcc::core::cartridge>
+	return []([[maybe_unused]] std::unique_ptr<::vcc::bus::cartridge_context> context,
+			  [[maybe_unused]] const cartridge_capi_context& capi_context) -> std::unique_ptr<::vcc::bus::cartridge>
 	{
 		return std::make_unique<ramdisk_cartridge>();
 	};

Ramdisk/ramdisk_cartridge.h

@@ -16,13 +16,13 @@
 //	VCC (Virtual Color Computer). If not, see <http://www.gnu.org/licenses/>.
 ////////////////////////////////////////////////////////////////////////////////
 #pragma once
-#include <vcc/core/cartridge.h>
-#include <vcc/core/cartridge_context.h>
+#include <vcc/bus/cartridge.h>
+#include <vcc/bus/cartridge_context.h>
 #include <memory>
 #include <array>
 
 
-class ramdisk_cartridge : public ::vcc::core::cartridge
+class ramdisk_cartridge : public ::vcc::bus::cartridge
 {
 public:
 

SuperIDE/SuperIDE.cpp

@@ -23,10 +23,10 @@ This file is part of VCC (Virtual Color Computer).
 #include "IdeBus.h"
 #include <vcc/devices/rtc/ds1315.h>
 #include "logger.h"
-#include <vcc/common/FileOps.h>
+#include <vcc/utils/FileOps.h>
 #include "../CartridgeMenu.h"
 #include <vcc/common/DialogOps.h>
-#include <vcc/core/cartridge_capi.h>
+#include <vcc/bus/cartridge_capi.h>
 #include <vcc/utils/winapi.h>
 
 static char FileName[MAX_PATH] { 0 };

Vcc.cpp

@@ -42,7 +42,7 @@ This file is part of VCC (Virtual Color Computer).
 #include <commdlg.h>
 #include <stdio.h>
 #include <mmsystem.h>
-#include <vcc/common/FileOps.h>
+#include <vcc/utils/FileOps.h>
 #include <vcc/common/DialogOps.h>
 #include "defines.h"
 #include "resource.h"
@@ -66,7 +66,7 @@ This file is part of VCC (Virtual Color Computer).
 #include "Cassette.h"
 
 #include "CommandLine.h"
-#include <vcc/common/logger.h>
+#include <vcc/utils/logger.h>
 #include "memdump.h"
 
 #include "MemoryMap.h"

acia/acia.cpp

@@ -24,7 +24,7 @@
 #include "acia.h"
 #include <vcc/common/DialogOps.h>
 #include "../CartridgeMenu.h"
-#include <vcc/common/logger.h>
+#include <vcc/utils/logger.h>
 #include <vcc/utils/winapi.h>
 
 //------------------------------------------------------------------------

acia/acia.h

@@ -22,7 +22,7 @@
 
 // FIXME: This should be defined on the command line
 #define DIRECTINPUT_VERSION 0x0800
-#include <vcc/core/cartridge_capi.h>
+#include <vcc/bus/cartridge_capi.h>
 #include <Windows.h>
 #include <windowsx.h>
 #include <stdio.h>

acia/file.cpp

@@ -26,7 +26,7 @@
 #include <errno.h>
 #include <string.h>
 #include "acia.h"
-#include <vcc/common/logger.h>
+#include <vcc/utils/logger.h>
 
 FILE * FileStream = nullptr;
 

acia/sc6551.cpp

@@ -21,8 +21,8 @@
 
 #include "acia.h"
 #include "sc6551.h"
-#include <vcc/core/interrupts.h>
-#include <vcc/common/logger.h>
+#include <vcc/bus/interrupts.h>
+#include <vcc/utils/logger.h>
 #include <atomic>
 
 //------------------------------------------------------------------------

acia/tcpip.cpp

@@ -27,7 +27,7 @@
 #include <Windows.h>
 #include <stdio.h>
 #include "acia.h"
-#include <vcc/common/logger.h>
+#include <vcc/utils/logger.h>
 
 // socket
 static SOCKET Socket = INVALID_SOCKET;

acia/wincom.cpp

@@ -26,7 +26,7 @@
 #include <errno.h>
 #include <string.h>
 #include "acia.h"
-#include <vcc/common/logger.h>
+#include <vcc/utils/logger.h>
 
 HANDLE hReadEvent;
 HANDLE hWriteEvent;

becker/becker_cartridge.h

@@ -17,22 +17,22 @@
 ////////////////////////////////////////////////////////////////////////////////
 #pragma once
 #include "configuration_dialog.h"
-#include <vcc/devices/becker/beckerport.h>
-#include <vcc/core/cartridge.h>
-#include <vcc/core/cartridge_context.h>
+#include <vcc/devices/serial/beckerport.h>
+#include <vcc/bus/cartridge.h>
+#include <vcc/bus/cartridge_context.h>
 #include <memory>
 #include <Windows.h>
 
 
 class becker_cartridge
 	:
-	public ::vcc::core::cartridge,
+	public ::vcc::bus::cartridge,
 	private ::cartridge_controller
 {
 public:
 
-	using context_type = ::vcc::core::cartridge_context;
-	using becker_device_type = ::vcc::devices::beckerport::Becker;
+	using context_type = ::vcc::bus::cartridge_context;
+	using becker_device_type = ::vcc::devices::serial::Becker;
 
 
 public:

becker/main.cpp

@@ -16,7 +16,7 @@
 //	VCC (Virtual Color Computer). If not, see <http://www.gnu.org/licenses/>.
 ////////////////////////////////////////////////////////////////////////////////
 #include "becker_cartridge.h"
-#include <vcc/core/cartridge_factory.h>
+#include <vcc/bus/cartridge_factory.h>
 #include <Windows.h>
 
 
@@ -37,8 +37,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved)
 extern "C" __declspec(dllexport) CreatePakFactoryFunction GetPakFactory()
 {
 	return [](
-		[[maybe_unused]] std::unique_ptr<::vcc::core::cartridge_context> context,
-		[[maybe_unused]] const cartridge_capi_context& capi_context) -> std::unique_ptr<::vcc::core::cartridge>
+		[[maybe_unused]] std::unique_ptr<::vcc::bus::cartridge_context> context,
+		[[maybe_unused]] const cartridge_capi_context& capi_context) -> std::unique_ptr<::vcc::bus::cartridge>
 		{
 			return std::make_unique<becker_cartridge>(move(context), gModuleInstance);
 		};

coco3.cpp

@@ -34,7 +34,7 @@ This file is part of VCC (Virtual Color Computer).
 #include "Vcc.h"
 #include "Cassette.h"
 #include "DirectDrawInterface.h"
-#include <vcc/common/logger.h>
+#include <vcc/utils/logger.h>
 #include "keyboard.h"
 #include <string>
 #include <iostream>

config.cpp

@@ -45,11 +45,11 @@ This file is part of VCC (Virtual Color Computer).
 #include "joystickinput.h"
 #include "keyboard.h"
 #include "keyboardEdit.h"
-#include <vcc/common/FileOps.h>
+#include <vcc/utils/FileOps.h>
 #include <vcc/common/DialogOps.h>
 #include "Cassette.h"
 #include "CommandLine.h"
-#include <vcc/common/logger.h>
+#include <vcc/utils/logger.h>
 
 using namespace std;
 using namespace VCC;

hd6309.cpp

@@ -24,7 +24,7 @@ This file is part of VCC (Virtual Color Computer).
 #include "hd6309.h"
 #include "hd6309defs.h"
 #include "tcc1014mmu.h"
-#include <vcc/common/logger.h>
+#include <vcc/utils/logger.h>
 #include "string.h"
 #include "OpDecoder.h"
 #include "Disassembler.h"