diff --git a/cfg.cpp b/cfg.cpp index cca7424..94135ad 100644 --- a/cfg.cpp +++ b/cfg.cpp @@ -40,7 +40,7 @@ const ini_var_t ini_vars[] = { { "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, 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 }, diff --git a/user_io.cpp b/user_io.cpp index ab68ecb..9a55e8c 100644 --- a/user_io.cpp +++ b/user_io.cpp @@ -1631,7 +1631,8 @@ void user_io_send_buttons(char force) if (cfg.forced_scandoubler) map |= CONF_FORCED_SCANDOUBLER; if (cfg.hdmi_audio_96k) map |= CONF_AUDIO_96K; if (cfg.dvi) map |= CONF_DVI; - if (cfg.hdmi_limited) map |= CONF_HDMI_LIMITED; + if (cfg.hdmi_limited & 1) map |= CONF_HDMI_LIMITED1; + if (cfg.hdmi_limited & 2) map |= CONF_HDMI_LIMITED2; if (cfg.direct_video) map |= CONF_DIRECT_VIDEO; if ((map != key_map) || force) diff --git a/user_io.h b/user_io.h index 84a3956..3bb45ef 100644 --- a/user_io.h +++ b/user_io.h @@ -119,17 +119,18 @@ #define KBD_LED_FLAG_MASK 0xC0 #define KBD_LED_FLAG_STATUS 0x40 -#define BUTTON1 0b00000000001 -#define BUTTON2 0b00000000010 -#define CONF_VGA_SCALER 0b00000000100 -#define CONF_CSYNC 0b00000001000 -#define CONF_FORCED_SCANDOUBLER 0b00000010000 -#define CONF_YPBPR 0b00000100000 -#define CONF_AUDIO_96K 0b00001000000 -#define CONF_DVI 0b00010000000 -#define CONF_HDMI_LIMITED 0b00100000000 -#define CONF_VGA_SOG 0b01000000000 -#define CONF_DIRECT_VIDEO 0b10000000000 +#define BUTTON1 0b0000000000000001 +#define BUTTON2 0b0000000000000010 +#define CONF_VGA_SCALER 0b0000000000000100 +#define CONF_CSYNC 0b0000000000001000 +#define CONF_FORCED_SCANDOUBLER 0b0000000000010000 +#define CONF_YPBPR 0b0000000000100000 +#define CONF_AUDIO_96K 0b0000000001000000 +#define CONF_DVI 0b0000000010000000 +#define CONF_HDMI_LIMITED1 0b0000000100000000 +#define CONF_VGA_SOG 0b0000001000000000 +#define CONF_DIRECT_VIDEO 0b0000010000000000 +#define CONF_HDMI_LIMITED2 0b0000100000000000 // core type value should be unlikely to be returned by broken cores #define CORE_TYPE_UNKNOWN 0x55