Merge branch 'master' into 'master'

Flag support cleanup

See merge request InfiniteNesLives/INL-retro-progdump!15

host/scripts/inlretro2.lua

@@ -7,40 +7,14 @@ local function isempty(s)
     return s == nil or s == ''
 end
 
--- Wrapper for managing GBA operations.
+-- Wrapper for managing operations for most consoles.
-function gba_exec(process_opts, console_opts)
+function default_exec(process_opts, console_opts)
-    local gba = require "scripts.gba.basic"
+    -- Defensively filter out any console options that aren't standard.
-
+    local default_opts = {
-    -- Defensively filter out any console options that are irrelevant to GBA support.
-    local gba_opts = {
         rom_size_mbit = console_opts["rom_size_mbit"],
         wram_size_kb = console_opts["wram_size_kb"],
     }
-    gba.process(process_opts, gba_opts)
+    console_opts["console_process_script"].process(process_opts, default_opts)
-end
-
--- Wrapper for managing Sega Genesis operations.
-function genesis_exec(process_opts, console_opts)
-    local genesis = require "scripts.sega.genesis_v1"
-
-    -- Defensively filter out any console options that are irrelevant to Genesis support.
-    local genesis_opts = {
-        rom_size_mbit = console_opts["rom_size_mbit"],
-        wram_size_kb = console_opts["wram_size_kb"],
-    }
-    genesis.process(process_opts, genesis_opts)
-end
-
--- Wrapper for managing N64 operations.
-function n64_exec(process_opts, console_opts)
-    local n64 = require "scripts.n64.basic"
-
-    -- Defensively filter out any console options that are irrelevant to N64 support.
-    local n64_opts = {
-        rom_size_mbit = console_opts["rom_size_mbit"],
-        wram_size_kb = console_opts["wram_size_kb"],
-    }
-    n64.process(process_opts, n64_opts)
 end
 
 -- Wrapper for managing NES/Famicom operations.
@@ -71,6 +45,7 @@ function nes_exec(process_opts, console_opts)
         mmc1 = require "scripts.nes.mmc1",
         mmc3 = require "scripts.nes.mmc3",
         mmc4 = require "scripts.nes.mmc4",
+        mmc5 = require "scripts.nes.mmc5",
         nrom = require "scripts.nes.nrom",
         unrom = require "scripts.nes.unrom"
     }
@@ -79,9 +54,9 @@ function nes_exec(process_opts, console_opts)
 	dict.io("NES_INIT")	
     nes.detect_mapper_mirroring(true)
     
-    m = mappers[console_opts[mapper]]
+    m = mappers[console_opts["mapper"]]
     if m == nil then
-        print("UNSUPPORTED MAPPER")
+        print("UNSUPPORTED MAPPER: ", console_opts["mapper"])
     else
         -- Attempt requested operations with hardware!
 
@@ -99,9 +74,10 @@ function main()
     --  dump_filename:   string, filename used for writing dumped data.
     --  flash_filename:  string, filename containing data to write cartridge.
     --  verify_filename: string, filename used for writing back data written to cartridge for verification.
-    --  nes_prg_rom_size_kb:    int, size of cartridge PRG-ROM in kb.
+    --  nes_prg_rom_size_kb:    int, size of cartridge PRG-ROM in kilobytes.
-    --  nes_chr_rom_size_kb:    int, size of cartridge CHR-ROM in kb.
+    --  nes_chr_rom_size_kb:    int, size of cartridge CHR-ROM in kilobytes.
-    --  nes_wram_size_kb:       int, size of cartridge WRAM in kb.
+    --  nes_wram_size_kb:       int, size of cartridge WRAM in kilobytes.
+    --  rom_size_mbit:          int, size of cartridge ROM in megabits.
 
     -- TODO: This should probably be one level up.
     -- TODO: Ram probably needs a verify file as well?
