Name change (again)

CMakeLists.txt

@@ -24,7 +24,7 @@
 
 cmake_minimum_required(VERSION 3.8)
 
-project(vixen VERSION 1.0.0)
+project(strikebox VERSION 1.0.0)
 
 # Differentiate between Linux and macOS
 if(UNIX AND NOT APPLE)
@@ -38,7 +38,7 @@ if(MSVC)
     set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
     # Configure startup project
-    set_property(DIRECTORY "${CMAKE_CURRENT_LIST_DIR}" PROPERTY VS_STARTUP_PROJECT vixen-cli)
+    set_property(DIRECTORY "${CMAKE_CURRENT_LIST_DIR}" PROPERTY VS_STARTUP_PROJECT strikebox-cli)
 endif()
 
 include(cmake/PrecompiledHeader.cmake)

Doxyfile

@@ -32,7 +32,7 @@ DOXYFILE_ENCODING      = UTF-8
 # title of most generated pages and in a few other places.
 # The default value is: My Project.
 
-PROJECT_NAME           = "viXen"
+PROJECT_NAME           = "StrikeBox"
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. This
 # could be handy for archiving the generated documentation or if some version

README.md

@@ -3,12 +3,12 @@ or [Cxbx-Reloaded](https://github.com/Cxbx-Reloaded/Cxbx-Reloaded).**
 
 ---
 
-# viXen
+# StrikeBox
-6th Generation (Original) Xbox Emulator
+Original Xbox Emulator
 
 A fork of [OpenXBOX](https://github.com/mborgerson/OpenXBOX) by mborgerson,
 with a focus on LLE emulation. HLE kernel was an original goal of OpenXBOX; it
-will come later in viXen.
+will come later in StrikeBox.
 
 The current state of this thing is just a tad bit more tangible than vaporware.
 Essentially right now it just initializes an x86 system (courtesy of one of the
@@ -23,18 +23,20 @@ networking nothing is really playable... yet ;)
 
 The initial goal is to emulate the original Xbox at a low level. The user will
 have to provide their own dump of the MCPX and BIOS ROMs from an Xbox machine,
-as well as the appropriate game media dump in XISO format or from an extracted
+as well as the appropriate game media dump in XISO format and a hard disk image
-directory and a hard disk image containing the system software.
+containing the system software.
 
-In the future, viXen will attempt to provide high level emulation of the kernel
+In the future, StrikeBox will attempt to provide high level emulation of the
-in order to sidestep the ROM and dashboard requirements. It is a long way off,
+kernel in order to sidestep the ROM and dashboard requirements. It is a long
-as research on the kernel is still incipient and existing implementations are
+way off, as research on the kernel is still incipient and existing
-incomplete, incorrect or straight up copies of illegally obtained code.
+implementations are incomplete, incorrect or straight up copies of illegally
+obtained code.
 
 How to Build
 ------------
-viXen uses [CMake](https://cmake.org/) build files to generate projects for
+StrikeBox uses [CMake](https://cmake.org/) build files to generate projects for
-your preferred development platform. You'll need CMake 3.8 or later.
+your preferred development platform. You'll need CMake 3.8 or later and the
+[virt86](https://github.com/StrikerX3/virt86) library.
 
 ### Windows
 To make a [Visual Studio 2017](https://www.visualstudio.com/downloads/)
@@ -55,7 +57,7 @@ $ sudo apt-get install cmake
 $ mkdir build; cd build
 $ cmake .. && make
 $ cd src/cli
-$ ./vixen-cli -m <path-to-MCPX-ROM> -b <path-to-BIOS-ROM> -d <path-to-XBE> -r [debug|retail]
+$ ./strikebox-cli -m <path-to-MCPX-ROM> -b <path-to-BIOS-ROM> -d <path-to-XBE> -r [debug|retail]
 ```
 
 ### macOS

apps/cli/CMakeLists.txt

@@ -1,4 +1,4 @@
-project(vixen-cli VERSION 1.0.0 LANGUAGES CXX)
+project(strikebox-cli VERSION 1.0.0 LANGUAGES CXX)
 
 ##############################
 # Source files
@@ -20,19 +20,19 @@ file(GLOB_RECURSE public_headers
 ##############################
 # Project structure
 #
-add_executable(vixen-cli ${sources} ${private_headers} ${public_headers})
+add_executable(strikebox-cli ${sources} ${private_headers} ${public_headers})
 
-target_include_directories(vixen-cli
+target_include_directories(strikebox-cli
     PUBLIC
         $<INSTALL_INTERFACE:include>
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
     PRIVATE
         ${CMAKE_CURRENT_SOURCE_DIR}/src
 )
-target_link_libraries(vixen-cli vixen-core)
+target_link_libraries(strikebox-cli strikebox-core)
 
 if(MSVC)
-    add_precompiled_header(vixen-cli pch.hpp SOURCE_CXX "${CMAKE_CURRENT_SOURCE_DIR}/src/pch.cpp" FORCEINCLUDE)
+    add_precompiled_header(strikebox-cli pch.hpp SOURCE_CXX "${CMAKE_CURRENT_SOURCE_DIR}/src/pch.cpp" FORCEINCLUDE)
 
     vs_set_filters(BASE_DIR src FILTER_ROOT "Sources" SOURCES ${sources})
     vs_set_filters(BASE_DIR src FILTER_ROOT "Private Headers" SOURCES ${private_headers})
@@ -40,15 +40,15 @@ if(MSVC)
 
     vs_use_edit_and_continue()
 
-    set_target_properties(vixen-cli PROPERTIES FOLDER Applications)
+    set_target_properties(strikebox-cli PROPERTIES FOLDER Applications)
 else()
-    add_precompiled_header(vixen-cli src/pch.hpp PCH_PATH pch.hpp SOURCE_CXX "${CMAKE_CURRENT_SOURCE_DIR}/src/pch.cpp" FORCEINCLUDE)
+    add_precompiled_header(strikebox-cli src/pch.hpp PCH_PATH pch.hpp SOURCE_CXX "${CMAKE_CURRENT_SOURCE_DIR}/src/pch.cpp" FORCEINCLUDE)
 endif()
 
 ##############################
 # Installation
 #
-install(TARGETS vixen-cli
+install(TARGETS strikebox-cli
     EXPORT platform-check
     RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
 )

apps/cli/src/main.cpp

@@ -5,9 +5,9 @@
 
 #include "lib/cxxopts.hpp"
 
-#include "vixen/core.h"
+#include "strikebox/core.h"
-#include "vixen/settings.h"
+#include "strikebox/settings.h"
-#include "vixen/thread.h"
+#include "strikebox/thread.h"
 
 using namespace virt86;
 
@@ -31,15 +31,15 @@ char *basename(char *path)
  * Program entry point
  */
 int main(int argc, const char *argv[]) {
-    using namespace vixen;
+    using namespace strikebox;
 
     Thread_SetName("[Core] Main Thread");
 
-    auto info = GetViXenInfo();
+    auto info = GetStrikeBoxInfo();
-    printf("viXen v%s\n", info->version);
+    printf("StrikeBox v%s\n", info->version);
     printf("------------------\n");
 
-    cxxopts::Options options(basename((char*)argv[0]), "viXen - 6th generation (Original) XBOX Emulator\n");
+    cxxopts::Options options(basename((char*)argv[0]), "StrikeBox - Original XBOX Emulator\n");
     options.custom_help("-m mcpx_path -b bios_path -r xbox_rev [-d image_path] [-g image_path]");
     options.add_options()
         ("m, mcpx", "Path to MCPX ROM", cxxopts::value<std::string>(), "mcpx_path")

apps/cli/src/pch.hpp

@@ -1,5 +1,5 @@
 /*
-Precompiled header for the Platform Checker application.
+Precompiled header for StrikeBox CLI.
 -------------------------------------------------------------------------------
 MIT License
 

modules/core/CMakeLists.txt

@@ -1,4 +1,4 @@
-# The core of the viXen emulator.
+# The core of the StrikeBox emulator.
 # -------------------------------------------------------------------------------
 # MIT License
 # 
@@ -21,7 +21,7 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
-project(vixen-core VERSION 1.0.0 LANGUAGES CXX)
+project(strikebox-core VERSION 1.0.0 LANGUAGES CXX)
 
 include(ExternalProject)
 
@@ -61,11 +61,11 @@ file(GLOB_RECURSE public_headers
 # Project structure
 #
 
-add_library(vixen-core OBJECT ${sources} ${private_headers} ${public_headers})
+add_library(strikebox-core OBJECT ${sources} ${private_headers} ${public_headers})
 
-set_target_properties(vixen-core PROPERTIES DEBUG_POSTFIX "-debug")
+set_target_properties(strikebox-core PROPERTIES DEBUG_POSTFIX "-debug")
 
-target_include_directories(vixen-core
+target_include_directories(strikebox-core
     PUBLIC
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
         $<INSTALL_INTERFACE:include>
@@ -76,7 +76,7 @@ target_include_directories(vixen-core
 
 # Include virt86
 find_package(virt86 CONFIG REQUIRED)
-target_link_libraries(vixen-core PUBLIC virt86::virt86)
+target_link_libraries(strikebox-core PUBLIC virt86::virt86)
 
 # TODO: Include Zydis
 # add_definitions(-DZYDIS_STATIC_DEFINE)
@@ -87,19 +87,19 @@ target_link_libraries(vixen-core PUBLIC virt86::virt86)
 #     UPDATE_COMMAND ""
 #     INSTALL_COMMAND "")
 # ExternalProject_Get_Property(Zydis install_dir)
-# target_include_directories(vixen-core PUBLIC ${install_dir}/src/Zydis/include ${install_dir}/src/Zydis-build)
+# target_include_directories(strikebox-core PUBLIC ${install_dir}/src/Zydis/include ${install_dir}/src/Zydis-build)
-# add_dependencies(vixen-core Zydis)
+# add_dependencies(strikebox-core Zydis)
 # 
 # if(WIN32)
-#     target_link_libraries(vixen-core PUBLIC ${install_dir}/src/Zydis-build/${CMAKE_CFG_INTDIR}/Zydis.lib)
+#     target_link_libraries(strikebox-core PUBLIC ${install_dir}/src/Zydis-build/${CMAKE_CFG_INTDIR}/Zydis.lib)
 # else()
-#     target_link_libraries(vixen-core PUBLIC ${install_dir}/src/Zydis-build/libZydis.a)
+#     target_link_libraries(strikebox-core PUBLIC ${install_dir}/src/Zydis-build/libZydis.a)
 # endif()
 # 
-# target_include_directories(vixen-core PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${install_dir}/src/Zydis/include)
+# target_include_directories(strikebox-core PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${install_dir}/src/Zydis/include)
 
 if(MSVC)
-    add_precompiled_header(vixen-core pch.hpp SOURCE_CXX "${CMAKE_CURRENT_SOURCE_DIR}/src/common/pch.cpp" FORCEINCLUDE)
+    add_precompiled_header(strikebox-core pch.hpp SOURCE_CXX "${CMAKE_CURRENT_SOURCE_DIR}/src/common/pch.cpp" FORCEINCLUDE)
 
     vs_set_filters(BASE_DIR src FILTER_ROOT "Sources" SOURCES ${sources})
     vs_set_filters(BASE_DIR src FILTER_ROOT "Private Headers" SOURCES ${private_headers})
@@ -107,9 +107,9 @@ if(MSVC)
 
     vs_use_edit_and_continue()
 
-    set_target_properties(vixen-core PROPERTIES FOLDER Libraries)
+    set_target_properties(strikebox-core PROPERTIES FOLDER Libraries)
 else()
-    add_precompiled_header(vixen-core src/common/pch.hpp PCH_PATH pch.hpp SOURCE_CXX "${CMAKE_CURRENT_SOURCE_DIR}/src/common/pch.cpp" FORCEINCLUDE)
+    add_precompiled_header(strikebox-core src/common/pch.hpp PCH_PATH pch.hpp SOURCE_CXX "${CMAKE_CURRENT_SOURCE_DIR}/src/common/pch.cpp" FORCEINCLUDE)
 endif()
 
 ##############################
@@ -122,7 +122,7 @@ set(generated_dir "${CMAKE_CURRENT_BINARY_DIR}/generated")
 set(version_config "${generated_dir}/${PROJECT_NAME}ConfigVersion.cmake")
 set(project_config "${generated_dir}/${PROJECT_NAME}Config.cmake")
 set(TARGETS_EXPORT_NAME "${PROJECT_NAME}Targets")
-set(namespace "vixen::")
+set(namespace "strikebox::")
 
 # Include module with function 'write_basic_package_version_file'
 include(CMakePackageConfigHelpers)
@@ -145,7 +145,7 @@ configure_package_config_file(
 )
 
 # Install target library
-install(TARGETS vixen-core
+install(TARGETS strikebox-core
     EXPORT "${TARGETS_EXPORT_NAME}"
     LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
     ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"

modules/core/include/strikebox/alloc.h

@@ -2,7 +2,7 @@
 
 #include <cstdlib>
 
-namespace vixen {
+namespace strikebox {
 
 #ifdef _WIN32
 	#define valloc(size) _aligned_malloc((size), 4096)

modules/core/include/strikebox/core.h

@@ -0,0 +1,14 @@
+#pragma once
+
+#include "strikebox/xbox.h"
+
+namespace strikebox {
+
+struct StrikeBoxInfo {
+	const char *version;
+	const uint64_t versionId;
+};
+
+const struct StrikeBoxInfo * GetStrikeBoxInfo();
+
+}

modules/core/include/strikebox/cxbxtimer.h

@@ -39,7 +39,7 @@
 
 #include <atomic>
 
-namespace vixen {
+namespace strikebox {
 
 /* typedef of the timer object and the callback function */
 typedef void(*pTimerCB)(void*);

modules/core/include/strikebox/debug.h

@@ -2,9 +2,9 @@
 
 #include "virt86/virt86.hpp"
 
-#include "vixen/log.h"
+#include "strikebox/log.h"
 
-namespace vixen {
+namespace strikebox {
 
 /*!
  * Print the CPU registers

modules/core/include/strikebox/dynamic_variant.h

@@ -2,7 +2,7 @@
 
 #include <cstdlib>
 
-namespace vixen {
+namespace strikebox {
 
 /*!
  * Stores any type of object.

modules/core/include/strikebox/gdbserver.h

@@ -39,7 +39,7 @@
 
 #include "virt86/virt86.hpp"
 
-namespace vixen {
+namespace strikebox {
 
 #ifdef _WIN32
 	typedef int socklen_t;

modules/core/include/strikebox/hw/ata/ata.h

@@ -14,11 +14,11 @@
 #include <cstdint>
 
 #include "../basic/irq.h"
-#include "vixen/io.h"
+#include "strikebox/io.h"
 #include "ata_defs.h"
 #include "ata_channel.h"
 
-namespace vixen {
+namespace strikebox {
 namespace hw {
 namespace ata {
 

modules/core/include/strikebox/hw/ata/ata_channel.h

@@ -15,7 +15,7 @@
 
 #include <mutex>
 
-#include "vixen/dynamic_variant.h"
+#include "strikebox/dynamic_variant.h"
 #include "../basic/irq.h"
 #include "../basic/interrupt.h"
 #include "ata_device.h"
@@ -31,7 +31,7 @@
 #include "cmds/cmd_set_features.h"
 #include "cmds/cmd_write_dma.h"
 
-namespace vixen {
+namespace strikebox {
 namespace hw {
 namespace ata {
 

modules/core/include/strikebox/hw/ata/ata_common.h

@@ -15,7 +15,7 @@
 
 #include "../ata/ata_defs.h"
 
-namespace vixen {
+namespace strikebox {
 namespace hw {
 namespace ata {
 

modules/core/include/strikebox/hw/ata/ata_defs.h

@@ -13,7 +13,7 @@
 
 #include <cstdint>
 
-namespace vixen {
+namespace strikebox {
 namespace hw {
 namespace ata {
 

modules/core/include/strikebox/hw/ata/ata_device.h

@@ -19,7 +19,7 @@
 #include "drvs/ata_device_driver.h"
 #include "drvs/drv_null.h"
 
-namespace vixen {
+namespace strikebox {
 namespace hw {
 namespace ata {
 

modules/core/include/strikebox/hw/ata/cmds/ata_command.h

@@ -13,10 +13,10 @@
 
 #include <cstdint>
 
-#include "vixen/dynamic_variant.h"
+#include "strikebox/dynamic_variant.h"
 #include "../ata_device.h"
 
-namespace vixen {
+namespace strikebox {
 namespace hw {
 namespace ata {
 namespace cmd {

modules/core/include/strikebox/hw/ata/cmds/cmd_identify_device.h

@@ -15,7 +15,7 @@
 
 #include "proto_pio_data_in.h"
 
-namespace vixen {
+namespace strikebox {
 namespace hw {
 namespace ata {
 namespace cmd {

modules/core/include/strikebox/hw/ata/cmds/cmd_identify_packet_device.h

@@ -15,7 +15,7 @@
 
 #include "proto_pio_data_in.h"
 
-namespace vixen {
+namespace strikebox {
 namespace hw {
 namespace ata {
 namespace cmd {

modules/core/include/strikebox/hw/ata/cmds/cmd_init_dev_params.h

@@ -15,7 +15,7 @@
 
 #include "proto_nondata.h"
 
-namespace vixen {
+namespace strikebox {
 namespace hw {
 namespace ata {
 namespace cmd {

modules/core/include/strikebox/hw/ata/cmds/cmd_packet.h

@@ -15,7 +15,7 @@
 
 #include "proto_packet.h"
 
-namespace vixen {
+namespace strikebox {
 namespace hw {
 namespace ata {
 namespace cmd {

modules/core/include/strikebox/hw/ata/cmds/cmd_read_dma.h

@@ -15,7 +15,7 @@
 
 #include "proto_dma.h"
 
-namespace vixen {
+namespace strikebox {
 namespace hw {
 namespace ata {
 namespace cmd {

modules/core/include/strikebox/hw/ata/cmds/cmd_security_unlock.h

@@ -15,7 +15,7 @@
 
 #include "proto_pio_data_out.h"
 
-namespace vixen {
+namespace strikebox {
 namespace hw {
 namespace ata {
 namespace cmd {

modules/core/include/strikebox/hw/ata/cmds/cmd_set_features.h

@@ -15,7 +15,7 @@
 
 #include "proto_nondata.h"
 
-namespace vixen {
+namespace strikebox {
 namespace hw {
 namespace ata {
 namespace cmd {

modules/core/include/strikebox/hw/ata/cmds/cmd_write_dma.h

@@ -15,7 +15,7 @@
 
 #include "proto_dma.h"
 
-namespace vixen {
+namespace strikebox {
 namespace hw {
 namespace ata {
 namespace cmd {

modules/core/include/strikebox/hw/ata/cmds/proto_dma.h

@@ -15,7 +15,7 @@
 
 #include "ata_command.h"
 
-namespace vixen {
+namespace strikebox {
 namespace hw {
 namespace ata {
 namespace cmd {

modules/core/include/strikebox/hw/ata/cmds/proto_nondata.h

@@ -15,7 +15,7 @@
 
 #include "ata_command.h"
 
-namespace vixen {
+namespace strikebox {
 namespace hw {
 namespace ata {
 namespace cmd {

modules/core/include/strikebox/hw/ata/cmds/proto_packet.h

@@ -14,13 +14,13 @@
 #include <cstdint>
 
 #include "ata_command.h"
-#include "vixen/hw/atapi/cmds/cmd_mode_sense_10.h"
+#include "strikebox/hw/atapi/cmds/cmd_mode_sense_10.h"
-#include "vixen/hw/atapi/cmds/cmd_read_10.h"
+#include "strikebox/hw/atapi/cmds/cmd_read_10.h"
-#include "vixen/hw/atapi/cmds/cmd_read_capacity.h"
+#include "strikebox/hw/atapi/cmds/cmd_read_capacity.h"
-#include "vixen/hw/atapi/cmds/cmd_read_dvd_structure.h"
+#include "strikebox/hw/atapi/cmds/cmd_read_dvd_structure.h"
-#include "vixen/hw/atapi/cmds/cmd_test_unit_ready.h"
+#include "strikebox/hw/atapi/cmds/cmd_test_unit_ready.h"
 
-namespace vixen {
+namespace strikebox {
 namespace hw {
 namespace ata {
 namespace cmd {

modules/core/include/strikebox/hw/ata/cmds/proto_pio_data_in.h

@@ -15,7 +15,7 @@
 
 #include "ata_command.h"
 
-namespace vixen {
+namespace strikebox {
 namespace hw {
 namespace ata {
 namespace cmd {

modules/core/include/strikebox/hw/ata/cmds/proto_pio_data_out.h

@@ -15,7 +15,7 @@
 
 #include "ata_command.h"
 
-namespace vixen {
+namespace strikebox {
 namespace hw {
 namespace ata {
 namespace cmd {

modules/core/include/strikebox/hw/ata/drvs/ata_device_driver.h

@@ -18,7 +18,7 @@
 #include "../ata_common.h"
 #include "util.h"
 
-namespace vixen {
+namespace strikebox {
 namespace hw {
 namespace ata {
 

modules/core/include/strikebox/hw/ata/drvs/drv_null.h

@@ -15,7 +15,7 @@
 
 #include "ata_device_driver.h"
 
-namespace vixen {
+namespace strikebox {
 namespace hw {
 namespace ata {
 

modules/core/include/strikebox/hw/ata/drvs/drv_vdvd_base.h

@@ -15,7 +15,7 @@
 
 #include "ata_device_driver.h"
 
-namespace vixen {
+namespace strikebox {
 namespace hw {
 namespace ata {
 

modules/core/include/strikebox/hw/ata/drvs/drv_vdvd_dummy.h

@@ -15,7 +15,7 @@
 
 #include "drv_vdvd_base.h"
 
-namespace vixen {
+namespace strikebox {
 namespace hw {
 namespace ata {
 

modules/core/include/strikebox/hw/ata/drvs/drv_vdvd_image.h

@@ -15,7 +15,7 @@
 
 #include "drv_vdvd_base.h"
 
-namespace vixen {
+namespace strikebox {
 namespace hw {
 namespace ata {
 

modules/core/include/strikebox/hw/ata/drvs/drv_vhd_base.h

@@ -15,7 +15,7 @@
 
 #include "ata_device_driver.h"
 
-namespace vixen {
+namespace strikebox {
 namespace hw {
 namespace ata {
 

modules/core/include/strikebox/hw/ata/drvs/drv_vhd_dummy.h

@@ -15,7 +15,7 @@
 
 #include "drv_vhd_base.h"
 
-namespace vixen {
+namespace strikebox {
 namespace hw {
 namespace ata {
 

modules/core/include/strikebox/hw/ata/drvs/drv_vhd_image.h

@@ -15,7 +15,7 @@
 
 #include "drv_vhd_base.h"
 
-namespace vixen {
+namespace strikebox {
 namespace hw {
 namespace ata {
 

modules/core/include/strikebox/hw/ata/drvs/util.h

@@ -2,7 +2,7 @@
 
 #include <cstdint>
 
-namespace vixen {
+namespace strikebox {
 namespace hw {
 namespace ata {
 

modules/core/include/strikebox/hw/atapi/atapi_common.h

@@ -32,7 +32,7 @@
 
 #include "atapi_defs.h"
 
-namespace vixen {
+namespace strikebox {
 namespace hw {
 namespace atapi {
 

modules/core/include/strikebox/hw/atapi/atapi_defs.h

@@ -30,7 +30,7 @@
 
 #include <cstdint>
 
-namespace vixen {
+namespace strikebox {
 namespace hw {
 namespace atapi {
 

modules/core/include/strikebox/hw/atapi/atapi_utils.h

@@ -30,7 +30,7 @@
 
 #include <cstdint>
 
-namespace vixen {
+namespace strikebox {
 namespace hw {
 namespace atapi {
 

modules/core/include/strikebox/hw/atapi/atapi_xbox.h

@@ -13,7 +13,7 @@
 
 #include <cstdint>
 
-namespace vixen {
+namespace strikebox {
 namespace hw {
 namespace atapi {
 

modules/core/include/strikebox/hw/atapi/cmds/atapi_command.h

@@ -33,9 +33,9 @@
 #include "../atapi_common.h"
 #include "../atapi_utils.h"
 #include "../atapi_xbox.h"
-#include "vixen/hw/ata/drvs/ata_device_driver.h"
+#include "strikebox/hw/ata/drvs/ata_device_driver.h"
 
-namespace vixen {
+namespace strikebox {
 namespace hw {
 namespace atapi {
 namespace cmd {

modules/core/include/strikebox/hw/atapi/cmds/cmd_mode_sense_10.h

@@ -32,7 +32,7 @@
 
 #include "proto_data_in.h"  
 
-namespace vixen {
+namespace strikebox {
 namespace hw {
 namespace atapi {
 namespace cmd {

modules/core/include/strikebox/hw/atapi/cmds/cmd_read_10.h

@@ -32,7 +32,7 @@
 
 #include "proto_data_in.h"  
 
-namespace vixen {
+namespace strikebox {
 namespace hw {
 namespace atapi {
 namespace cmd {

modules/core/include/strikebox/hw/atapi/cmds/cmd_read_capacity.h

@@ -32,7 +32,7 @@
 
 #include "proto_data_in.h"  
 
-namespace vixen {
+namespace strikebox {
 namespace hw {
 namespace atapi {
 namespace cmd {

modules/core/include/strikebox/hw/atapi/cmds/cmd_read_dvd_structure.h

@@ -32,7 +32,7 @@
 
 #include "proto_data_in.h"  
 
-namespace vixen {
+namespace strikebox {
 namespace hw {
 namespace atapi {
 namespace cmd {

modules/core/include/strikebox/hw/atapi/cmds/cmd_test_unit_ready.h

@@ -32,7 +32,7 @@
 
 #include "proto_nondata.h"  
 
-namespace vixen {
+namespace strikebox {
 namespace hw {
 namespace atapi {
 namespace cmd {

modules/core/include/strikebox/hw/atapi/cmds/proto_data_in.h

@@ -32,7 +32,7 @@
 
 #include "atapi_command.h"
 
-namespace vixen {
+namespace strikebox {
 namespace hw {
 namespace atapi {
 namespace cmd {

modules/core/include/strikebox/hw/atapi/cmds/proto_nondata.h

@@ -32,7 +32,7 @@
 
 #include "atapi_command.h"
 
-namespace vixen {
+namespace strikebox {
 namespace hw {
 namespace atapi {
 namespace cmd {

modules/core/include/strikebox/hw/basic/char.h

@@ -2,9 +2,9 @@
 
 #include <cstdint>
 
-#include "vixen/util/fifo.h"
+#include "strikebox/util/fifo.h"
 
-namespace vixen {
+namespace strikebox {
 
 #define CHR_EVENT_BREAK   0 // Serial break char
 #define CHR_EVENT_FOCUS   1 // Focus to this terminal (modal input needed)

modules/core/include/strikebox/hw/basic/char_null.h

@@ -4,7 +4,7 @@
 
 #include "char.h"
 
-namespace vixen {
+namespace strikebox {
 
 class NullCharDriver : public CharDriver {
 public:

modules/core/include/strikebox/hw/basic/cmos.h

@@ -1,11 +1,11 @@
 #pragma once
 
-#include "vixen/io.h"
+#include "strikebox/io.h"
 
 #include <cstdint>
 #include <chrono>
 
-namespace vixen {
+namespace strikebox {
 
 #define CMOS_IRQ   8
 

modules/core/include/strikebox/hw/basic/gsi.h

@@ -6,7 +6,7 @@
 #include "ioapic.h"
 #include "../bus/isabus.h"
 
-namespace vixen {
+namespace strikebox {
 
 #define GSI_NUM_PINS IOAPIC_NUM_PINS
 

modules/core/include/strikebox/hw/basic/i8254.h

@@ -4,9 +4,9 @@
 #include <thread>
 
 #include "irq.h"
-#include "vixen/io.h"
+#include "strikebox/io.h"
 
-namespace vixen {
+namespace strikebox {
 
 #define PORT_PIT_DATA_0		0x40
 #define PORT_PIT_DATA_1		0x41

modules/core/include/strikebox/hw/basic/i8259.h

@@ -5,10 +5,10 @@
 
 #include "virt86/virt86.hpp"
 
-#include "vixen/io.h"
+#include "strikebox/io.h"
 #include "irq.h"
 
-namespace vixen {
+namespace strikebox {
 
 #define PORT_PIC_MASTER_COMMAND  0x20
 #define PORT_PIC_MASTER_DATA     0x21

modules/core/include/strikebox/hw/basic/interrupt.h

@@ -1,6 +1,6 @@
 #pragma once
 
-namespace vixen {
+namespace strikebox {
 namespace hw {
 
 class InterruptTrigger {

modules/core/include/strikebox/hw/basic/ioapic.h

@@ -1,6 +1,6 @@
 #pragma once
 
-namespace vixen {
+namespace strikebox {
 
 #define IOAPIC_NUM_PINS 24
 

modules/core/include/strikebox/hw/basic/irq.h

@@ -2,7 +2,7 @@
 
 #include <cstdint>
 
-namespace vixen {
+namespace strikebox {
 
 class IRQHandler {
 public:

modules/core/include/strikebox/hw/basic/mcpx.h

@@ -4,7 +4,7 @@
 
 #include "../defs.h"
 
-namespace vixen {
+namespace strikebox {
 
 // MCPX ROM versions.
 typedef enum {

modules/core/include/strikebox/hw/basic/serial.h

@@ -2,15 +2,15 @@
 
 #include <cstdint>
 
-#include "vixen/io.h"
+#include "strikebox/io.h"
-#include "vixen/util/fifo.h"
+#include "strikebox/util/fifo.h"
-#include "vixen/util/invoke_later.h"
+#include "strikebox/util/invoke_later.h"
 #include "char.h"
 #include "../basic/irq.h"
 
 #include <chrono>
 
-namespace vixen {
+namespace strikebox {
 
 #define UART_FIFO_LENGTH 16
 

modules/core/include/strikebox/hw/basic/superio.h

@@ -4,7 +4,7 @@
 
 #include "serial.h"
 
-namespace vixen {
+namespace strikebox {
 
 #define PORT_SUPERIO_CONFIG      0x2E
 #define PORT_SUPERIO_DATA        0x2F

modules/core/include/strikebox/hw/bus/isabus.h

@@ -2,7 +2,7 @@
 
 #include "../basic/irq.h"
 
-namespace vixen {
+namespace strikebox {
 
 #define ISA_NUM_IRQS  16
 

modules/core/include/strikebox/hw/bus/pcibus.h

@@ -2,11 +2,11 @@
 
 #include "../pci/pci_irq.h" 
 #include "../pci/pci.h"
-#include "vixen/io.h"
+#include "strikebox/io.h"
 
 #include <map>
 
-namespace vixen {
+namespace strikebox {
 
 #define PORT_PCI_CONFIG_ADDRESS   0xCF8
 #define PORT_PCI_CONFIG_DATA      0xCFC

modules/core/include/strikebox/hw/bus/smbus.h

@@ -6,7 +6,7 @@
 
 #include <map>
 
-namespace vixen {
+namespace strikebox {
 
 #define SMB_ADDR_OFFSET         0xE0
 #define SMB_IOSIZE              16

modules/core/include/strikebox/hw/defs.h

@@ -2,7 +2,7 @@
 
 #include <stdint.h>
 
-namespace vixen {
+namespace strikebox {
 
 // Constants for SMBus device addresses.
 // The constants point to the write address.

modules/core/include/strikebox/hw/nv2a/defs.h

@@ -5,7 +5,7 @@
 #include <queue>
 #include "nv2a_int.h"
 
-namespace vixen {
+namespace strikebox {
 
 #define NV2A_SIZE 0x01000000
 

modules/core/include/strikebox/hw/ohci/ohci.h

@@ -43,9 +43,9 @@
 #include "virt86/virt86.hpp"
 
 #include "../pci/usb_pci.h"
-#include "vixen/cxbxtimer.h"
+#include "strikebox/cxbxtimer.h"
 
-namespace vixen {
+namespace strikebox {
 
 // Abbreviations used:
 // OHCI: Open Host Controller Interface; the standard used on the Xbox to comunicate with the usb devices

modules/core/include/strikebox/hw/ohci/ohci_common.h

@@ -40,10 +40,10 @@
 
 #pragma once
 
-#include "vixen/queue.h"
+#include "strikebox/queue.h"
-#include "vixen/iovec.h"
+#include "strikebox/iovec.h"
 
-namespace vixen {
+namespace strikebox {
 
 #define USB_MAX_ENDPOINTS  15
 #define USB_MAX_INTERFACES 16
@@ -248,7 +248,7 @@ struct USBDescID {
     uint16_t                  bcdDevice;     // device release number in binary-coded decimal
     uint8_t                   iManufacturer; // index of string descriptor describing manufacturer
     uint8_t                   iProduct;      // index of string descriptor describing product
-    uint8_t                   iSerialNumber; // index of string descriptor describing the device’s serial number
+    uint8_t                   iSerialNumber; // index of string descriptor describing the device's serial number
 };
 
 /* Global USB Descriptor struct */

modules/core/include/strikebox/hw/ohci/ohci_hub.h

@@ -42,7 +42,7 @@
 
 #include "../pci/usb_pci.h"
 
-namespace vixen {
+namespace strikebox {
 
 #define NUM_PORTS 8
 

modules/core/include/strikebox/hw/pci/ac97.h

@@ -5,7 +5,7 @@
 #include "../defs.h"
 #include "pci.h"
 
-namespace vixen {
+namespace strikebox {
 
 class AC97Device : public PCIDevice {
 public:

modules/core/include/strikebox/hw/pci/agpbridge.h

@@ -5,7 +5,7 @@
 #include "../defs.h"
 #include "pcibridge.h"
 
-namespace vixen {
+namespace strikebox {
 
 class AGPBridgeDevice : public PCIBridgeDevice {
 public:

modules/core/include/strikebox/hw/pci/bmide.h

@@ -14,9 +14,9 @@
 #include "pci.h"
 #include "bmide_defs.h"
 #include "bmide_channel.h"
-#include "vixen/hw/ata/ata.h"
+#include "strikebox/hw/ata/ata.h"
 
-namespace vixen {
+namespace strikebox {
 namespace hw {
 namespace bmide {
 

modules/core/include/strikebox/hw/pci/bmide_channel.h

@@ -10,11 +10,11 @@
 #include <cstdint>
 #include <mutex>
 
-#include "vixen/hw/pci/bmide_defs.h"
+#include "strikebox/hw/pci/bmide_defs.h"
-#include "vixen/hw/ata/ata_common.h"
+#include "strikebox/hw/ata/ata_common.h"
-#include "vixen/hw/ata/ata.h"
+#include "strikebox/hw/ata/ata.h"
 
-namespace vixen {
+namespace strikebox {
 namespace hw {
 namespace bmide {
 

modules/core/include/strikebox/hw/pci/bmide_defs.h

@@ -9,7 +9,7 @@
 
 #include <cstdint>
 
-namespace vixen {
+namespace strikebox {
 namespace hw {
 namespace bmide {
 

modules/core/include/strikebox/hw/pci/hostbridge.h

@@ -5,7 +5,7 @@
 #include "../defs.h"
 #include "pci.h"
 
-namespace vixen {
+namespace strikebox {
 
 class HostBridgeDevice : public PCIDevice {
 public:

modules/core/include/strikebox/hw/pci/lpc.h

@@ -8,7 +8,7 @@
 #include "../basic/irq.h"
 #include "../bus/isabus.h"
 
-namespace vixen {
+namespace strikebox {
 
 #define XBOX_NUM_INT_IRQS 8
 #define XBOX_NUM_PIRQS    4

modules/core/include/strikebox/hw/pci/mcpx_ram.h

@@ -6,7 +6,7 @@
 #include "pci.h"
 #include "../basic/mcpx.h"
 
-namespace vixen {
+namespace strikebox {
 
 class MCPXRAMDevice : public PCIDevice {
 public:

modules/core/include/strikebox/hw/pci/nv2a.h

@@ -8,7 +8,7 @@
 #include "../nv2a/vga.h"
 #include "../basic/irq.h"
 
-namespace vixen {
+namespace strikebox {
 
 class NV2ADevice : public PCIDevice {
 public:

modules/core/include/strikebox/hw/pci/nvapu.h

@@ -45,7 +45,7 @@
 #include "../defs.h"
 #include "pci.h"
 
-namespace vixen {
+namespace strikebox {
 
 #define APU_VP_BASE 0x20000
 #define APU_VP_SIZE 0x10000

modules/core/include/strikebox/hw/pci/nvnet.h

@@ -2,7 +2,7 @@
 
 #include "pci.h"
 
-namespace vixen {
+namespace strikebox {
 
 #define NVNET_ADDR  0xFEF00000 
 #define NVNET_SIZE  0x00000400

modules/core/include/strikebox/hw/pci/pci.h

@@ -5,7 +5,7 @@
 #include "pci_regs.h"
 #include "pci_common.h"
 
-namespace vixen {
+namespace strikebox {
 
 #define PCI_CONFIG_HEADER_SIZE   0x40
 

modules/core/include/strikebox/hw/pci/pci_common.h

@@ -2,7 +2,7 @@
 
 #include <cstdint>
 
-namespace vixen {
+namespace strikebox {
 
 #define PCI_DEVFN(slot, func) ((((slot) & 0x1f) << 3) | ((func) & 0x07))
 #define PCI_DEVID(bus, devfn)  ((((uint16_t)(bus)) << 8) | (devfn))

modules/core/include/strikebox/hw/pci/pci_irq.h

@@ -2,7 +2,7 @@
 
 #include "pci.h"
 
-namespace vixen {
+namespace strikebox {
 
 #define PCI_NUM_PINS 4
 

modules/core/include/strikebox/hw/pci/pcibridge.h

@@ -7,7 +7,7 @@
 #include "../bus/pcibus.h"
 #include "pci_irq.h"
 
-namespace vixen {
+namespace strikebox {
 
 class PCIBridgeDevice : public PCIDevice {
 public:

modules/core/include/strikebox/hw/pci/usb_pci.h

@@ -48,7 +48,7 @@
 #include "pci.h"
 #include "../ohci/ohci_common.h"
 
-namespace vixen {
+namespace strikebox {
 
 typedef enum USBDeviceFlags {
     USB_DEV_FLAG_FULL_PATH,

modules/core/include/strikebox/hw/sm/adm1032.h

@@ -6,7 +6,7 @@
 
 #include "sm.h"
 
-namespace vixen {
+namespace strikebox {
 
 enum ADM1032Register {
     ADM1032RegLocalTemp = 0x00,    // (Read-only) Local Temperature Value

modules/core/include/strikebox/hw/sm/eeprom.h

@@ -2,7 +2,7 @@
 
 #include "sm.h"
 
-namespace vixen {
+namespace strikebox {
 
 #define EEPROM_SIZE 256
 

modules/core/include/strikebox/hw/sm/led.h

@@ -1,6 +1,6 @@
 #pragma once
 
-namespace vixen {
+namespace strikebox {
 namespace LED {
 
 // See http://xboxdevwiki.net/PIC#The_LED

modules/core/include/strikebox/hw/sm/sm.h

@@ -2,7 +2,7 @@
 
 #include <cstdint>
 
-namespace vixen {
+namespace strikebox {
 
 class SMDevice {
 public:

modules/core/include/strikebox/hw/sm/smc.h

@@ -5,7 +5,7 @@
 #include "../defs.h"
 #include "sm.h"
 
-namespace vixen {
+namespace strikebox {
 
 // The picture linked below shows:
 // https://upload.wikimedia.org/wikipedia/commons/9/94/Xbox-Motherboard-FR.jpg

modules/core/include/strikebox/hw/sm/tvenc.h

@@ -5,7 +5,7 @@
 #include "../defs.h"
 #include "sm.h"
 
-namespace vixen {
+namespace strikebox {
 
 // Xbox TV encoder chips.
 typedef enum {

modules/core/include/strikebox/hw/sm/tvenc_conexant.h

@@ -2,7 +2,7 @@
 
 #include "tvenc.h"
 
-namespace vixen {
+namespace strikebox {
 
 class TVEncConexantDevice : public TVEncoderDevice {
 public:

modules/core/include/strikebox/hw/utils.h

@@ -2,7 +2,7 @@
 
 #include <cstdint>
 
-namespace vixen {
+namespace strikebox {
 
 /*!
  * Get last byte of a range from offset + length.