Skip to content

Commit 04ba725

Browse files
ChetSimpsonejaquay
ChetSimpson
authored and
ejaquay
committed
rename vcc/core to vcc/bus
1 parent 1026ad4 commit 04ba725

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+127
-127
lines changed

‎FD502/fd502.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
// VCC (Virtual Color Computer). If not, see <http://www.gnu.org/licenses/>.
1717
////////////////////////////////////////////////////////////////////////////////
1818
#pragma once
19-
#include <vcc/core/cartridge_capi.h>
19+
#include <vcc/bus/cartridge_capi.h>
2020

2121
extern void*const& gHostKey;
2222
extern PakAssertInteruptHostCallback AssertInt;

‎FD502/wd1793.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "defines.h"
2121
#include "fd502.h"
2222
#include "fdrawcmd.h" // http://simonowen.com/fdrawcmd/
23-
#include <vcc/core/interrupts.h>
23+
#include <vcc/bus/interrupts.h>
2424
#include <winioctl.h>
2525
#include <Windows.h>
2626
#include <stdio.h>

‎GMC/gmc_cartridge.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
#pragma once
22
#include "sn76496.h"
33
#include <vcc/devices/rom/banked_rom_image.h>
4-
#include <vcc/core/cartridge.h>
5-
#include <vcc/core/cartridge_context.h>
4+
#include <vcc/bus/cartridge.h>
5+
#include <vcc/bus/cartridge_context.h>
66
#include <memory>
77
#include <Windows.h>
88

99

10-
class gmc_cartridge : public ::vcc::core::cartridge
10+
class gmc_cartridge : public ::vcc::bus::cartridge
1111
{
1212
public:
1313

14-
using context_type = ::vcc::core::cartridge_context;
14+
using context_type = ::vcc::bus::cartridge_context;
1515
using path_type = ::std::string;
1616
using rom_image_type = ::vcc::devices::rom::banked_rom_image;
1717

‎GMC/main.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#include "gmc_cartridge.h"
2-
#include <vcc/core/cartridge_factory.h>
2+
#include <vcc/bus/cartridge_factory.h>
33
#include <Windows.h>
44

55

@@ -20,8 +20,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved)
2020
extern "C" __declspec(dllexport) CreatePakFactoryFunction GetPakFactory()
2121
{
2222
return [](
23-
[[maybe_unused]] std::unique_ptr<::vcc::core::cartridge_context> context,
24-
[[maybe_unused]] const cartridge_capi_context& capi_context) -> std::unique_ptr<::vcc::core::cartridge>
23+
[[maybe_unused]] std::unique_ptr<::vcc::bus::cartridge_context> context,
24+
[[maybe_unused]] const cartridge_capi_context& capi_context) -> std::unique_ptr<::vcc::bus::cartridge>
2525
{
2626
return std::make_unique<gmc_cartridge>(move(context), gModuleInstance);
2727
};

‎HardDisk/harddisk.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ This file is part of VCC (Virtual Color Computer).
2828
#include <vcc/common/DialogOps.h>
2929
#include "../CartridgeMenu.h"
3030
#include <vcc/utils/winapi.h>
31-
#include <vcc/core/interrupts.h>
32-
#include <vcc/core/cartridge_capi.h>
31+
#include <vcc/bus/interrupts.h>
32+
#include <vcc/bus/cartridge_capi.h>
3333

3434
constexpr auto DEF_HD_SIZE = 132480u;
3535

‎MachineDefs.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include <array>
33
#include <vector>
44
#include <string>
5-
#include <vcc/core/interrupts.h>
5+
#include <vcc/bus/interrupts.h>
66

77
namespace VCC
88
{

‎Ramdisk/main.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
// VCC (Virtual Color Computer). If not, see <http://www.gnu.org/licenses/>.
1717
////////////////////////////////////////////////////////////////////////////////
1818
#include "ramdisk_cartridge.h"
19-
#include <vcc/core/cartridge_factory.h>
19+
#include <vcc/bus/cartridge_factory.h>
2020
#include <memory>
2121
#include <Windows.h>
2222

@@ -38,8 +38,8 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpReserved)
3838
//
3939
extern "C" __declspec(dllexport) CreatePakFactoryFunction GetPakFactory()
4040
{
41-
return []([[maybe_unused]] std::unique_ptr<::vcc::core::cartridge_context> context,
42-
[[maybe_unused]] const cartridge_capi_context& capi_context) -> std::unique_ptr<::vcc::core::cartridge>
41+
return []([[maybe_unused]] std::unique_ptr<::vcc::bus::cartridge_context> context,
42+
[[maybe_unused]] const cartridge_capi_context& capi_context) -> std::unique_ptr<::vcc::bus::cartridge>
4343
{
4444
return std::make_unique<ramdisk_cartridge>();
4545
};

‎Ramdisk/ramdisk_cartridge.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
// VCC (Virtual Color Computer). If not, see <http://www.gnu.org/licenses/>.
1717
////////////////////////////////////////////////////////////////////////////////
1818
#pragma once
19-
#include <vcc/core/cartridge.h>
20-
#include <vcc/core/cartridge_context.h>
19+
#include <vcc/bus/cartridge.h>
20+
#include <vcc/bus/cartridge_context.h>
2121
#include <memory>
2222
#include <array>
2323

2424

25-
class ramdisk_cartridge : public ::vcc::core::cartridge
25+
class ramdisk_cartridge : public ::vcc::bus::cartridge
2626
{
2727
public:
2828

‎SuperIDE/SuperIDE.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ This file is part of VCC (Virtual Color Computer).
2626
#include <vcc/utils/FileOps.h>
2727
#include "../CartridgeMenu.h"
2828
#include <vcc/common/DialogOps.h>
29-
#include <vcc/core/cartridge_capi.h>
29+
#include <vcc/bus/cartridge_capi.h>
3030
#include <vcc/utils/winapi.h>
3131

3232
static char FileName[MAX_PATH] { 0 };

‎acia/acia.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
// FIXME: This should be defined on the command line
2424
#define DIRECTINPUT_VERSION 0x0800
25-
#include <vcc/core/cartridge_capi.h>
25+
#include <vcc/bus/cartridge_capi.h>
2626
#include <Windows.h>
2727
#include <windowsx.h>
2828
#include <stdio.h>

0 commit comments

Comments
 (0)