@@ -143,25 +119,31 @@ function main()
 
     -- TODO: Add SNES support, as it appears to be currently usable?
     local consoles = {
-        GBA = gba_exec,
+        gba = default_exec,
-        GENESIS = genesis_exec,
+        genesis = default_exec,
-        NES = nes_exec,
+        n64 = default_exec,
-        N64 = n64_exec,
+        nes = nes_exec,
     }
-    f = consoles[console_name]
+    local console_scripts = {
-    if f == nil then 
+        n64 = require "scripts.n64.basic",
-        print("UNSUPPORTED CONSOLE")
+        nes = require "scripts.app.nes",
+        gba = require "scripts.gba.basic",
+        genesis = require "scripts.sega.genesis_v1"
+    }
+    local console_exec = consoles[console_name]
+    local console_process_script = console_scripts[console_name]
+    if console_exec == nil then 
+        print("UNSUPPORTED CONSOLE: ", console_name)
     else
-        -- TODO: Make anything console specific a dict to make function signatures less terrible.
         local console_opts = {
             wram_size_kb = nes_wram_size_kb,
             prg_rom_size_kb = nes_prg_rom_size_kb,
             chr_rom_size_kb = nes_chr_rom_size_kb,
             rom_size_mbit = rom_size_mbit,
-            mapper = mapper,
+            console_process_script = console_process_script,
+            mapper = mapper_name,
         }
-
+        console_exec(process_opts, console_opts)
-        f(process_opts, console_opts)
     end
 end
 

host/source/inlprog.c

@@ -22,13 +22,14 @@
 
 const char *HELP =  "Usage: inlretro [options]\n\n"\
 					"Options/Flags:\n"\
-					"  --console=console, -c console\t\t\tConsole port, {NES}\n"\
+					"  --console=console, -c console\t\t\tConsole port, {GBA,GENESIS,N64,NES}\n"\
 					"  --dump_filename=filename, -d filename\t\tIf provided, dump cartridge ROMs to this filename\n"\
 					"  --dump_ram_filename=filename, -a filename\tIf provided write ram to this filename\n"\
 					"  --help, -h\t\t\t\t\tDisplays this message.\n"\
 					"  --lua_filename=filename, -s filename\t\tIf provided, use this script for main application logic\n"\
 					"  --mapper=mapper, -m mapper\t\t\tNES console only, mapper ASIC on cartridge\n"\
-					"  \t\t\t\t\t\t{mmc1,mmc3,nrom}\n"\
+					"  \t\t\t\t\t\t{action53,bnrom,cdream,cninja,cnrom,dualport,easynsf,fme7,\n"\
+					"  \t\t\t\t\t\t mapper30,mmc1,mmc3,mmc4,mmc5,nrom,unrom}\n"\
 					"  --nes_prg_rom_size_kbyte=size, -x size_kbytes\tNES-only, size of PRG-ROM in kilobytes\n"\
 					"  --nes_chr_rom_size_kbyte=size, -y size_kbytes\tNES-only, size of CHR-ROM in kilobytes\n"\
 					"  --rom_size_mbit=size, -z size_mbits\t\tSize of ROM in megabits, non-NES systems.\n"\
@@ -64,6 +65,13 @@ int isValidROMSize(int x, int min) {
 	return ((x & (x - 1)) == 0) && x >= min;
 }
 
+// Take a mixed-case string and convert to only lowercase.
+void strToLower(char *str) {
+	while(*str) {
+		*str = tolower(*str);
+		str++;
+	}
+}
 
 // Parse options and flags, create struct to drive program.
 INLOptions* parseOptions(int argc, char *argv[]) {
@@ -159,6 +167,10 @@ INLOptions* parseOptions(int argc, char *argv[]) {
 		printf("%s", HELP);
 		return NULL;
 	}
+
+	// Handle console, mapper as case-insensitive configuration.
+	strToLower(opts->console_name);
+	strToLower(opts->mapper_name);
 	return opts;
 }