mirror of
https://github.com/Abdess/retroarch_system.git
synced 2026-11-06 01:53:56 -06:00
fix: dev9 files load from the working directory
DEV9 opens eeprom.dat and flash.dat by bare name (pcsx2/DEV9/DEV9.cpp:144 at f0523f8a, AetherSX2 DEV9/flash.cpp:89, PCSX2 1.6 dev9ghzdrk/flash.cpp:73), so the process working directory answers, never the BIOS folder. Only yaps2 said so: the other PCSX2 profiles had the file packed into the BIOS folder and the RetroDECK export add it there.
This commit is contained in:
1 parent
f0e488c558
commit
2009f38256
11 files changed
+38
No files matched your search
@@ -149,6 +149,7 @@ files:
|
||||
source_ref: "source aethersx2/pcsx2/CDVD/CDVD.cpp:120-144, aethersx2 v1.5-3606 usr/share/aethersx2 0x95e7fc"
|
||||
|
||||
- name: eeprom.dat
|
||||
load_from: working_directory
|
||||
required: false
|
||||
hle_fallback: true
|
||||
size: 64
|
||||
@@ -157,6 +158,7 @@ files:
|
||||
source_ref: "source aethersx2/pcsx2/DEV9/DEV9.cpp:146-161, aethersx2 v1.5-3606 usr/share/aethersx2 0x97ac90"
|
||||
|
||||
- name: flash.dat
|
||||
load_from: working_directory
|
||||
required: false
|
||||
hle_fallback: true
|
||||
max_size: 8650752
|
||||
|
||||
@@ -287,6 +287,7 @@ files:
|
||||
source_ref: "source pcsx2/CDVD/CDVD.cpp:63-64, source pcsx2/CDVD/CDVD.cpp:207-220"
|
||||
|
||||
- name: eeprom.dat
|
||||
load_from: working_directory
|
||||
required: false
|
||||
hle_fallback: true
|
||||
size: 64
|
||||
@@ -298,6 +299,7 @@ files:
|
||||
source_ref: "source pcsx2/DEV9/DEV9.cpp:78, source pcsx2/DEV9/DEV9.cpp:225-276"
|
||||
|
||||
- name: flash.dat
|
||||
load_from: working_directory
|
||||
required: false
|
||||
hle_fallback: true
|
||||
max_size: 8650752
|
||||
|
||||
@@ -257,6 +257,7 @@ files:
|
||||
source_ref: "source app/src/main/cpp/pcsx2/pcsx2/CDVD/CDVD.cpp:50-51, source app/src/main/cpp/pcsx2/pcsx2/CDVD/CDVD.cpp:195-208"
|
||||
|
||||
- name: eeprom.dat
|
||||
load_from: working_directory
|
||||
system: sony-playstation-2
|
||||
required: false
|
||||
hle_fallback: true
|
||||
@@ -269,6 +270,7 @@ files:
|
||||
source_ref: "source app/src/main/cpp/pcsx2/pcsx2/DEV9/DEV9.cpp:104-167"
|
||||
|
||||
- name: flash.dat
|
||||
load_from: working_directory
|
||||
system: sony-playstation-2
|
||||
required: false
|
||||
hle_fallback: true
|
||||
|
||||
@@ -231,6 +231,7 @@ files:
|
||||
source_ref: "upstream aethersx2/pcsx2/CDVD/CDVD.cpp:120-144, nethersx2-turnip-classic v0.7 libemucore.so 0x791700-0x7918f4"
|
||||
|
||||
- name: eeprom.dat
|
||||
load_from: working_directory
|
||||
required: false
|
||||
hle_fallback: true
|
||||
size: 64
|
||||
@@ -242,6 +243,7 @@ files:
|
||||
source_ref: "upstream aethersx2/pcsx2/DEV9/DEV9.cpp:73, upstream aethersx2/pcsx2/DEV9/DEV9.cpp:145-160, nethersx2-turnip-classic v0.7 libemucore.so 0x7bb620-0x7bb680"
|
||||
|
||||
- name: flash.dat
|
||||
load_from: working_directory
|
||||
required: false
|
||||
hle_fallback: true
|
||||
max_size: 8650752
|
||||
|
||||
@@ -212,6 +212,7 @@ files:
|
||||
source_ref: "upstream aethersx2/pcsx2/CDVD/CDVD.cpp:120-144, nethersx2-turnip v0.7 libemucore.so 0x79cbd0-0x79cc20"
|
||||
|
||||
- name: eeprom.dat
|
||||
load_from: working_directory
|
||||
required: false
|
||||
hle_fallback: true
|
||||
size: 64
|
||||
@@ -223,6 +224,7 @@ files:
|
||||
source_ref: "upstream aethersx2/pcsx2/DEV9/DEV9.cpp:146-161, nethersx2-turnip v0.7 libemucore.so 0x7c5c44"
|
||||
|
||||
- name: flash.dat
|
||||
load_from: working_directory
|
||||
required: false
|
||||
hle_fallback: true
|
||||
max_size: 8650752
|
||||
|
||||
@@ -195,6 +195,7 @@ files:
|
||||
source_ref: "upstream aethersx2/pcsx2/CDVD/CDVD.cpp:120-144, nethersx2 v2.2n-4248 libemucore.so 0x79cbc0-0x79cdc4"
|
||||
|
||||
- name: eeprom.dat
|
||||
load_from: working_directory
|
||||
required: false
|
||||
hle_fallback: true
|
||||
size: 64
|
||||
@@ -206,6 +207,7 @@ files:
|
||||
source_ref: "upstream aethersx2/pcsx2/DEV9/DEV9.cpp:146-161, nethersx2 v2.2n-4248 libemucore.so 0x7c5c40-0x7c5ca0"
|
||||
|
||||
- name: flash.dat
|
||||
load_from: working_directory
|
||||
required: false
|
||||
hle_fallback: true
|
||||
max_size: 8650752
|
||||
|
||||
@@ -160,6 +160,7 @@ files:
|
||||
failure to open is reported once on screen.
|
||||
|
||||
- name: "eeprom.dat"
|
||||
load_from: working_directory
|
||||
description: "DEV9 network adapter EEPROM"
|
||||
size: 64
|
||||
required: false
|
||||
|
||||
@@ -127,6 +127,7 @@ files:
|
||||
source_ref: "pcsx2/CDVD/CDVD.cpp:93-122"
|
||||
|
||||
- name: eeprom.dat
|
||||
load_from: working_directory
|
||||
system: sony-playstation-2
|
||||
required: false
|
||||
hle_fallback: true
|
||||
@@ -136,6 +137,7 @@ files:
|
||||
source_ref: "plugins/dev9ghzdrk/DEV9.cpp:176-227, plugins/dev9ghzdrk/DEV9.cpp:71-81"
|
||||
|
||||
- name: flash.dat
|
||||
load_from: working_directory
|
||||
system: sony-playstation-2
|
||||
required: false
|
||||
hle_fallback: true
|
||||
|
||||
@@ -67,6 +67,7 @@ files:
|
||||
source_ref: "pcsx2/CDVD/CDVD.cpp:190-204"
|
||||
|
||||
- name: eeprom.dat
|
||||
load_from: working_directory
|
||||
required: false
|
||||
hle_fallback: true
|
||||
size: 64
|
||||
|
||||
@@ -142,6 +142,7 @@ files:
|
||||
source_ref: "source pcsx2/CDVD/CDVD.cpp:51-52, source pcsx2/CDVD/CDVD.cpp:196-209"
|
||||
|
||||
- name: eeprom.dat
|
||||
load_from: working_directory
|
||||
system: namco-system246
|
||||
required: false
|
||||
hle_fallback: true
|
||||
@@ -151,6 +152,7 @@ files:
|
||||
source_ref: "source pcsx2/DEV9/DEV9.cpp:67-77, source pcsx2/DEV9/DEV9.cpp:116-167"
|
||||
|
||||
- name: flash.dat
|
||||
load_from: working_directory
|
||||
system: namco-system246
|
||||
required: false
|
||||
hle_fallback: true
|
||||
|
||||
@@ -6904,5 +6904,25 @@ class Ps2BiosImagesAreFoundByContent(unittest.TestCase):
|
||||
self.assertEqual(named, [])
|
||||
|
||||
|
||||
class Dev9FilesAreReadFromTheWorkingDirectory(unittest.TestCase):
|
||||
"""DEV9 opens eeprom.dat and flash.dat by bare name (PCSX2
|
||||
pcsx2/DEV9/DEV9.cpp:144, AetherSX2 DEV9/flash.cpp:89): the working
|
||||
directory, never the BIOS folder. Eight profiles left load_from unset,
|
||||
so the file was packed into the BIOS folder, where nothing reads it."""
|
||||
|
||||
def test_every_dev9_file_names_the_working_directory(self):
|
||||
import yaml
|
||||
|
||||
unset = []
|
||||
for path in sorted((ROOT / "emulators").glob("*.yml")):
|
||||
profile = yaml.safe_load(path.read_text(encoding="utf-8")) or {}
|
||||
for entry in profile.get("files") or []:
|
||||
if entry.get("name") in ("eeprom.dat", "flash.dat") and "DEV9" in str(
|
||||
entry.get("source_ref")
|
||||
) and entry.get("load_from") != "working_directory":
|
||||
unset.append(f"{path.stem}: {entry['name']}")
|
||||
self.assertEqual(unset, [])
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
Reference in new issue
Block a user