From 579652a364f20220d893f20aef0196ca87edba54 Mon Sep 17 00:00:00 2001 From: sorgelig Date: Tue, 23 Jan 2018 05:57:08 +0800 Subject: [PATCH] Look for MiSTer.ini in the root folder first. --- cfg.c | 1 + ini_parser.c | 10 ++++++---- ini_parser.h | 1 + main.c | 4 +++- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/cfg.c b/cfg.c index 409fc62..9ecd48b 100644 --- a/cfg.c +++ b/cfg.c @@ -39,6 +39,7 @@ const ini_var_t ini_vars[] = { // mist ini config const ini_cfg_t ini_cfg = { + "MiSTer.ini", CONFIG_DIR"/MiSTer.ini", ini_sections, ini_vars, diff --git a/ini_parser.c b/ini_parser.c index f9cb73d..3e53adb 100644 --- a/ini_parser.c +++ b/ini_parser.c @@ -196,11 +196,13 @@ void ini_parse(const ini_cfg_t* cfg) memset(&ini_file, 0, sizeof(ini_file)); if (!FileOpen(&ini_file, cfg->filename)) { - ini_parser_debugf("Can't open file %s !", cfg->filename); - return; + if (!FileOpen(&ini_file, cfg->filename_alt)) + { + return; + } + else ini_parser_debugf("Opened file %s with size %d bytes.", cfg->filename_alt, ini_file.size); } - - ini_parser_debugf("Opened file %s with size %d bytes.", cfg->filename, ini_file.size); + else ini_parser_debugf("Opened file %s with size %d bytes.", cfg->filename, ini_file.size); ini_pt = 0; diff --git a/ini_parser.h b/ini_parser.h index 6fb921d..f571521 100644 --- a/ini_parser.h +++ b/ini_parser.h @@ -32,6 +32,7 @@ typedef struct { typedef struct { const char* filename; + const char* filename_alt; const ini_section_t* sections; const ini_var_t* vars; int nsections; diff --git a/main.c b/main.c index 4fd0744..bf07836 100644 --- a/main.c +++ b/main.c @@ -57,7 +57,9 @@ int main(int argc, char *argv[]) DISKLED_OFF; printf("\nMinimig by Dennis van Weeren"); - printf("\nARM Controller by Jakub Bednarski\n\n"); + printf("\nARM Controller by Jakub Bednarski"); + printf("\nMiSTer code by Sorgelig\n\n"); + printf("Version %s\n\n", version + 5); if (!is_fpga_ready(1))