diff --git a/cfg.cpp b/cfg.cpp index 94135ad..970f1c2 100644 --- a/cfg.cpp +++ b/cfg.cpp @@ -25,37 +25,37 @@ const ini_section_t ini_sections[] = // mist ini vars const ini_var_t ini_vars[] = { - { "YPBPR", (void*)(&(cfg.ypbpr)), UINT8, 0, 1, 1 }, - { "COMPOSITE_SYNC", (void*)(&(cfg.csync)), UINT8, 0, 1, 1 }, - { "FORCED_SCANDOUBLER", (void*)(&(cfg.forced_scandoubler)), UINT8, 0, 1, 1 }, - { "VGA_SCALER", (void*)(&(cfg.vga_scaler)), UINT8, 0, 1, 1 }, - { "VGA_SOG", (void*)(&(cfg.vga_sog)), UINT8, 0, 1, 1 }, - { "KEYRAH_MODE", (void*)(&(cfg.keyrah_mode)), UINT32, 0, (int)0xFFFFFFFF, 1 }, - { "RESET_COMBO", (void*)(&(cfg.reset_combo)), UINT8, 0, 3, 1 }, - { "KEY_MENU_AS_RGUI", (void*)(&(cfg.key_menu_as_rgui)), UINT8, 0, 1, 1 }, - { "VIDEO_MODE", (void*)(cfg.video_conf), STRING, 0, sizeof(cfg.video_conf)-1, 1 }, - { "VIDEO_MODE_PAL", (void*)(cfg.video_conf_pal), STRING, 0, sizeof(cfg.video_conf_pal) - 1, 1 }, - { "VIDEO_MODE_NTSC", (void*)(cfg.video_conf_ntsc), STRING, 0, sizeof(cfg.video_conf_ntsc) - 1, 1 }, - { "VIDEO_INFO", (void*)(&(cfg.video_info)), UINT8, 0, 10, 1 }, - { "VSYNC_ADJUST", (void*)(&(cfg.vsync_adjust)), UINT8, 0, 2, 1 }, - { "HDMI_AUDIO_96K", (void*)(&(cfg.hdmi_audio_96k)), UINT8, 0, 1, 1 }, - { "DVI_MODE", (void*)(&(cfg.dvi)), UINT8, 0, 1, 1 }, - { "HDMI_LIMITED", (void*)(&(cfg.hdmi_limited)), UINT8, 0, 2, 1 }, - { "KBD_NOMOUSE", (void*)(&(cfg.kbd_nomouse)), UINT8, 0, 1, 1 }, - { "MOUSE_THROTTLE", (void*)(&(cfg.mouse_throttle)), UINT8, 1, 100, 1 }, - { "BOOTSCREEN", (void*)(&(cfg.bootscreen)), UINT8, 0, 1, 1 }, - { "VOLUMECTL", (void*)(&(cfg.volumectl)), UINT8, 0, 1, 1 }, - { "VSCALE_MODE", (void*)(&(cfg.vscale_mode)), UINT8, 0, 3, 1 }, - { "VSCALE_BORDER", (void*)(&(cfg.vscale_border)), UINT8, 0, 100, 1 }, - { "RBF_HIDE_DATECODE", (void*)(&(cfg.rbf_hide_datecode)), UINT8, 0, 1, 1 }, - { "MENU_PAL", (void*)(&(cfg.menu_pal)), UINT8, 0, 1, 1 }, - { "BOOTCORE", (void*)(&(cfg.bootcore)), STRING, 0, sizeof(cfg.bootcore) - 1, 1 }, - { "BOOTCORE_TIMEOUT", (void*)(&(cfg.bootcore_timeout)), INT16, 10, 30, 1 }, - { "FONT", (void*)(&(cfg.font)), STRING, 0, sizeof(cfg.font) - 1, 1 }, - { "FB_SIZE", (void*)(&(cfg.fb_size)), UINT8, 1, 4, 1 }, - { "FB_TERMINAL", (void*)(&(cfg.fb_terminal)), UINT8, 0, 1, 1 }, - { "OSD_TIMEOUT", (void*)(&(cfg.osd_timeout)), INT16, 5, 3600, 1 }, - { "DIRECT_VIDEO", (void*)(&(cfg.direct_video)), UINT8, 0, 1, 1 }, + { "YPBPR", (void*)(&(cfg.ypbpr)), UINT8, 0, 1 }, + { "COMPOSITE_SYNC", (void*)(&(cfg.csync)), UINT8, 0, 1 }, + { "FORCED_SCANDOUBLER", (void*)(&(cfg.forced_scandoubler)), UINT8, 0, 1 }, + { "VGA_SCALER", (void*)(&(cfg.vga_scaler)), UINT8, 0, 1 }, + { "VGA_SOG", (void*)(&(cfg.vga_sog)), UINT8, 0, 1 }, + { "KEYRAH_MODE", (void*)(&(cfg.keyrah_mode)), UINT32, 0, (int)0xFFFFFFFF }, + { "RESET_COMBO", (void*)(&(cfg.reset_combo)), UINT8, 0, 3 }, + { "KEY_MENU_AS_RGUI", (void*)(&(cfg.key_menu_as_rgui)), UINT8, 0, 1 }, + { "VIDEO_MODE", (void*)(cfg.video_conf), STRING, 0, sizeof(cfg.video_conf)-1 }, + { "VIDEO_MODE_PAL", (void*)(cfg.video_conf_pal), STRING, 0, sizeof(cfg.video_conf_pal) - 1 }, + { "VIDEO_MODE_NTSC", (void*)(cfg.video_conf_ntsc), STRING, 0, sizeof(cfg.video_conf_ntsc) - 1 }, + { "VIDEO_INFO", (void*)(&(cfg.video_info)), UINT8, 0, 10 }, + { "VSYNC_ADJUST", (void*)(&(cfg.vsync_adjust)), UINT8, 0, 2 }, + { "HDMI_AUDIO_96K", (void*)(&(cfg.hdmi_audio_96k)), UINT8, 0, 1 }, + { "DVI_MODE", (void*)(&(cfg.dvi)), UINT8, 0, 1 }, + { "HDMI_LIMITED", (void*)(&(cfg.hdmi_limited)), UINT8, 0, 2 }, + { "KBD_NOMOUSE", (void*)(&(cfg.kbd_nomouse)), UINT8, 0, 1 }, + { "MOUSE_THROTTLE", (void*)(&(cfg.mouse_throttle)), UINT8, 1, 100 }, + { "BOOTSCREEN", (void*)(&(cfg.bootscreen)), UINT8, 0, 1 }, + { "VOLUMECTL", (void*)(&(cfg.volumectl)), UINT8, 0, 1 }, + { "VSCALE_MODE", (void*)(&(cfg.vscale_mode)), UINT8, 0, 3 }, + { "VSCALE_BORDER", (void*)(&(cfg.vscale_border)), UINT8, 0, 100 }, + { "RBF_HIDE_DATECODE", (void*)(&(cfg.rbf_hide_datecode)), UINT8, 0, 1 }, + { "MENU_PAL", (void*)(&(cfg.menu_pal)), UINT8, 0, 1 }, + { "BOOTCORE", (void*)(&(cfg.bootcore)), STRING, 0, sizeof(cfg.bootcore) - 1 }, + { "BOOTCORE_TIMEOUT", (void*)(&(cfg.bootcore_timeout)), INT16, 10, 30 }, + { "FONT", (void*)(&(cfg.font)), STRING, 0, sizeof(cfg.font) - 1 }, + { "FB_SIZE", (void*)(&(cfg.fb_size)), UINT8, 1, 4 }, + { "FB_TERMINAL", (void*)(&(cfg.fb_terminal)), UINT8, 0, 1 }, + { "OSD_TIMEOUT", (void*)(&(cfg.osd_timeout)), INT16, 5, 3600 }, + { "DIRECT_VIDEO", (void*)(&(cfg.direct_video)), UINT8, 0, 1 }, }; // mist ini config diff --git a/ini_parser.cpp b/ini_parser.cpp index 1455ce9..f30fc43 100644 --- a/ini_parser.cpp +++ b/ini_parser.cpp @@ -131,7 +131,7 @@ void* ini_get_var(const ini_cfg_t* cfg, int cur_section, char* buf) // parse var for (j = 0; jnvars; j++) { - if ((!strcasecmp(buf, cfg->vars[j].name)) && (cfg->vars[j].section_id == cur_section)) var_id = j; + if (!strcasecmp(buf, cfg->vars[j].name) && cur_section) var_id = j; } // get data diff --git a/ini_parser.h b/ini_parser.h index f7eb4ef..f429220 100644 --- a/ini_parser.h +++ b/ini_parser.h @@ -27,7 +27,6 @@ typedef struct { ini_vartypes_t type; int min; int max; - int section_id; } ini_var_t; typedef struct {