Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	input.cpp
#	scheduler.cpp

Author: wizzomafizzo

MiSTer.ini

@@ -1,5 +1,5 @@
 [MiSTer]
-;debug=1               ; set to 1 to enable debugging messages. Default is 0(disabled).
+;debug=1               ; set to 1 to enable debugging messages, 2 - write to /tmp/debug.txt. Default is 0(disabled).
 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. (obsolete. see vga_mode)
@@ -22,6 +22,13 @@ rbf_hide_datecode=0    ; 1 - hides datecodes from rbf file names. Press F2 for q
 menu_pal=0             ; 1 - PAL mode for menu core
 hdmi_limited=0         ; 1 - use limited (16..235) color range over HDMI
                        ; 2 - use limited (16..255) color range over HDMI, for VGA converters.
+hdmi_cec=0             ; 1 - enable HDMI-CEC via ADV7513, 0 - disable.
+hdmi_cec_input_mode=1  ; 0 - ignore CEC remote input, 1 - accept mapped CEC keys.
+hdmi_cec_power_on=1    ; 1 - on power-on, try once to make MiSTer the active HDMI input once EDID provides its CEC address.
+hdmi_cec_sleep=0       ; 1 - send CEC STANDBY after video_off minutes of no input activity. Requires video_off>0.
+hdmi_cec_wake=0        ; 1 - on input after that idle period, send wake (ImageViewOn/TextViewOn/ActiveSource).
+hdmi_cec_clock=0       ; 0 - auto-detect 12MHz/50MHz, otherwise floating point value from 3.0 to 100.0 (3-100MHz).
+                       ;
 direct_video=0         ; 1 - enable core video timing over HDMI, use only with VGA converters.
                        ; 2 - auto-mode for HDMI DACs that report 1024x768 resolution (AG6200, CS5213). 
                        ; Power cycle when switching between HDMI displays and DACs. No hot-plug detection.
@@ -33,7 +40,6 @@ fb_terminal=1          ; 1 - enabled (default), 0 - disabled
 osd_timeout=30         ; 5-3600 timeout (in seconds) for OSD to disappear in Menu core. 0 - never timeout.
                        ; Background picture will get darker after double timeout
 video_off=0            ; output black frame in Menu core after timeout (is seconds). Valid only if osd_timout is non zero.
-video_off_hdmi=0       ; 1 - power down HDMI on video_off timeout (TV can sleep), 0 - keep HDMI active
 video_off_logo=0       ; 1 - show moving MiSTer logo when video_off is enabled (to distinguish from TV off mode)
 osd_rotate=0           ; Display OSD menu rotated,  0 - no rotation, 1 - rotate right (+90°), 2 - rotate left (-90°)                  
 vga_sog=0              ; 1 - enable sync on green (needs analog I/O board v6.0 or newer).
@@ -390,3 +396,8 @@ osd_lock_time=5
 ; 2 - Additionally don't send new SPD upon OSD open/close
 ; 3 - Don't send SPD at all.
 ;spd_quirk=0
+
+; 1...1440 - minutes till HDMI off if no user activity detected (no input from mouse/keyboard/joystick).
+; unlike video_off which works only in Menu core, this option works in all cores.
+; 0 (default) - don't turn HDMI off.
+hdmi_off=0

MiSTer.vcxproj

@@ -58,9 +58,10 @@
     <ClCompile Include="DiskImage.cpp" />
     <ClCompile Include="file_io.cpp" />
     <ClCompile Include="fpga_io.cpp" />
-    <ClCompile Include="game_docs.cpp" />
+    <ClCompile Include="game_docs.cpp" />
     <ClCompile Include="gamecontroller_db.cpp" />
     <ClCompile Include="hardware.cpp" />
+    <ClCompile Include="hdmi_cec.cpp" />
     <ClCompile Include="ide.cpp" />
     <ClCompile Include="ide_cdrom.cpp" />
     <ClCompile Include="input.cpp" />
@@ -135,9 +136,10 @@
     <ClInclude Include="fpga_nic301.h" />
     <ClInclude Include="fpga_reset_manager.h" />
     <ClInclude Include="fpga_system_manager.h" />
