Merge branch 'master' into stable

Author: wizzomafizzo

fpga_io.cpp

@@ -427,6 +427,10 @@ static int make_env(const char *name, const char *cfg)
 
 int fpga_load_rbf(const char *name, const char *cfg, const char *xml)
 {
+	// Tear down the launcher frontend (and its HPS framebuffer mmaps) before any
+	// FPGA reconfiguration. A live frontend scanning out /dev/fb0 over the f2sdram
+	// bridge deadlocks the AXI bus when do_bridge(0) resets it during load.
+	alt_launcher_shutdown();
 	OsdDisable();
 	static char path[1024];
 	int ret = 0;

menu.cpp

@@ -51,7 +51,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "menu.h"
 #include "support/zaparoo/alt_launcher.h"
 #include "support/zaparoo/alt_launcher_menu.h"
-#include "support/zaparoo/launcher_pages.h"
 #include "support/zaparoo/menu_rbf.h"
 #include "user_io.h"
 #include "debug.h"
@@ -86,15 +85,6 @@ enum MENU
 	MENU_MISC1,
 	MENU_MISC2,
 
-	// Right-side companion to System Settings on the alt-launcher menu core.
-	// Top "Zaparoo Frontend" page lists sub-pages (Video) and an exit row;
-	// the Video sub-page hosts CRT mode + H/V centering offsets and binds
-	// left/right arrows to value adjustment.
-	MENU_ZAPAROO_LAUNCHER1,
-	MENU_ZAPAROO_LAUNCHER2,
-	MENU_ZAPAROO_VIDEO1,
-	MENU_ZAPAROO_VIDEO2,
-
 	MENU_SELECT_INI1,
 	MENU_SELECT_INI2,
 
@@ -6913,100 +6903,10 @@ void HandleUI(void)
 		{
 			menustate = MENU_MISC1;
 		}
-		else if (right && alt_launcher_configured())
-		{
-			menustate = MENU_ZAPAROO_LAUNCHER1;
-			menusub = 0;
-		}
 
 		if (!hold_cnt && reboot_req) fpga_load_rbf(menu_rbf_name());
 		break;
 
-		/******************************************************************/
-		/* zaparoo frontend pages (right-side sibling of System)          */
-		/******************************************************************/
-	case MENU_ZAPAROO_LAUNCHER1:
-		if (!alt_launcher_configured())
-		{
-			menustate = MENU_NONE1;
-			break;
-		}
-		helptext_idx = 0;
-		parentstate = menustate;
-		launcher_page_render(menusub, &menumask);
-		menustate = MENU_ZAPAROO_LAUNCHER2;
-		break;
-
-	case MENU_ZAPAROO_LAUNCHER2:
-		if (menu)
-		{
-			menustate = MENU_NONE1;
-			break;
-		}
-		if (left)
-		{
-			menustate = MENU_SYSTEM1;
-			menusub = 0;
-			break;
-		}
-		if (right && menusub == 0)
-		{
-			menustate = MENU_ZAPAROO_VIDEO1;
-			menusub = 0;
-			break;
-		}
-		if (select)
-		{
-			int act = launcher_page_handle_select(menusub);
-			if (act == 1)
-			{
-				menustate = MENU_ZAPAROO_VIDEO1;
-				menusub = 0;
-			}
-			else if (act == 0)
-			{
-				menustate = MENU_NONE1;
-			}
-		}
-		break;
-
-	case MENU_ZAPAROO_VIDEO1:
-		if (!alt_launcher_configured())
-		{
-			menustate = MENU_NONE1;
-			break;
-		}
-		helptext_idx = 0;
-		parentstate = menustate;
-		video_page_render(menusub, &menumask);
-		menustate = MENU_ZAPAROO_VIDEO2;
-		break;
-
-	case MENU_ZAPAROO_VIDEO2:
-		if (menu)
-		{
-			menustate = MENU_ZAPAROO_LAUNCHER1;
-			menusub = 0;
-			break;
-		}
-		if (left || right || plus || minus)
-		{
-			video_page_adjust(menusub, (right || plus) ? +1 : -1);
-			menustate = MENU_ZAPAROO_VIDEO1;
-			break;
-		}
-		if (select)
-		{
-			if (!video_page_handle_select(menusub))
-			{
-				menustate = MENU_ZAPAROO_LAUNCHER1;
-				menusub = 0;
-				break;
-			}
-			menustate = MENU_ZAPAROO_VIDEO1;
-		}
-		break;
-
 	case MENU_JOYSYSMAP:
 		strcpy(joy_bnames[SYS_BTN_A - DPAD_NAMES], "A");
 		strcpy(joy_bnames[SYS_BTN_B - DPAD_NAMES], "B");