summaryrefslogtreecommitdiff
path: root/lib/nes/sys
diff options
context:
space:
mode:
Diffstat (limited to 'lib/nes/sys')
-rw-r--r--lib/nes/sys/cartridge.cc3
-rw-r--r--lib/nes/sys/cartridge.hh2
-rw-r--r--lib/nes/sys/cpu.hh2
-rw-r--r--lib/nes/sys/mapper.hh2
-rw-r--r--lib/nes/sys/types/CMakeLists.txt3
-rw-r--r--lib/nes/sys/types/status.hh33
6 files changed, 5 insertions, 40 deletions
diff --git a/lib/nes/sys/cartridge.cc b/lib/nes/sys/cartridge.cc
index 14fff3d..0729107 100644
--- a/lib/nes/sys/cartridge.cc
+++ b/lib/nes/sys/cartridge.cc
@@ -1,6 +1,5 @@
#include "nes/sys/cartridge.hh"
-#include "nes/sys/types/status.hh"
-#include <fstream>
+#include "nes/common/status.hh"
#include <algorithm>
namespace nes::sys
diff --git a/lib/nes/sys/cartridge.hh b/lib/nes/sys/cartridge.hh
index 5383b56..4534e1e 100644
--- a/lib/nes/sys/cartridge.hh
+++ b/lib/nes/sys/cartridge.hh
@@ -1,7 +1,7 @@
#pragma once
-#include "nes/sys/types/status.hh"
#include "nes/sys/mapper.hh"
+#include "nes/common/status.hh"
#include "nes/common/types.hh"
#include "nes/common/span.hh"
diff --git a/lib/nes/sys/cpu.hh b/lib/nes/sys/cpu.hh
index 5d6466f..99753a7 100644
--- a/lib/nes/sys/cpu.hh
+++ b/lib/nes/sys/cpu.hh
@@ -2,7 +2,7 @@
#include "nes/sys/types/cycle-count.hh"
#include "nes/sys/types/address.hh"
-#include "nes/sys/types/status.hh"
+#include "nes/common/status.hh"
#include "nes/common/types.hh"
namespace nes::sys
diff --git a/lib/nes/sys/mapper.hh b/lib/nes/sys/mapper.hh
index 9ad88e2..48363dd 100644
--- a/lib/nes/sys/mapper.hh
+++ b/lib/nes/sys/mapper.hh
@@ -1,7 +1,7 @@
#pragma once
#include "nes/sys/types/address.hh"
-#include "nes/sys/types/status.hh"
+#include "nes/common/status.hh"
#include "nes/common/types.hh"
#include "nes/common/span.hh"
diff --git a/lib/nes/sys/types/CMakeLists.txt b/lib/nes/sys/types/CMakeLists.txt
index f51b0ae..863cf65 100644
--- a/lib/nes/sys/types/CMakeLists.txt
+++ b/lib/nes/sys/types/CMakeLists.txt
@@ -4,5 +4,4 @@ target_sources(
address.hh
button-mask.hh
cycle-count.hh
- snapshot.hh
- status.hh) \ No newline at end of file
+ snapshot.hh) \ No newline at end of file
diff --git a/lib/nes/sys/types/status.hh b/lib/nes/sys/types/status.hh
deleted file mode 100644
index 9b1e824..0000000
--- a/lib/nes/sys/types/status.hh
+++ /dev/null
@@ -1,33 +0,0 @@
-#pragma once
-
-namespace nes::sys
-{
- /// A status code.
- enum class status
- {
- success,
- error_system_error,
- error_invalid_ines_data,
- error_unsupported_mapper,
- error_unsupported_instruction,
- };
-
- constexpr auto to_string(status const status) -> char const*
- {
- switch (status)
- {
- case status::success:
- return "Success";
- case status::error_system_error:
- return "System error";
- case status::error_invalid_ines_data:
- return "Invalid iNES data";
- case status::error_unsupported_mapper:
- return "Unsupported mapper";
- case status::error_unsupported_instruction:
- return "Unsupported instruction";
- }
-
- return "(invalid)";
- }
-} // namespace nes::sys \ No newline at end of file