-    <ClInclude Include="game_docs.h" />
+    <ClInclude Include="game_docs.h" />
     <ClInclude Include="gamecontroller_db.h" />
     <ClInclude Include="hardware.h" />
+    <ClInclude Include="hdmi_cec.h" />
     <ClInclude Include="ide.h" />
     <ClInclude Include="ide_cdrom.h" />
     <ClInclude Include="input.h" />

MiSTer.vcxproj.filters

@@ -121,9 +121,9 @@
     <ClCompile Include="cheats.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="game_docs.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
+    <ClCompile Include="game_docs.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="scaler.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -256,6 +256,9 @@
     <ClCompile Include="support\saturn\saturncdd.cpp">
       <Filter>Source Files\support</Filter>
     </ClCompile>
+    <ClCompile Include="hdmi_cec.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="battery.h">
@@ -351,9 +354,9 @@
     <ClInclude Include="cheats.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="game_docs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
+    <ClInclude Include="game_docs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="scaler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -492,5 +495,8 @@
     <ClInclude Include="support\saturn\saturn.h">
       <Filter>Header Files\support</Filter>
     </ClInclude>
+    <ClInclude Include="hdmi_cec.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
-</Project>
+</Project>

audio.cpp

@@ -22,6 +22,7 @@ static uint8_t vol_att = 0;
 static uint8_t corevol_att = 0;
 unsigned long vol_set_timeout = 0;
 static int has_filter = 0;
+static int has_boost = 0;
 
 static char filter_cfg_path[1024] = {};
 static char filter_cfg[1024] = {};
@@ -31,6 +32,8 @@ static void setFilter()
 	fileTYPE f = {};
 
 	has_filter = spi_uio_cmd(UIO_SET_AFILTER);
+	has_boost = (has_filter & 2) && !is_menu();
+	if (!has_boost) corevol_att &= 7;
 	if (!has_filter) return;
 
 	snprintf(filter_cfg_path, sizeof(filter_cfg_path), AFILTER_DIR"/%s", filter_cfg + 1);
@@ -140,8 +143,11 @@ int get_volume()
 
 int get_core_volume()
 {
+	int boost = corevol_att & 0x60;
+	if (boost > 0x40) boost = 0x40;
 	corevol_att &= 7;
 	if (corevol_att > 6) corevol_att = 6;
+	corevol_att |= boost;
 	return corevol_att;
 }
 
@@ -182,12 +188,42 @@ void set_core_volume(int cmd)
 {
 	vol_set_timeout = GetTimer(1000);
 
-	corevol_att &= 7;
-	if (cmd < 0 && corevol_att < 6) corevol_att += 1;
-	if (cmd > 0 && corevol_att > 0) corevol_att -= 1;
+	if (has_boost)
+	{
+		int boost = corevol_att & 0x60;
+		corevol_att &= 7;
+		if (cmd < 0)
+		{
+			if (boost)
+			{
+				corevol_att = 0;
+				boost -= 0x20;
+			}
+			else if (corevol_att < 6) corevol_att += 1;
+		}
+
+		if (cmd > 0)
+		{
+			if (boost || !corevol_att)
+			{
+				boost += 0x20;
+				if (boost > 0x40) boost = 0x40;
+			}
+			else if (corevol_att > 0) corevol_att -= 1;
+		}
+
+		corevol_att |= boost;
+		setFilter();
+	}
+	else
+	{
+		corevol_att &= 7;
+		if (cmd < 0 && corevol_att < 6) corevol_att += 1;
+		if (cmd > 0 && corevol_att > 0) corevol_att -= 1;
 
-	if (has_filter) setFilter();
-	else send_volume();
+		if (has_filter) setFilter();
+		else send_volume();
+	}
 }
 
 void save_volume()

cfg.cpp

@@ -19,6 +19,7 @@
 cfg_t cfg;
 static FILE *orig_stdout = NULL;
 static FILE *dev_null = NULL;
