mirror of
https://github.com/Abdess/retroarch_system.git
synced 2026-11-06 01:53:56 -06:00
fix: drop region tags chosen by machine model
XRoar reads the Dragon 200-E and Alice ROMs for those machine configs (src/xroar.c:437-444, 552-558 at 1.12.1), and VICE the Japanese kernal and chargen for the C64 JAP and VIC-1001 models: a (Japan) file name selects the NTSC model (libretro-core.c:2018-2034). No code branches on a territory for these files, so region: is removed, as profiling.md rules for a model enum.
This commit is contained in:
1 parent
34ef0cda1d
commit
fd93381c3e
5 files changed
+27
-13
No files matched your search
@@ -181,7 +181,6 @@ files:
|
|||||||
size: 8192
|
size: 8192
|
||||||
sha1: "4ff0f11e80f4b57430d8f0c3799ed0f0e0f4565d"
|
sha1: "4ff0f11e80f4b57430d8f0c3799ed0f0e0f4565d"
|
||||||
validation: [size, sha1]
|
validation: [size, sha1]
|
||||||
region: [japan]
|
|
||||||
description: "Japanese C64 kernal"
|
description: "Japanese C64 kernal"
|
||||||
source_ref: "source C64.emu/src/vice/c64/c64rom.h:49, 90, source C64.emu/src/vice/c64/c64model.c:148-151, source C64.emu/src/vice/c64/c64-resources.c:246"
|
source_ref: "source C64.emu/src/vice/c64/c64rom.h:49, 90, source C64.emu/src/vice/c64/c64model.c:148-151, source C64.emu/src/vice/c64/c64-resources.c:246"
|
||||||
|
|
||||||
@@ -230,7 +229,6 @@ files:
|
|||||||
required: false
|
required: false
|
||||||
size: 4096
|
size: 4096
|
||||||
validation: [size]
|
validation: [size]
|
||||||
region: [japan]
|
|
||||||
description: "Japanese C64 character generator"
|
description: "Japanese C64 character generator"
|
||||||
source_ref: "source C64.emu/src/vice/c64/c64rom.h:61, source C64.emu/src/vice/c64/c64model.c:148-151, 323"
|
source_ref: "source C64.emu/src/vice/c64/c64rom.h:61, source C64.emu/src/vice/c64/c64model.c:148-151, 323"
|
||||||
|
|
||||||
@@ -279,7 +277,6 @@ files:
|
|||||||
required: false
|
required: false
|
||||||
size: 4096
|
size: 4096
|
||||||
validation: [size]
|
validation: [size]
|
||||||
region: [japan]
|
|
||||||
description: "Japanese character generator, Japanese SuperCPU model"
|
description: "Japanese character generator, Japanese SuperCPU model"
|
||||||
source_ref: "source C64.emu/src/vice/scpu64/scpu64model.c:303, source C64.emu/src/vice/c64/c64rom.h:61"
|
source_ref: "source C64.emu/src/vice/scpu64/scpu64model.c:303, source C64.emu/src/vice/c64/c64rom.h:61"
|
||||||
|
|
||||||
@@ -580,7 +577,6 @@ files:
|
|||||||
required: false
|
required: false
|
||||||
size: 8192
|
size: 8192
|
||||||
validation: [size]
|
validation: [size]
|
||||||
region: [japan]
|
|
||||||
description: "VIC-1001 kernal"
|
description: "VIC-1001 kernal"
|
||||||
source_ref: "source C64.emu/src/vice/vic20/vic20rom.h:51, source C64.emu/src/vice/vic20/vic20model.c:60, 140"
|
source_ref: "source C64.emu/src/vice/vic20/vic20rom.h:51, source C64.emu/src/vice/vic20/vic20model.c:60, 140"
|
||||||
|
|
||||||
@@ -608,7 +604,6 @@ files:
|
|||||||
required: false
|
required: false
|
||||||
size: 4096
|
size: 4096
|
||||||
validation: [size]
|
validation: [size]
|
||||||
region: [japan]
|
|
||||||
description: "VIC-1001 character generator"
|
description: "VIC-1001 character generator"
|
||||||
source_ref: "source C64.emu/src/vice/vic20/vic20rom.h:57, source C64.emu/src/vice/vic20/vic20model.c:60, 139"
|
source_ref: "source C64.emu/src/vice/vic20/vic20rom.h:57, source C64.emu/src/vice/vic20/vic20model.c:60, 139"
|
||||||
|
|
||||||
|
|||||||
@@ -26,7 +26,6 @@ notes: >
|
|||||||
files:
|
files:
|
||||||
- name: "kernal.901486-02.bin"
|
- name: "kernal.901486-02.bin"
|
||||||
description: "VIC-1001 Kernal Rev 2 (Japanese NTSC)"
|
description: "VIC-1001 Kernal Rev 2 (Japanese NTSC)"
|
||||||
region: [japan]
|
|
||||||
required: false
|
required: false
|
||||||
size: 8192
|
size: 8192
|
||||||
validation: [size]
|
validation: [size]
|
||||||
@@ -35,7 +34,6 @@ files:
|
|||||||
|
|
||||||
- name: "chargen-901460-02.bin"
|
- name: "chargen-901460-02.bin"
|
||||||
description: "VIC-1001 Character ROM (Japanese)"
|
description: "VIC-1001 Character ROM (Japanese)"
|
||||||
region: [japan]
|
|
||||||
required: false
|
required: false
|
||||||
size: 4096
|
size: 4096
|
||||||
validation: [size]
|
validation: [size]
|
||||||
|
|||||||
@@ -55,7 +55,6 @@ files:
|
|||||||
|
|
||||||
- name: "jpkernal"
|
- name: "jpkernal"
|
||||||
description: "Japanese C64 Kernal ROM"
|
description: "Japanese C64 Kernal ROM"
|
||||||
region: [japan]
|
|
||||||
required: false
|
required: false
|
||||||
size: 8192
|
size: 8192
|
||||||
path: "data/C64/jpkernal"
|
path: "data/C64/jpkernal"
|
||||||
@@ -64,7 +63,6 @@ files:
|
|||||||
|
|
||||||
- name: "jpchrgen"
|
- name: "jpchrgen"
|
||||||
description: "Japanese C64 character generator ROM"
|
description: "Japanese C64 character generator ROM"
|
||||||
region: [japan]
|
|
||||||
required: false
|
required: false
|
||||||
size: 4096
|
size: 4096
|
||||||
path: "data/C64/jpchrgen"
|
path: "data/C64/jpchrgen"
|
||||||
|
|||||||
@@ -81,7 +81,6 @@ files:
|
|||||||
- name: "d200e_1.rom"
|
- name: "d200e_1.rom"
|
||||||
system: dragon64
|
system: dragon64
|
||||||
description: "Dragon 200-E BASIC IC18 (Spanish)"
|
description: "Dragon 200-E BASIC IC18 (Spanish)"
|
||||||
region: [spain]
|
|
||||||
required: true
|
required: true
|
||||||
size: 16384
|
size: 16384
|
||||||
crc32: "95af0a0a"
|
crc32: "95af0a0a"
|
||||||
@@ -93,7 +92,6 @@ files:
|
|||||||
- name: "d200e_2.rom"
|
- name: "d200e_2.rom"
|
||||||
system: dragon64
|
system: dragon64
|
||||||
description: "Dragon 200-E BASIC IC17 (Spanish)"
|
description: "Dragon 200-E BASIC IC17 (Spanish)"
|
||||||
region: [spain]
|
|
||||||
required: false
|
required: false
|
||||||
size: 16384
|
size: 16384
|
||||||
crc32: "48b985df"
|
crc32: "48b985df"
|
||||||
@@ -104,7 +102,6 @@ files:
|
|||||||
- name: "d200e_26.rom"
|
- name: "d200e_26.rom"
|
||||||
system: dragon64
|
system: dragon64
|
||||||
description: "Dragon 200-E external character generator ROM"
|
description: "Dragon 200-E external character generator ROM"
|
||||||
region: [spain]
|
|
||||||
required: false
|
required: false
|
||||||
size: 4096
|
size: 4096
|
||||||
crc32: "565724bc"
|
crc32: "565724bc"
|
||||||
@@ -258,7 +255,6 @@ files:
|
|||||||
- name: "alice.rom"
|
- name: "alice.rom"
|
||||||
system: mc10
|
system: mc10
|
||||||
description: "Matra & Hachette Alice Microcolour BASIC"
|
description: "Matra & Hachette Alice Microcolour BASIC"
|
||||||
region: [france]
|
|
||||||
required: true
|
required: true
|
||||||
size: 8192
|
size: 8192
|
||||||
crc32: "f876abe9"
|
crc32: "f876abe9"
|
||||||
|
|||||||
@@ -1384,5 +1384,32 @@ class YmirLibretroRegions(unittest.TestCase):
|
|||||||
if e["name"] == "sega_101.bin"))
|
if e["name"] == "sega_101.bin"))
|
||||||
|
|
||||||
|
|
||||||
|
class MachineModelRomsCarryNoTerritory(unittest.TestCase):
|
||||||
|
"""XRoar reads d200e_1.rom for the dragon200e machine and alice.rom for
|
||||||
|
the alice machine (src/xroar.c:437-444, 552-558), and VICE the Japanese
|
||||||
|
kernal and chargen for the C64 JAP and VIC-1001 models, which a file name
|
||||||
|
tagged (Japan) never selects (libretro-core.c:2018-2034 sets NTSC). The
|
||||||
|
site told a Spanish Dragon 64 owner to start with d200e_1.rom."""
|
||||||
|
|
||||||
|
CASES = {
|
||||||
|
"xroar": ("d200e_1.rom", "d200e_2.rom", "d200e_26.rom", "alice.rom"),
|
||||||
|
"x64sdl": ("jpkernal", "jpchrgen"),
|
||||||
|
"vice_xvic": ("kernal.901486-02.bin", "chargen-901460-02.bin"),
|
||||||
|
}
|
||||||
|
|
||||||
|
def test_model_roms_are_unregioned(self):
|
||||||
|
profiles = common.load_emulator_profiles(
|
||||||
|
os.path.join(os.path.dirname(__file__), "..", "emulators")
|
||||||
|
)
|
||||||
|
for profile, names in self.CASES.items():
|
||||||
|
for entry in profiles[profile]["files"]:
|
||||||
|
if entry["name"] in names:
|
||||||
|
with self.subTest(profile=profile, name=entry["name"]):
|
||||||
|
self.assertNotIn("region", entry)
|
||||||
|
self.assertFalse(
|
||||||
|
[e["name"] for e in profiles["c64-emu"]["files"] if e.get("region")]
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
unittest.main()
|
unittest.main()
|
||||||
Reference in new issue
Block a user