shouse: default EEPROM values for horizontal games that will flip the…

… image. Fixes #767
jotego · Sep 20, 2024 · dc4548b · dc4548b
1 parent ae189d4
commit dc4548b
Show file tree

Hide file tree

Showing 15 changed files with 32 additions and 6 deletions.
diff --git a/cores/shouse/cfg/bakutotu.nvm b/cores/shouse/cfg/bakutotu.nvm
diff --git a/cores/shouse/cfg/berabohm.nvm b/cores/shouse/cfg/berabohm.nvm
diff --git a/cores/shouse/cfg/berabohmb.nvm b/cores/shouse/cfg/berabohmb.nvm
diff --git a/cores/shouse/cfg/faceoff.nvm b/cores/shouse/cfg/faceoff.nvm
diff --git a/cores/shouse/cfg/mmaze.nvm b/cores/shouse/cfg/mmaze.nvm
diff --git a/cores/shouse/cfg/mmaze2.nvm b/cores/shouse/cfg/mmaze2.nvm
diff --git a/cores/shouse/cfg/shadowld.nvm b/cores/shouse/cfg/shadowld.nvm
diff --git a/cores/shouse/cfg/splatter.nvm b/cores/shouse/cfg/splatter.nvm
diff --git a/cores/shouse/cfg/splatter2.nvm b/cores/shouse/cfg/splatter2.nvm
diff --git a/cores/shouse/cfg/splatterj.nvm b/cores/shouse/cfg/splatterj.nvm
diff --git a/cores/shouse/cfg/youkaidk1.nvm b/cores/shouse/cfg/youkaidk1.nvm
diff --git a/cores/shouse/cfg/youkaidk2.nvm b/cores/shouse/cfg/youkaidk2.nvm
diff --git a/modules/jtframe/doc/jtframe-mra.md b/modules/jtframe/doc/jtframe-mra.md
@@ -118,7 +118,9 @@ order = [ "maincpu", "soundcpu", "gfx1", "gfx2" ]
 # Default NVRAM contents, usually not needed
 nvram = {
 	machines=[ "supports nvram..." ] # NVRAM on all machines by default
-	data=[
+	# if a file with the machine or setname and .nvm extension exists in the
+	# cfg folder, its data will be set as the default NVRAM content
+	defaults=[
 		{ machine="...", setname="...", data="00 22 33..." },...
 	]
 	# if a ROM region with the name "nvram" exists, and no default data

diff --git a/modules/jtframe/src/jtframe/mra/mame2mra.go b/modules/jtframe/src/jtframe/mra/mame2mra.go
@@ -560,7 +560,7 @@ func make_mra(machine *MachineXML, cfg Mame2MRA, args Args) (*XMLNode, string, i
 			}
 		}
 	}
-	make_nvram(&root,machine,cfg)
+	make_nvram(&root,machine,cfg,args.Def_cfg.Core)
 	// coreMOD
 	coremod := make_coreMOD(&root, machine, cfg, args.macros)
 	// DIP switches

diff --git a/modules/jtframe/src/jtframe/mra/nvram.go b/modules/jtframe/src/jtframe/mra/nvram.go
@@ -2,9 +2,11 @@ package mra
 
 import (
 	"fmt"
+	"path/filepath"
+	"os"
 )
 
-func make_nvram(root *XMLNode, machine *MachineXML, cfg Mame2MRA) {
+func make_nvram(root *XMLNode, machine *MachineXML, cfg Mame2MRA, corename string) {
 	if cfg.ROM.Nvram.length == 0 { return }
 	add_nvram := len(cfg.ROM.Nvram.Machines) == 0
 	if !add_nvram {
@@ -15,15 +17,37 @@ func make_nvram(root *XMLNode, machine *MachineXML, cfg Mame2MRA) {
 			}
 		}
 	}
-	if !nvram_verbatim(root, machine,cfg) {
-		nvram_file(root,machine,cfg)
+	if !nvram_file(root,machine,cfg,corename) { // look in cfg folder for matching file
+		if !nvram_verbatim(root, machine,cfg) { // explicit defaults in the TOML
+			nvram_rom(root,machine,cfg)  // get the defaults from MAME
+		}
 	}
 	if add_nvram {
 		n := root.AddNode("nvram").AddAttr("index", "2")
 		n.AddIntAttr("size", cfg.ROM.Nvram.length)
 	}
 }
 
+func nvram_file(root *XMLNode, machine *MachineXML, cfg Mame2MRA, core string) bool {
+	cfgdir := filepath.Join(os.Getenv("JTROOT"),"cores",core,"cfg")
+	fname := filepath.Join(cfgdir,machine.Name+".nvm")
+	f, e := os.Open(fname)
+	if e!=nil {
+		f.Close()
+		if machine.Cloneof=="" { return false }
+		fname := filepath.Join(cfgdir,machine.Cloneof+".nvm")
+		f, e = os.Open(fname)
+		if e!= nil {
+			f.Close()
+			return false	// not found
+		}
+	}
+	f.Close()
+	rawbytes, e := os.ReadFile(fname)
+	root.AddNode("rom").AddAttr("index", "2").AddNode("part").SetText("\n" + hexdump(rawbytes, 16))
+	return true
+}
+
 func nvram_verbatim(root *XMLNode, machine *MachineXML, cfg Mame2MRA) bool {
 	var raw *RawData
 	for k, each := range cfg.ROM.Nvram.Defaults {
@@ -46,7 +70,7 @@ func nvram_verbatim(root *XMLNode, machine *MachineXML, cfg Mame2MRA) bool {
 	return false
 }
 
-func nvram_file(root *XMLNode, machine *MachineXML, cfg Mame2MRA) {
+func nvram_rom(root *XMLNode, machine *MachineXML, cfg Mame2MRA) {
 	reg := find_region_cfg(machine,"nvram",cfg,false)
 	if reg==nil { return }
 	roms := extract_region(reg, machine.Rom, cfg.ROM.Remove)