From 84985785c86c349e9ead3615760cff2d5e75e98a Mon Sep 17 00:00:00 2001
From: spicyjpeg <thatspicyjpeg@gmail.com>
Date: Thu, 27 Jun 2024 09:52:57 +0200
Subject: [PATCH] Bump to 0.4.7, rename to 573in1 and update docs

---
 .github/scripts/buildRelease.sh |   4 +-
 .github/workflows/build.yml     |  12 ++---
 CMakeLists.txt                  |   6 +--
 README.md                       |  86 ++++++++++++++++++++------------
 assets/about.txt                |   9 ++--
 assets/cdreadme.txt             |   4 +-
 assets/textures/font.png        | Bin 2723 -> 2535 bytes
 doc/assets/logo.png             | Bin 0 -> 4371 bytes
 src/common/defs.hpp             |   2 +-
 src/common/util.hpp             |  33 ++++--------
 10 files changed, 83 insertions(+), 73 deletions(-)
 create mode 100644 doc/assets/logo.png

diff --git a/.github/scripts/buildRelease.sh b/.github/scripts/buildRelease.sh
index da59a2c..e2ae905 100755
--- a/.github/scripts/buildRelease.sh
+++ b/.github/scripts/buildRelease.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 ROOT_DIR="$(pwd)"
-PROJECT_DIR="$ROOT_DIR/cart-tool"
+PROJECT_DIR="$ROOT_DIR/573in1"
 OPENBIOS_DIR="$ROOT_DIR/nugget/openbios"
 TOOLCHAIN_DIR="$ROOT_DIR/gcc-mipsel-none-elf"
 
@@ -14,7 +14,7 @@ cmake --build "$PROJECT_DIR/build" \
 
 RELEASE_NAME="$(
 	ls "$PROJECT_DIR/build" |
-	grep -E -o '^cart-tool-[0-9]+\.[0-9]+\.[0-9]+' |
+	grep -E -o '^573in1-[0-9]+\.[0-9]+\.[0-9]+' |
 	head -n 1
 )"
 
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e567a0f..365a32a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,7 +21,7 @@ jobs:
     - name: Fetch repo contents
       uses: actions/checkout@v4
       with:
-        path: cart-tool
+        path: 573in1
 
     - name: Fetch OpenBIOS repo contents
       uses: actions/checkout@v4
@@ -34,27 +34,27 @@ jobs:
       run: |
         sudo apt-get update -y
         sudo apt-get install -y --no-install-recommends ninja-build mame-tools
-        sudo pip3 install -r cart-tool/tools/requirements.txt
+        sudo pip3 install -r 573in1/tools/requirements.txt
 
     - name: Build GCC toolchain
       if:   ${{ steps.cache.outputs.cache-hit != 'true' }}
       run: |
-        cart-tool/.github/scripts/buildToolchain.sh gcc-mipsel-none-elf mipsel-none-elf
+        573in1/.github/scripts/buildToolchain.sh gcc-mipsel-none-elf mipsel-none-elf
 
     - name: Build project
       run: |
-        cart-tool/.github/scripts/buildRelease.sh
+        573in1/.github/scripts/buildRelease.sh
 
     - name: Upload build artifacts
       uses: actions/upload-artifact@v4
       with:
         name:              build
         if-no-files-found: error
-        path:              cart-tool-*.zip
+        path:              573in1-*.zip
 
     - name: Publish release
       if:   ${{ github.ref_type == 'tag' }}
       uses: softprops/action-gh-release@v1
       with:
         fail_on_unmatched_files: true
