mirror of
https://github.com/Abdess/retroarch_system.git
synced 2026-11-21 17:17:51 -06:00
fix: place Xbox files where RetroBat reads them
Each Cxbx build reads its data from the folder its settings.ini sits in, which RetroBat writes beside the binary: the three profiles name Settings::GetDataLocation, so keys.bin, EmuDisk and EmuMediaBoard go to emulators/<folder> on RetroBat instead of the BIOS root. RetroBat writes cxbx-reloaded's EEPROM.bin and xemu's eeprom.bin and xbox_hdd.qcow2 itself (installed_on), and mounts an .iso with its own tool, so Cxbx's dokan2.dll is never loaded there (unread_on).
This commit is contained in:
1 parent
7f38954041
commit
ffb3cbfed3
5 files changed
+42
-2
No files matched your search
@@ -17,6 +17,8 @@ systems:
|
|||||||
- sega-chihiro
|
- sega-chihiro
|
||||||
- microsoft-xbox
|
- microsoft-xbox
|
||||||
mode: standalone
|
mode: standalone
|
||||||
|
standalone_directories:
|
||||||
|
- "Settings::GetDataLocation"
|
||||||
|
|
||||||
notes: |
|
notes: |
|
||||||
Cxbx-Reloaded derivative built for the Chihiro light gun games, used by
|
Cxbx-Reloaded derivative built for the Chihiro light gun games, used by
|
||||||
|
|||||||
@@ -16,6 +16,8 @@ systems:
|
|||||||
- sega-chihiro
|
- sega-chihiro
|
||||||
- microsoft-xbox
|
- microsoft-xbox
|
||||||
mode: standalone
|
mode: standalone
|
||||||
|
standalone_directories:
|
||||||
|
- "Settings::GetDataLocation"
|
||||||
|
|
||||||
notes: |
|
notes: |
|
||||||
The Cxbx-Reloaded build RetroBat installs as its "chihiro" emulator
|
The Cxbx-Reloaded build RetroBat installs as its "chihiro" emulator
|
||||||
|
|||||||
@@ -18,6 +18,8 @@ systems:
|
|||||||
- microsoft-xbox
|
- microsoft-xbox
|
||||||
- sega-chihiro
|
- sega-chihiro
|
||||||
mode: standalone
|
mode: standalone
|
||||||
|
standalone_directories:
|
||||||
|
- "Settings::GetDataLocation"
|
||||||
|
|
||||||
data_root:
|
data_root:
|
||||||
windows:
|
windows:
|
||||||
@@ -193,6 +195,7 @@ files:
|
|||||||
path: "EEPROM.bin"
|
path: "EEPROM.bin"
|
||||||
system: microsoft-xbox
|
system: microsoft-xbox
|
||||||
required: false
|
required: false
|
||||||
|
installed_on: [retrobat]
|
||||||
has_builtin: true
|
has_builtin: true
|
||||||
size: 256
|
size: 256
|
||||||
validation: [size]
|
validation: [size]
|
||||||
@@ -337,6 +340,7 @@ files:
|
|||||||
|
|
||||||
- name: dokan2.dll
|
- name: dokan2.dll
|
||||||
required: false
|
required: false
|
||||||
|
unread_on: [retrobat]
|
||||||
description: "Dokany user mode library"
|
description: "Dokany user mode library"
|
||||||
note: >-
|
note: >-
|
||||||
Loaded by name with every entry point resolved individually, and the
|
Loaded by name with every entry point resolved individually, and the
|
||||||
|
|||||||
+4
-2
@@ -166,6 +166,7 @@ files:
|
|||||||
standalone_path: eeprom.bin
|
standalone_path: eeprom.bin
|
||||||
aliases: [eeprom.bin]
|
aliases: [eeprom.bin]
|
||||||
required: false
|
required: false
|
||||||
|
installed_on: [retrobat]
|
||||||
has_builtin: true
|
has_builtin: true
|
||||||
size: 256
|
size: 256
|
||||||
validation: [size]
|
validation: [size]
|
||||||
@@ -188,7 +189,7 @@ files:
|
|||||||
- name: xbox_hdd.qcow2
|
- name: xbox_hdd.qcow2
|
||||||
mode: standalone
|
mode: standalone
|
||||||
required: false
|
required: false
|
||||||
installed_on: [batocera, emudeck, recalbox, retrodeck, rocknix]
|
installed_on: [batocera, emudeck, recalbox, retrobat, retrodeck, rocknix]
|
||||||
config_key: sys.files.hdd_path
|
config_key: sys.files.hdd_path
|
||||||
found_by: content
|
found_by: content
|
||||||
description: "Xbox hard disk image, 8 GB with the retail partition layout"
|
description: "Xbox hard disk image, 8 GB with the retail partition layout"
|
||||||
@@ -201,7 +202,8 @@ files:
|
|||||||
(xemu-hdd-image 1.0, xbox_hdd.qcow2.zip), which carries its own
|
(xemu-hdd-image 1.0, xbox_hdd.qcow2.zip), which carries its own
|
||||||
unsigned dashboard and empty TDATA and UDATA folders. Batocera,
|
unsigned dashboard and empty TDATA and UDATA folders. Batocera,
|
||||||
Recalbox, RetroDECK, EmuDeck and ROCKNIX install that image themselves
|
Recalbox, RetroDECK, EmuDeck and ROCKNIX install that image themselves
|
||||||
and point hdd_path at it.
|
and point hdd_path at it. RetroBat's launcher writes the image it
|
||||||
|
carries when the save folder holds none.
|
||||||
source_ref: "system/vl.c:3060-3074, ui/xemu-snapshots.c:156, config_spec.yml:362-366"
|
source_ref: "system/vl.c:3060-3074, ui/xemu-snapshots.c:156, config_spec.yml:362-366"
|
||||||
|
|
||||||
- name: xbox_hdd.qcow2
|
- name: xbox_hdd.qcow2
|
||||||
|
|||||||
@@ -262,6 +262,36 @@ class FsUaeOnRetroPie(unittest.TestCase):
|
|||||||
self.assertEqual(held, [("kick13.rom", ["fs-uae"])])
|
self.assertEqual(held, [("kick13.rom", ["fs-uae"])])
|
||||||
|
|
||||||
|
|
||||||
|
class XboxOnRetroBat(unittest.TestCase):
|
||||||
|
"""RetroBat's launcher writes xemu's eeprom.bin and disk image into
|
||||||
|
saves/<system> and cxbx-reloaded's EEPROM.bin into its emulator folder,
|
||||||
|
and each Cxbx build reads its data from the folder it runs from
|
||||||
|
(Xemu.Generator.cs:82-113, Cxbx.Generator.cs:99-115, 158, 216-223)."""
|
||||||
|
|
||||||
|
def test_nothing_lands_at_the_bios_root(self) -> None:
|
||||||
|
import json
|
||||||
|
|
||||||
|
db_path = REPO_ROOT / "database.json"
|
||||||
|
if not db_path.exists():
|
||||||
|
self.skipTest("database.json is not built")
|
||||||
|
db = json.loads(db_path.read_text(encoding="utf-8"))
|
||||||
|
with redirect_stdout(io.StringIO()):
|
||||||
|
manifest = generate_manifest(
|
||||||
|
"retrobat", str(REPO_ROOT / "platforms"), db, str(REPO_ROOT / "bios"),
|
||||||
|
str(REPO_ROOT / "platforms" / "_registry.yml"),
|
||||||
|
emulators_dir=str(REPO_ROOT / "emulators"), offline=True,
|
||||||
|
)
|
||||||
|
at_root = {f["dest"].lower() for f in manifest["files"] if not f.get("root")}
|
||||||
|
# The launcher writes the two EEPROMs and the disk image, mounts an
|
||||||
|
# .iso with its own tool, and each Cxbx build reads keys.bin from
|
||||||
|
# its own folder.
|
||||||
|
self.assertFalse(at_root & {"eeprom.bin", "xbox_hdd.qcow2", "dokan2.dll", "keys.bin"})
|
||||||
|
placed = {(f.get("root"), f["dest"]) for f in manifest["files"]}
|
||||||
|
self.assertIn(("emulators", "cxbx-reloaded/keys.bin"), placed)
|
||||||
|
self.assertIn(("emulators", "chihiro/EEPROM.bin"), placed)
|
||||||
|
self.assertNotIn(("emulators", "cxbx-reloaded/EEPROM.bin"), placed)
|
||||||
|
|
||||||
|
|
||||||
PROGRAM = b"PROGRAM BINARY"
|
PROGRAM = b"PROGRAM BINARY"
|
||||||
PROGRAM_DATA = b"PROGRAM DATA"
|
PROGRAM_DATA = b"PROGRAM DATA"
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user