From 7ae9aa6f6f43237954d1b66e4acce7c307fa1f0c Mon Sep 17 00:00:00 2001 From: sorgelig Date: Fri, 7 Jul 2017 03:28:50 +0800 Subject: [PATCH] HDMI Audio 48khz option. --- MiSTer.ini | 11 ++++++----- mist_cfg.c | 1 + mist_cfg.h | 1 + user_io.c | 1 + user_io.h | 1 + 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/MiSTer.ini b/MiSTer.ini index 425898e..cce77ca 100644 --- a/MiSTer.ini +++ b/MiSTer.ini @@ -1,6 +1,7 @@ [MiSTer] -key_menu_as_rgui=0 ; set to 1 to make the MENU key map to RGUI in Minimig (e.g. for Right Amiga) -forced_scandoubler=0 ; set to 1 to run scandoubler on VGA output always (depends on core). -ypbpr=0 ; set to 1 for YPbPr on VGA output. -composite_sync=0 ; set to 1 for composite sync on HSync signal of VGA output. -vga_scaler=1 ; set to 1 to connect VGA to scaler output. +key_menu_as_rgui=0 ; set to 1 to make the MENU key map to RGUI in Minimig (e.g. for Right Amiga) +forced_scandoubler=0 ; set to 1 to run scandoubler on VGA output always (depends on core). +ypbpr=0 ; set to 1 for YPbPr on VGA output. +composite_sync=0 ; set to 1 for composite sync on HSync signal of VGA output. +vga_scaler=0 ; set to 1 to connect VGA to scaler output. +audio_48k=0 ; set to 1 for 48khz/16bit HDMI audio (96khz/16bit otherwise) diff --git a/mist_cfg.c b/mist_cfg.c index 08e28da..137a113 100644 --- a/mist_cfg.c +++ b/mist_cfg.c @@ -32,6 +32,7 @@ const ini_var_t mist_ini_vars[] = { { "KEY_MENU_AS_RGUI", (void*)(&(mist_cfg.key_menu_as_rgui)), UINT8, 0, 1, 1 }, { "KEY_REMAP", (void*)user_io_key_remap, CUSTOM_HANDLER, 0, 0, 1 }, { "VIDEO_MODE", (void*)(&(mist_cfg.video_mode)), UINT8, 0, 9, 1 }, + { "AUDIO_48K", (void*)(&(mist_cfg.audio_48k)), UINT8, 0, 1, 1 }, }; // mist ini config diff --git a/mist_cfg.h b/mist_cfg.h index 8958efa..2134076 100644 --- a/mist_cfg.h +++ b/mist_cfg.h @@ -21,6 +21,7 @@ typedef struct { uint8_t csync; uint8_t vga_scaler; uint8_t video_mode; + uint8_t audio_48k; } mist_cfg_t; diff --git a/user_io.c b/user_io.c index 256cf8d..8106353 100644 --- a/user_io.c +++ b/user_io.c @@ -761,6 +761,7 @@ void user_io_send_buttons(char force) if (mist_cfg.csync) map |= CONF_CSYNC; if (mist_cfg.ypbpr) map |= CONF_YPBPR; if (mist_cfg.forced_scandoubler) map |= CONF_FORCED_SCANDOUBLER; + if (mist_cfg.audio_48k) map |= CONF_AUDIO_48K; if ((map != key_map) || force) { diff --git a/user_io.h b/user_io.h index f575181..923c0e4 100644 --- a/user_io.h +++ b/user_io.h @@ -108,6 +108,7 @@ #define CONF_CSYNC 0x08 #define CONF_FORCED_SCANDOUBLER 0x10 #define CONF_YPBPR 0x20 +#define CONF_AUDIO_48K 0x40 // core type value should be unlikely to be returned by broken cores #define CORE_TYPE_UNKNOWN 0x55