Skip to content

Commit 8555604

Browse files
ChetSimpsonejaquay
ChetSimpson
authored and
ejaquay
committed
move vcc/cartridges into vcc/bus
1 parent 04ba725 commit 8555604

File tree

11 files changed

+55
-55
lines changed

11 files changed

+55
-55
lines changed

‎libcommon/include/vcc/cartridges/capi_adapter_cartridge.h‎ renamed to ‎libcommon/include/vcc/bus/cartridges/capi_adapter_cartridge.h‎

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

2424
#ifndef DOXYGEN_SHOULD_SKIP_THIS
2525

26-
namespace vcc::cartridges
26+
namespace vcc::bus::cartridges
2727
{
2828

2929
class capi_adapter_cartridge : public ::vcc::bus::cartridge

‎libcommon/include/vcc/cartridges/empty_cartridge.h‎ renamed to ‎libcommon/include/vcc/bus/cartridges/empty_cartridge.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include <vcc/bus/cartridge.h>
2020

2121

22-
namespace vcc::cartridges
22+
namespace vcc::bus::cartridges
2323
{
2424

2525
/// @brief A cartridge that does nothing.

‎libcommon/include/vcc/cartridges/rom_cartridge.h‎ renamed to ‎libcommon/include/vcc/bus/cartridges/rom_cartridge.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include <memory>
2323

2424

25-
namespace vcc::cartridges
25+
namespace vcc::bus::cartridges
2626
{
2727

2828
/// @brief A cartridge that contains a ROM image.

‎libcommon/libcommon.vcxproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,10 @@
104104
</Link>
105105
</ItemDefinitionGroup>
106106
<ItemGroup>
107-
<ClCompile Include="src\cartridges\empty_cartridge.cpp" />
108-
<ClCompile Include="src\cartridges\capi_adapter_cartridge.cpp" />
109-
<ClCompile Include="src\cartridges\rom_cartridge.cpp" />
110-
<ClCompile Include="src\core\cartridge.cpp" />
107+
<ClCompile Include="src\bus\cartridge.cpp" />
108+
<ClCompile Include="src\bus\cartridges\capi_adapter_cartridge.cpp" />
109+
<ClCompile Include="src\bus\cartridges\empty_cartridge.cpp" />
110+
<ClCompile Include="src\bus\cartridges\rom_cartridge.cpp" />
111111
<ClCompile Include="src\devices\rom\banked_rom_image.cpp" />
112112
<ClCompile Include="src\devices\rom\rom_image.cpp" />
113113
<ClCompile Include="src\devices\rtc\ds1315.cpp" />
@@ -124,13 +124,13 @@
124124
</ItemGroup>
125125
<ItemGroup>
126126
<ClInclude Include="include\vcc\bus\cartridge.h" />
127+
<ClInclude Include="include\vcc\bus\cartridges\capi_adapter_cartridge.h" />
128+
<ClInclude Include="include\vcc\bus\cartridges\empty_cartridge.h" />
129+
<ClInclude Include="include\vcc\bus\cartridges\rom_cartridge.h" />
127130
<ClInclude Include="include\vcc\bus\cartridge_capi.h" />
128131
<ClInclude Include="include\vcc\bus\cartridge_context.h" />
129132
<ClInclude Include="include\vcc\bus\cartridge_factory.h" />
130133
<ClInclude Include="include\vcc\bus\interrupts.h" />
131-
<ClInclude Include="include\vcc\cartridges\capi_adapter_cartridge.h" />
132-
<ClInclude Include="include\vcc\cartridges\empty_cartridge.h" />
133-
<ClInclude Include="include\vcc\cartridges\rom_cartridge.h" />
134134
<ClInclude Include="include\vcc\common\DialogOps.h" />
135135
<ClInclude Include="include\vcc\detail\exports.h" />
136136
<ClInclude Include="include\vcc\devices\rom\banked_rom_image.h" />

‎libcommon/libcommon.vcxproj.filters‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,9 @@
3131
<Filter Include="Source Files\devices\rtc">
3232
<UniqueIdentifier>{7916028f-7cb9-4a17-8897-43634a51ba3d}</UniqueIdentifier>
3333
</Filter>
34-
<Filter Include="Header Files\cartridges">
35-
<UniqueIdentifier>{cc0a281d-6ff8-4a04-95a0-5bef8957ba5f}</UniqueIdentifier>
36-
</Filter>
3734
<Filter Include="Header Files\utils">
3835
<UniqueIdentifier>{f5ac3a16-8b52-47c1-a81c-d58a404a2181}</UniqueIdentifier>
3936
</Filter>
40-
<Filter Include="Source Files\cartridges">
41-
<UniqueIdentifier>{6344b600-e0a8-4961-8a19-7ef6249e9a3e}</UniqueIdentifier>
42-
</Filter>
4337
<Filter Include="Source Files\utils">
4438
<UniqueIdentifier>{c3048278-09ca-471f-9cff-e11566354e5d}</UniqueIdentifier>
4539
</Filter>
@@ -49,9 +43,6 @@
4943
<Filter Include="Source Files\devices\rom">
5044
<UniqueIdentifier>{3338d5c7-a9a1-4858-bc0f-b0ed9fa6b918}</UniqueIdentifier>
5145
</Filter>
52-
<Filter Include="Source Files\core">
53-
<UniqueIdentifier>{4decb533-7b10-402c-995c-a6d2d41f1c35}</UniqueIdentifier>
54-
</Filter>
5546
<Filter Include="Header Files\devices\serial">
5647
<UniqueIdentifier>{cebd23b4-ab92-47f2-926b-fe8afb144131}</UniqueIdentifier>
5748
</Filter>
@@ -64,6 +55,15 @@
6455
<Filter Include="Header Files\detail">
6556
<UniqueIdentifier>{5ec3142f-ca23-485c-b5c6-60bf376faf78}</UniqueIdentifier>
6657
</Filter>
58+
<Filter Include="Source Files\bus">
59+
<UniqueIdentifier>{4decb533-7b10-402c-995c-a6d2d41f1c35}</UniqueIdentifier>
60+
</Filter>
61+
<Filter Include="Source Files\bus\cartridges">
62+
<UniqueIdentifier>{6344b600-e0a8-4961-8a19-7ef6249e9a3e}</UniqueIdentifier>
63+
</Filter>
64+
<Filter Include="Header Files\bus\cartridges">
65+
<UniqueIdentifier>{cc0a281d-6ff8-4a04-95a0-5bef8957ba5f}</UniqueIdentifier>
66+
</Filter>
6767
</ItemGroup>
6868
<ItemGroup>
6969
<ClCompile Include="src\DialogOps.cpp">
@@ -78,15 +78,6 @@
7878
<ClCompile Include="src\devices\rtc\oki_m6242b.cpp">
7979
<Filter>Source Files\devices\rtc</Filter>
8080
</ClCompile>
81-
<ClCompile Include="src\cartridges\empty_cartridge.cpp">
82-
<Filter>Source Files\cartridges</Filter>
83-
</ClCompile>
84-
<ClCompile Include="src\cartridges\capi_adapter_cartridge.cpp">
85-
<Filter>Source Files\cartridges</Filter>
86-
</ClCompile>
87-
<ClCompile Include="src\cartridges\rom_cartridge.cpp">
88-
<Filter>Source Files\cartridges</Filter>
89-
</ClCompile>
9081
<ClCompile Include="src\utils\persistent_value_store.cpp">
9182
<Filter>Source Files\utils</Filter>
9283
</ClCompile>
@@ -105,9 +96,6 @@
10596
<ClCompile Include="src\devices\rom\banked_rom_image.cpp">
10697
<Filter>Source Files\devices\rom</Filter>
10798
</ClCompile>
108-
<ClCompile Include="src\core\cartridge.cpp">
109-
<Filter>Source Files\core</Filter>
110-
</ClCompile>
11199
<ClCompile Include="src\devices\serial\beckerport.cpp">
112100
<Filter>Source Files\devices\serial</Filter>
113101
</ClCompile>
@@ -117,6 +105,18 @@
117105
<ClCompile Include="src\utils\logger.cpp">
118106
<Filter>Source Files\utils</Filter>
119107
</ClCompile>
108+
<ClCompile Include="src\bus\cartridge.cpp">
109+
<Filter>Source Files\bus</Filter>
110+
</ClCompile>
111+
<ClCompile Include="src\bus\cartridges\capi_adapter_cartridge.cpp">
112+
<Filter>Source Files\bus\cartridges</Filter>
113+
</ClCompile>
114+
<ClCompile Include="src\bus\cartridges\empty_cartridge.cpp">
115+
<Filter>Source Files\bus\cartridges</Filter>
116+
</ClCompile>
117+
<ClCompile Include="src\bus\cartridges\rom_cartridge.cpp">
118+
<Filter>Source Files\bus\cartridges</Filter>
119+
</ClCompile>
120120
</ItemGroup>
121121
<ItemGroup>
122122
<ClInclude Include="resource\resource.h">
@@ -131,15 +131,6 @@
131131
<ClInclude Include="include\vcc\devices\rtc\oki_m6242b.h">
132132
<Filter>Header Files\devices\rtc</Filter>
133133
</ClInclude>
134-
<ClInclude Include="include\vcc\cartridges\capi_adapter_cartridge.h">
135-
<Filter>Header Files\cartridges</Filter>
136-
</ClInclude>
137-
<ClInclude Include="include\vcc\cartridges\empty_cartridge.h">
138-
<Filter>Header Files\cartridges</Filter>
139-
</ClInclude>
140-
<ClInclude Include="include\vcc\cartridges\rom_cartridge.h">
141-
<Filter>Header Files\cartridges</Filter>
142-
</ClInclude>
143134
<ClInclude Include="include\vcc\utils\persistent_value_store.h">
144135
<Filter>Header Files\utils</Filter>
145136
</ClInclude>
@@ -191,6 +182,15 @@
191182
<ClInclude Include="include\vcc\detail\exports.h">
192183
<Filter>Header Files\detail</Filter>
193184
</ClInclude>
185+
<ClInclude Include="include\vcc\bus\cartridges\capi_adapter_cartridge.h">
186+
<Filter>Header Files\bus\cartridges</Filter>
187+
</ClInclude>
188+
<ClInclude Include="include\vcc\bus\cartridges\empty_cartridge.h">
189+
<Filter>Header Files\bus\cartridges</Filter>
190+
</ClInclude>
191+
<ClInclude Include="include\vcc\bus\cartridges\rom_cartridge.h">
192+
<Filter>Header Files\bus\cartridges</Filter>
193+
</ClInclude>
194194
</ItemGroup>
195195
<ItemGroup>
196196
<ResourceCompile Include="resource\libcommon.rc">

‎libcommon/src/cartridges/capi_adapter_cartridge.cpp‎ renamed to ‎libcommon/src/bus/cartridges/capi_adapter_cartridge.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@
1515
// You should have received a copy of the GNU General Public License along with
1616
// VCC (Virtual Color Computer). If not, see <http://www.gnu.org/licenses/>.
1717
////////////////////////////////////////////////////////////////////////////////
18-
#include <vcc/cartridges/capi_adapter_cartridge.h>
18+
#include <vcc/bus/cartridges/capi_adapter_cartridge.h>
1919
#include <stdexcept>
2020

2121
// C API hardware cartridge interface
2222

23-
namespace vcc::cartridges
23+
namespace vcc::bus::cartridges
2424
{
2525

2626
namespace

‎libcommon/src/cartridges/empty_cartridge.cpp‎ renamed to ‎libcommon/src/bus/cartridges/empty_cartridge.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
// You should have received a copy of the GNU General Public License along with
1616
// VCC (Virtual Color Computer). If not, see <http://www.gnu.org/licenses/>.
1717
////////////////////////////////////////////////////////////////////////////////
18-
#include <vcc/cartridges/empty_cartridge.h>
18+
#include <vcc/bus/cartridges/empty_cartridge.h>
1919

2020
// Interface for empty cartridge
2121

22-
namespace vcc::cartridges
22+
namespace vcc::bus::cartridges
2323
{
2424

2525
empty_cartridge::name_type empty_cartridge::name() const

‎libcommon/src/cartridges/rom_cartridge.cpp‎ renamed to ‎libcommon/src/bus/cartridges/rom_cartridge.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
// You should have received a copy of the GNU General Public License along with
1616
// VCC (Virtual Color Computer). If not, see <http://www.gnu.org/licenses/>.
1717
////////////////////////////////////////////////////////////////////////////////
18-
#include <vcc/cartridges/rom_cartridge.h>
18+
#include <vcc/bus/cartridges/rom_cartridge.h>
1919
#include <stdexcept>
2020

2121

22-
namespace vcc::cartridges
22+
namespace vcc::bus::cartridges
2323
{
2424

2525
rom_cartridge::rom_cartridge(

‎libcommon/src/utils/cartridge_loader.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
// VCC (Virtual Color Computer). If not, see <http://www.gnu.org/licenses/>.
1717
////////////////////////////////////////////////////////////////////////////////
1818
#include "../resource/resource.h"
19-
#include <vcc/cartridges/rom_cartridge.h>
20-
#include <vcc/cartridges/capi_adapter_cartridge.h>
19+
#include <vcc/bus/cartridges/rom_cartridge.h>
20+
#include <vcc/bus/cartridges/capi_adapter_cartridge.h>
2121
#include <vcc/utils/cartridge_loader.h>
2222
#include <vcc/utils/winapi.h>
2323
#include <vcc/bus/cartridge_factory.h>
@@ -102,7 +102,7 @@ namespace vcc::utils
102102

103103
return {
104104
nullptr,
105-
std::make_unique<vcc::cartridges::rom_cartridge>(
105+
std::make_unique<vcc::bus::cartridges::rom_cartridge>(
106106
move(context),
107107
extract_filename(filename),
108108
"",
@@ -151,7 +151,7 @@ namespace vcc::utils
151151

152152
if (GetProcAddress(details.handle.get(), "PakInitialize") != nullptr)
153153
{
154-
details.cartridge = std::make_unique<vcc::cartridges::capi_adapter_cartridge>(
154+
details.cartridge = std::make_unique<vcc::bus::cartridges::capi_adapter_cartridge>(
155155
details.handle.get(),
156156
host_context,
157157
configuration_path,

‎mpi/cartridge_slot.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
// VCC (Virtual Color Computer). If not, see <http://www.gnu.org/licenses/>.
1717
////////////////////////////////////////////////////////////////////////////////
1818
#include "cartridge_slot.h"
19-
#include <vcc/cartridges/empty_cartridge.h>
19+
#include <vcc/bus/cartridges/empty_cartridge.h>
2020

2121

2222
namespace vcc::modules::mpi
2323
{
2424

2525
cartridge_slot::cartridge_slot()
26-
: cartridge_(std::make_unique<::vcc::cartridges::empty_cartridge>())
26+
: cartridge_(std::make_unique<::vcc::bus::cartridges::empty_cartridge>())
2727
{}
2828

2929
cartridge_slot::cartridge_slot(path_type path, handle_type handle, cartridge_ptr_type cartridge)

0 commit comments

Comments
 (0)