-        files:                   cart-tool-*.zip
+        files:                   573in1-*.zip
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0535d3d..e9475c4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,10 +4,10 @@ cmake_minimum_required(VERSION 3.25)
 set(CMAKE_TOOLCHAIN_FILE "${CMAKE_CURRENT_LIST_DIR}/cmake/toolchain.cmake")
 
 project(
-	cart-tool
+	573in1
 	LANGUAGES    C CXX ASM
-	VERSION      0.4.6
-	DESCRIPTION  "Konami System 573 security cartridge tool"
+	VERSION      0.4.7
+	DESCRIPTION  "Konami System 573 maintenance tool"
 )
 
 set(
diff --git a/README.md b/README.md
index 69d76e8..cf780e3 100644
--- a/README.md
+++ b/README.md
@@ -1,41 +1,65 @@
 
-# Konami System 573 security cartridge tool
+<p align="center">
+  <img src="doc/assets/logo.png" alt="573in1 logo" />
+</p>
 
-## Building
+573in1 is a full-featured homebrew maintenance and troubleshooting tool, game
+installer and BIOS ROM replacement for arcade games based on Konami's System 573
+PCB, such as earlier versions of Dance Dance Revolution and other Bemani rhythm
+games from the same era. It currently allows for:
 
-The following dependencies are required in order to build the project:
+- dumping, erasing and writing images to the onboard flash memory, PCMCIA flash
+  cards and RTC RAM;
+- dumping security cartridge EEPROMs and editing the serial number stored in
+  them in order to reinstall a game on a different system;
+- repurposing cartridges for use with any game that uses the same cartridge
+  type;
+- browsing the CD-ROM, or any attached IDE hard drive or CF card, and launching
+  System 573 and PS1 executables.
 
-- CMake 3.25 or later;
-- Python 3.10 or later;
-- [Ninja](https://ninja-build.org/);
-- a recent version of the GCC toolchain that targets the `mipsel-none-elf`
-  architecture;
-- optionally, `xorriso` and `chdman` (in order to build the CD-ROM image).
+## Download and usage
 
-The toolchain can be installed on Windows, Linux or macOS by following the
-instructions [here](https://github.com/grumpycoders/pcsx-redux/blob/main/src/mips/psyqo/GETTING_STARTED.md#the-toolchain)
-and should be added to `PATH`. The other dependencies can be installed through a
-package manager.
+The latest version of 573in1 can be found on the releases page, accessible
+through the GitHub sidebar. The tool is available in three different formats:
 
-The Python script used to convert images at build time requires additional
-dependencies which can be installed by running:
+- as a CD-ROM image, usable on any 573 equipped with a CD-ROM drive (including
+  ones fitted with BIOS mod boards);
+- as a BIOS ROM image, allowing the system to boot directly into the 573in1 main
+  menu (even with no IDE drives connected) and optionally launch a game or
+  custom executable automatically;
+- as a standalone 573 executable for advanced users.
 
-```
-py -m pip install -r tools/requirements.txt   (Windows)
-sudo pip install -r tools/requirements.txt    (Linux/macOS)
-```
+See the [documentation](doc/index.md) for more information and usage
+instructions. Reading the documentation before proceeding is highly recommended.
 
-Once all prerequisites are installed, the tool can be built in debug mode (with
-command-line argument parsing disabled and serial port logging enabled by
-default) by running:
+## Contributing
 
-```
-cmake --preset debug
-cmake --build ./build
-```
+Pull requests are welcome. If you wish to add functionality (e.g. game-specific
+menus to manipulate user data, extract assets and so on) feel free to do so,
+however please stick to the following guidelines:
 
-Replace `debug` with `release` to build in release mode or `min-size-release` to
-optimize the executable for size. If `xorriso` is installed and listed in the
-`PATH` environment variable, a bootable CD-ROM image will be generated alongside
-the executable. A copy of the image in CHD format will additionally be generated
-if MAME's `chdman` tool is also present.
+- Do not include any code lifted as-is or minimally modified from a game
+  disassembly. Rewritten and properly explained/commented code is fine.
+- Do not include any Konami game files or excerpts thereof. If necessary, only
+  include metadata about the files such as hashes, offsets, sizes and so on.
+- Store any such metadata as a file in the resource archive (see
+  `resources.json`) rather than hardcoding it. If possible, provide a copy of
+  the scripts used to gather the data from the original files in the `tools`
+  directory.
+- Adding a section to the documentation covering usage of the newly added
+  functionality is not required, but would be highly appreciated.
+
+## License
+
+The tool is licensed under the [GNU GPLv3](LICENSE). You may freely distribute
+modified versions as long as you also provide the full source code, attribution
+and a link back to this repository.
+
+## See also
+
+- Naoki Saito's 573 resources:
+  - [Konami's System 573 - Everything you wanted to know about it!](https://youtube.com/watch?v=Cm6ycmTbwIU)
+  - [System 573 repo](https://github.com/NaokiS28/KSystem-573)
+- [System 573 specifications](https://psx-spx.consoledev.net/konamisystem573)
+- [ps1-bare-metal](https://github.com/spicyjpeg/ps1-bare-metal)
+- [PSX.Dev Discord server](https://discord.gg/QByKPpH)
diff --git a/assets/about.txt b/assets/about.txt
index 462079a..50c956b 100644
--- a/assets/about.txt
+++ b/assets/about.txt
@@ -1,4 +1,4 @@
-- Konami System 573 tool -
+- 573in1: Konami System 573 maintenance tool -
 
 Version ${PROJECT_VERSION} 
 (C) 2022-2024 spicyjpeg 
@@ -25,6 +25,7 @@ Testing:
 Special thanks: 
     987123879113 
     Gabrimax 
+    Hyphen/4434 
     Martin Korth (nocash) 
     Nicolas Noble 
     Everyone on the Rhythm Game Cabs and PSX.Dev Discord servers 
@@ -182,7 +183,5 @@ Software.
 
 
 
-
-
-Several security cartridges were killed during the development of this tool. May
-they rest in peace.
+A System 573, a flash chip and several security cartridges were killed during
+the development of this tool. May they all rest in peace.
diff --git a/assets/cdreadme.txt b/assets/cdreadme.txt
index 121edbb..b39b289 100644
--- a/assets/cdreadme.txt
+++ b/assets/cdreadme.txt
@@ -1,6 +1,6 @@
 
-Konami System 573 tool
-======================
+573in1: Konami System 573 maintenance tool
+==========================================
 
 Version ${PROJECT_VERSION}
 (C) 2022-2024 spicyjpeg
diff --git a/assets/textures/font.png b/assets/textures/font.png
index af24f1d8c576e3795ccb24372d00a7070f6dec52..9379489d53e9c3dc9cc2eaf07f7f059b77e7a3f5 100644
GIT binary patch
delta 2526
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

delta 2716
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
WABdX}g9b$a0000<MNUMnLSTXewoF$5

diff --git a/doc/assets/logo.png b/doc/assets/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d8e397d1e823108db96c0878395bb87fa1ceb59
GIT binary patch
literal 4371
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

literal 0
HcmV?d00001

diff --git a/src/common/defs.hpp b/src/common/defs.hpp
index ee408bc..549357f 100644
--- a/src/common/defs.hpp
+++ b/src/common/defs.hpp
@@ -11,7 +11,7 @@
 #define VERSION_STRING VERSION "-debug"
 #endif
 
-#define EXTERNAL_DATA_DIR "hdd:/cartdata"
+#define EXTERNAL_DATA_DIR "hdd:/573in1"
 
 enum Character : char {
 	CH_UP_ARROW        = '\x80',
diff --git a/src/common/util.hpp b/src/common/util.hpp
index 721fdcb..c577e91 100644
--- a/src/common/util.hpp
+++ b/src/common/util.hpp
@@ -431,56 +431,43 @@ static constexpr inline util::Hash operator""_h(
 
 /* Logging macros */
 
-#ifdef ENABLE_APP_LOGGING
-#define LOG_APP(fmt, ...) \
+#define LOG(type, fmt, ...) \
 	util::logger.log( \
-		"app,%s(%d): " fmt, __func__, __LINE__ __VA_OPT__(,) __VA_ARGS__ \
+		type ",%s(%d): " fmt, __func__, __LINE__ __VA_OPT__(,) __VA_ARGS__ \
 	)
+
+#ifdef ENABLE_APP_LOGGING
+#define LOG_APP(fmt, ...) LOG("app", fmt __VA_OPT__(,) __VA_ARGS__)
 #else
 #define LOG_APP(fmt, ...)
 #endif
 
 #ifdef ENABLE_CART_IO_LOGGING
-#define LOG_CART_IO(fmt, ...) \
-	util::logger.log( \
-		"cart,%s(%d): " fmt, __func__, __LINE__ __VA_OPT__(,) __VA_ARGS__ \
-	)
+#define LOG_CART_IO(fmt, ...) LOG("cart", fmt __VA_OPT__(,) __VA_ARGS__)
 #else
 #define LOG_CART_IO(fmt, ...)
 #endif
 
 #ifdef ENABLE_CART_DATA_LOGGING
-#define LOG_CART_DATA(fmt, ...) \
-	util::logger.log( \
-		"data,%s(%d): " fmt, __func__, __LINE__ __VA_OPT__(,) __VA_ARGS__ \
-	)
+#define LOG_CART_DATA(fmt, ...) LOG("data", fmt __VA_OPT__(,) __VA_ARGS__)
 #else
 #define LOG_CART_DATA(fmt, ...)
 #endif
 
 #ifdef ENABLE_ROM_LOGGING
-#define LOG_ROM(fmt, ...) \
-	util::logger.log( \
-		"rom,%s(%d): " fmt, __func__, __LINE__ __VA_OPT__(,) __VA_ARGS__ \
-	)
+#define LOG_ROM(fmt, ...) LOG("rom", fmt __VA_OPT__(,) __VA_ARGS__)
 #else
 #define LOG_ROM(fmt, ...)
 #endif
 
 #ifdef ENABLE_IDE_LOGGING
-#define LOG_IDE(fmt, ...) \
-	util::logger.log( \
-		"ide,%s(%d): " fmt, __func__, __LINE__ __VA_OPT__(,) __VA_ARGS__ \
-	)
+#define LOG_IDE(fmt, ...) LOG("ide", fmt __VA_OPT__(,) __VA_ARGS__)
 #else
 #define LOG_IDE(fmt, ...)
 #endif
 
 #ifdef ENABLE_FS_LOGGING
-#define LOG_FS(fmt, ...) \
-	util::logger.log( \
-		"fs,%s(%d): " fmt, __func__, __LINE__ __VA_OPT__(,) __VA_ARGS__ \
-	)
+#define LOG_FS(fmt, ...) LOG("fs", fmt __VA_OPT__(,) __VA_ARGS__)
 #else
 #define LOG_FS(fmt, ...)
 #endif