+static FILE *debug_file = NULL;
 
 typedef enum
 {
@@ -52,6 +53,12 @@ static const ini_var_t ini_vars[] =
 	{ "HDMI_AUDIO_96K", (void*)(&(cfg.hdmi_audio_96k)), UINT8, 0, 1 },
 	{ "DVI_MODE", (void*)(&(cfg.dvi_mode)), UINT8, 0, 1 },
 	{ "HDMI_LIMITED", (void*)(&(cfg.hdmi_limited)), UINT8, 0, 2 },
+	{ "HDMI_CEC", (void*)(&(cfg.hdmi_cec)), UINT8, 0, 1 },
+	{ "HDMI_CEC_SLEEP", (void*)(&(cfg.hdmi_cec_sleep)), UINT8, 0, 1 },
+	{ "HDMI_CEC_WAKE", (void*)(&(cfg.hdmi_cec_wake)), UINT8, 0, 1 },
+	{ "HDMI_CEC_INPUT_MODE", (void*)(&(cfg.hdmi_cec_input_mode)), UINT8, 0, 1 },
+	{ "HDMI_CEC_POWER_ON", (void*)(&(cfg.hdmi_cec_power_on)), UINT8, 0, 1 },
+	{ "HDMI_CEC_CLOCK", (void*)(&(cfg.hdmi_cec_clock)), FLOAT, 0, 100 },
 	{ "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 },
@@ -108,7 +115,6 @@ static const ini_var_t ini_vars[] =
 	{ "VRR_MODE", (void *)(&(cfg.vrr_mode)), UINT8, 0, 4 },
 	{ "VRR_VESA_FRAMERATE", (void *)(&(cfg.vrr_vesa_framerate)), UINT8, 0, 255 },
 	{ "VIDEO_OFF", (void*)(&(cfg.video_off)), INT16, 0, 3600 },
-	{ "VIDEO_OFF_HDMI", (void*)(&(cfg.video_off_hdmi)), UINT8, 0, 1 },
 	{ "VIDEO_OFF_LOGO", (void*)(&(cfg.video_off_logo)), UINT8, 0, 1 },
 	{ "PLAYER_1_CONTROLLER", (void*)(&(cfg.player_controller[0])), STRINGARR, sizeof(cfg.player_controller[0]) / sizeof(cfg.player_controller[0][0]), sizeof(cfg.player_controller[0][0]) },
 	{ "PLAYER_2_CONTROLLER", (void*)(&(cfg.player_controller[1])), STRINGARR, sizeof(cfg.player_controller[0]) / sizeof(cfg.player_controller[0][0]), sizeof(cfg.player_controller[0][0]) },
@@ -130,7 +136,7 @@ static const ini_var_t ini_vars[] =
 	{ "CONTROLLER_UNIQUE_MAPPING", (void *)(cfg.controller_unique_mapping), UINT32ARR, 0, 0xFFFFFFFF },
 	{ "OSD_LOCK", (void*)(&(cfg.osd_lock)), STRING, 0, sizeof(cfg.osd_lock) - 1 },
 	{ "OSD_LOCK_TIME", (void*)(&(cfg.osd_lock_time)), UINT16, 0, 60 },
-	{ "DEBUG", (void *)(&(cfg.debug)), UINT8, 0, 1 },
+	{ "DEBUG", (void *)(&(cfg.debug)), UINT8, 0, 2 },
 	{ "LOOKAHEAD", (void *)(&(cfg.lookahead)), UINT8, 0, 1 },
 	{ "MAIN", (void*)(&(cfg.main)), STRING, 0, sizeof(cfg.main) - 1 },
 	{ "VFILTER_INTERLACE_DEFAULT", (void*)(&(cfg.vfilter_interlace_default)), STRING, 0, sizeof(cfg.vfilter_interlace_default) - 1 },
@@ -139,6 +145,7 @@ static const ini_var_t ini_vars[] =
 	{ "SCREENSHOT_IMAGE_FORMAT", (void *)(&(cfg.screenshot_image_format)), STRING, 0, sizeof(cfg.screenshot_image_format) - 1 },
 	{ "XBE2_SHIFT", (void*)(&(cfg.xbe2_shift)), UINT16, 0, 0x22F },
 	{ "SPD_QUIRK", (void*)(&(cfg.spd_quirk)), UINT8, 0, 3 },
+	{ "HDMI_OFF", (void*)(&(cfg.hdmi_off)), UINT16, 0, 1440 },
 };
 
 static const int nvars = (int)(sizeof(ini_vars) / sizeof(ini_var_t));
@@ -427,7 +434,12 @@ static void ini_parse_var(char* buf)
 			ini_parse_numeric(var, &buf[i], var->var);
 			if (!strcasecmp(var->name, "DEBUG"))
 			{
-				stdout = cfg.debug ? orig_stdout : dev_null;
+				if (cfg.debug == 2 && !debug_file)
+				{
+					debug_file = fopen("/tmp/debug.txt", "w");
+					setvbuf(debug_file, NULL, _IONBF, 0);
+				}
+				stdout = (cfg.debug == 2) ? debug_file : cfg.debug ? orig_stdout : dev_null;
 			}
 			break;
 		}
