Fix ROM Size check logic, wrong variable names in battery-backed ram mappers.

This commit is contained in:
beyondcoast 2018-12-02 13:23:57 -06:00
parent 26f403d9f6
commit e3a09931b7
5 changed files with 11 additions and 11 deletions

View File

@ -531,9 +531,9 @@ local function process(process_opts, console_opts)
local verifyfile = process_opts["verify_filename"]
-- FME7 has RAM capability present in some carts.
local dumpram = process_opts["dumpram"]
local ramdump_filename = process_opts["dumpram_filename"]
local ramdumpfile = process_opts["dumpram_filename"]
local writeram = process_opts["writeram"]
local ramwrite_filename = process_opts["writeram_filename"]
local ramwritefile = process_opts["writeram_filename"]
local rv = nil
local file

View File

@ -501,9 +501,9 @@ local function process(process_opts, console_opts)
local verifyfile = process_opts["verify_filename"]
-- MMC1 has RAM capability present in some carts.
local dumpram = process_opts["dumpram"]
local ramdump_filename = process_opts["dumpram_filename"]
local ramdumpfile = process_opts["dumpram_filename"]
local writeram = process_opts["writeram"]
local ramwrite_filename = process_opts["writeram_filename"]
local ramwritefile = process_opts["writeram_filename"]
local rv = nil
local file

View File

@ -515,9 +515,9 @@ local function process(process_opts, console_opts)
local verifyfile = process_opts["verify_filename"]
-- MMC3 has RAM capability present in some carts.
local dumpram = process_opts["dumpram"]
local ramdump_filename = process_opts["dumpram_filename"]
local ramdumpfile = process_opts["dumpram_filename"]
local writeram = process_opts["writeram"]
local ramwrite_filename = process_opts["writeram_filename"]
local ramwritefile = process_opts["writeram_filename"]
local rv = nil
local file

View File

@ -457,9 +457,9 @@ local function process(process_opts, console_opts)
local verifyfile = process_opts["verify_filename"]
-- MMC4 has RAM capability present in some carts.
local dumpram = process_opts["dumpram"]
local ramdump_filename = process_opts["dumpram_filename"]
local ramdumpfile = process_opts["dumpram_filename"]
local writeram = process_opts["writeram"]
local ramwrite_filename = process_opts["writeram_filename"]
local ramwritefile = process_opts["writeram_filename"]
local rv = nil
local file

View File

@ -307,19 +307,19 @@ int main(int argc, char *argv[])
// Check for sane user input.
if (strcmp("NES", opts->console_name) == 0) {
// ROM sizes must be non-zero, power of 2, and greater than 16.
if (isValidROMSize(opts->prg_rom_size_kb, 16)) {
if (!isValidROMSize(opts->prg_rom_size_kb, 16)) {
printf("PRG-ROM must be non-zero power of 2, 16kb or greater.\n");
return 1;
}
// Not having CHR-ROM is normal for certain types of carts.
// TODO: Update these checks with known info about mappers/carts.
if (isValidROMSize(opts->chr_rom_size_kb, 8) || opts->chr_rom_size_kb == 0) {
if (!isValidROMSize(opts->chr_rom_size_kb, 8) && opts->chr_rom_size_kb != 0) {
printf("CHR-ROM must be zero or power of 2, 8kb or greater.\n");
return 1;
}
// Not having WRAM is very normal.
if (isValidROMSize(opts->wram_size_kb, 8) || opts->wram_size_kb == 0) {
if (!isValidROMSize(opts->wram_size_kb, 8) && opts->wram_size_kb != 0) {
printf("WRAM must be zero or power of 2, 8kb or greater.\n");
return 1;
}