@@ -589,13 +601,13 @@ void cfg_parse()
 	cfg.wheel_force = 50;
 	cfg.dvi_mode = 2;
 	cfg.lookahead = 1;
-	cfg.hdr = 0;
+	cfg.hdmi_cec_input_mode = 1;
+	cfg.hdmi_cec_power_on = 1;
 	cfg.hdr_max_nits = 1000;
 	cfg.hdr_avg_nits = 250;
 	cfg.video_brightness = 50;
 	cfg.video_contrast = 50;
 	cfg.video_saturation = 100;
-	cfg.video_hue = 0;
 	strcpy(cfg.video_gain_offset, "1, 0, 1, 0, 1, 0");
 	strcpy(cfg.main, "MiSTer");
 	has_video_sections = false;

cfg.h

@@ -19,6 +19,12 @@ typedef struct {
 	uint8_t hdmi_audio_96k;
 	uint8_t dvi_mode;
 	uint8_t hdmi_limited;
+	uint8_t hdmi_cec;
+	uint8_t hdmi_cec_sleep;
+	uint8_t hdmi_cec_wake;
+	uint8_t hdmi_cec_input_mode;
+	uint8_t hdmi_cec_power_on;
+	float hdmi_cec_clock;
 	uint8_t direct_video;
 	uint8_t video_info;
 	float refresh_min;
@@ -80,7 +86,6 @@ typedef struct {
 	uint8_t vrr_mode;
 	uint8_t vrr_vesa_framerate;
 	uint16_t video_off;
-	uint8_t video_off_hdmi;
 	uint8_t video_off_logo;
 	uint8_t disable_autofire;
 	uint8_t video_brightness;
@@ -106,6 +111,7 @@ typedef struct {
 	char screenshot_image_format[16];
 	uint16_t xbe2_shift;
 	uint8_t spd_quirk;
+	uint16_t hdmi_off;
 } cfg_t;
 
 extern cfg_t cfg;

fpga_io.cpp

@@ -582,6 +582,11 @@ int fpga_get_io_type()
 	return (fpga_gpi_read() >> 28) & 1;
 }
 
+int fpga_get_hdmi_int()
+{
+	return (fpga_gpi_read() >> 20) & 1;
+}
+
 void reboot(int cold)
 {
 	sync();
@@ -627,10 +632,21 @@ void app_restart(const char *path, const char *xml, const char *exe)
 
 	const char *appname = exe ? exe : getappname();
 	printf("restarting to %s\n", appname);
-	execl(appname, appname, path, xml, NULL);
+
+	//a cleaner way to re-start
+	pid_t child = fork();
+	if (child > 0) _exit(0);
+	else if (child == 0)
+	{
+		setsid();
+		pid_t grandchild = fork();
+		if (grandchild > 0) _exit(0);
+		if (grandchild == 0) execl(appname, appname, path, xml, NULL);
+	}
 
 	printf("Something went wrong. Rebooting...\n");
 	reboot(1);
+	_exit(1);
 }
 
 void fpga_core_reset(int reset)

fpga_io.h

@@ -22,7 +22,8 @@ void fpga_spi_fast_block_read_be(uint16_t *buf, uint32_t length);
 
 void fpga_set_led(uint32_t on);
 int  fpga_get_buttons();
-int fpga_get_io_type();
+int  fpga_get_io_type();
+int  fpga_get_hdmi_int();
 
 void fpga_core_reset(int reset);
 void fpga_core_write(uint32_t offset, uint32_t value);