Merge branch 'master' into libretro

Author: notaz

frontend/libpicofe

@@ -2878,6 +2878,8 @@ static void update_variables(bool in_flight)
          Config.SlowBoot = 0;
          if (strcmp(var.value, "enabled") == 0)
             Config.SlowBoot = 1;
+         else if (strcmp(var.value, "enabled_no_pcsx") == 0)
+            Config.SlowBoot = 2;
       }
    }
 

frontend/libretro.c

@@ -145,6 +145,7 @@ struct retro_core_option_v2_definition option_defs_us[] = {
       {
          { "disabled", NULL },
          { "enabled",  NULL },
+         { "enabled_no_pcsx", "ON, w/o PCSXtm" },
          { NULL, NULL },
       },
       "disabled",

frontend/libretro_core_options.h

@@ -787,12 +787,6 @@ static unsigned short fname2color(const char *fname)
 static void draw_savestate_bg(int slot);
 
 #define MENU_ALIGN_LEFT
-#ifndef HAVE_PRE_ARMV7 // assume hires device
-#define MENU_X2 1
-#else
-#define MENU_X2 0
-#endif
-
 #include "libpicofe/menu.c"
 
 // a bit of black magic here
@@ -1541,6 +1535,7 @@ static int menu_loop_plugin_spu(int id, int keys)
 }
 
 static const char *men_gpu_dithering[] = { "OFF", "ON", "Force", NULL };
+static const char *men_bios_boot[] = { "OFF", "ON", "ON w/o PCSX", NULL };
 
 static const char h_bios[]       = "HLE is simulated BIOS. BIOS selection is saved in\n"
 				   "savestates and can't be changed there. Must save\n"
@@ -1602,9 +1597,12 @@ static int menu_loop_pluginsel_options(int id, int keys)
 	return 0;
 }
 
+static int slowboot_sel;
+
 static menu_entry e_menu_plugin_options[] =
 {
 	mee_enum_h    ("BIOS",                          0, bios_sel, bioses, h_bios),
+	mee_enum      ("BIOS logo (slow boot)",         0, slowboot_sel, men_bios_boot),
 	mee_enum      ("GPU Dithering",                 0, pl_rearmed_cbs.dithering, men_gpu_dithering),
 	mee_enum_h    ("GPU plugin",                    0, gpu_plugsel, gpu_plugins, h_plugin_gpu),
 	mee_enum_h    ("SPU plugin",                    0, spu_plugsel, spu_plugins, h_plugin_spu),
@@ -1618,7 +1616,9 @@ static menu_entry e_menu_main2[];
 static int menu_loop_plugin_options(int id, int keys)
 {
 	static int sel = 0;
+	slowboot_sel = Config.SlowBoot;
 	me_loop(e_menu_plugin_options, &sel);
+	Config.SlowBoot = slowboot_sel;
 
 	// sync BIOS/plugins
 	snprintf(Config.Bios, sizeof(Config.Bios), "%s", bioses[bios_sel]);
@@ -2141,7 +2141,7 @@ static int run_bios(void)
 	ready_to_go = 0;
 	if (reload_plugins(NULL) != 0)
 		return -1;
-	Config.SlowBoot = 1;
+	Config.SlowBoot = 2;
 	SysReset();
 	Config.SlowBoot = origSlowBoot;
 
@@ -2672,7 +2672,7 @@ void menu_init(void)
 	cpu_clock_st = cpu_clock = plat_target_cpu_clock_get();
 
 	scan_bios_plugins();
-	menu_init_base();
+	menu_init_base_scale(g_menuscreen_w >= 640 && g_menuscreen_h >= 480 ? 2 : 1);
 
 	menu_set_defconfig();
 	menu_load_config(0);

frontend/menu.c

@@ -89,7 +89,9 @@ static int c11_threads_cb_wrapper(void *cb)
 #include "../frontend/libretro-rthreads.h"
 #endif
 
+#ifdef HAVE_LIBRETRO
 #include "retro_timers.h"
+#endif
 
 struct cached_buf {
    u32 lba;
@@ -151,8 +153,10 @@ static void lbacache_do(u32 lba)
          memcpy(acdrom.buf_cache[i].buf_sub, buf_sub, sizeof(buf_sub));
    }
    slock_unlock(acdrom.buf_lock);
+#ifdef HAVE_LIBRETRO
    if (g_cd_handle)
       retro_sleep(0); // why does the main thread stall without this?
+#endif
 }
 
 static int lbacache_get(unsigned int lba, void *buf, void *sub_buf)

libpcsxcore/cdrom-async.c

@@ -424,10 +424,13 @@ static void Find_CurTrack(const u8 *time)
 static void generate_subq(const u8 *time)
 {
 	unsigned char start[3], next[3];
-	unsigned int this_s, start_s, next_s, pregap;
+	int this_s, start_s, next_s, pregap;
 	int relative_s;
 
-	cdra_getTD(cdr.CurTrack, start);
+	if (cdr.CurTrack <= cdr.ResultTN[1])
+		cdra_getTD(cdr.CurTrack, start);
+	else
+		memcpy(start, cdr.SetSectorEnd, 3);
 	if (cdr.CurTrack + 1 <= cdr.ResultTN[1]) {
 		pregap = 150;
 		cdra_getTD(cdr.CurTrack + 1, next);
@@ -444,7 +447,7 @@ static void generate_subq(const u8 *time)
 
 	cdr.TrackChanged = FALSE;
 
-	if (next_s - this_s < pregap) {
+	if (next_s - this_s < pregap && cdr.CurTrack <= cdr.ResultTN[1]) {
 		cdr.TrackChanged = TRUE;
 		cdr.CurTrack++;
 		start_s = next_s;
@@ -461,6 +464,8 @@ static void generate_subq(const u8 *time)
 		&cdr.subq.Relative[1], &cdr.subq.Relative[2]);
 
 	cdr.subq.Track = itob(cdr.CurTrack);
+	if (cdr.CurTrack > cdr.ResultTN[1]) // lead-out
+		cdr.subq.Track = 0xaa;
 	cdr.subq.Relative[0] = itob(cdr.subq.Relative[0]);
 	cdr.subq.Relative[1] = itob(cdr.subq.Relative[1]);
 	cdr.subq.Relative[2] = itob(cdr.subq.Relative[2]);
@@ -1206,8 +1211,20 @@ void cdrInterrupt(void) {
 			CDR_LOG_I("CdlID: %02x %02x %02x %02x\n", cdr.Result[0],
 				cdr.Result[1], cdr.Result[2], cdr.Result[3]);
 
-			/* This adds the string "PCSX" in Playstation bios boot screen */
-			memcpy((char *)&cdr.Result[4], "PCSX", 4);
+			/* 4-char string in Playstation bios boot screen */
+			if (Config.SlowBoot == 1)
+				memcpy(&cdr.Result[4], "PCSX", 4);
+			else {
+				cdr.Result[4] = 'S';
+				cdr.Result[5] = 'C';
+				cdr.Result[6] = 'E';
+				if (Config.PsxType == PSX_TYPE_PAL)
+					cdr.Result[7] = 'E';
+				else if (CdromId[2] == 'P' || CdromId[2] == 'p')
+					cdr.Result[7] = 'I';
+				else
+					cdr.Result[7] = 'A';
+			}
 			IrqStat = Complete;
 			break;
 
@@ -1231,6 +1248,13 @@ void cdrInterrupt(void) {
 		case CdlReadToc + CMD_WHILE_NOT_READY:
 			cdr.LocL[0] = LOCL_INVALID;
 			second_resp_time = cdReadTime * 180 / 4;
+			if (!Config.HLE && Config.SlowBoot) {
+				// hack: compensate cdrom being emulated too fast
+				// and bios finishing before the reverb decays
+				second_resp_time += cdReadTime * 75*2;
+				if ((psxRegs.pc >> 28) == 0x0b)
+					second_resp_time += cdReadTime * 75*3;
+			}
 			start_rotating = 1;
 			break;
 

libpcsxcore/cdrom.c

@@ -132,7 +132,7 @@ typedef struct {
 	boolean Cdda;
 	boolean CHD_Precache; /* loads disk image into memory, works with CHD only. */
 	boolean HLE;
-	boolean SlowBoot;
+	uint8_t SlowBoot; // 0 = off, 1 = on, 2 = on, no PCSX 'ad'
 	boolean Debug;
 	boolean PsxOut;
 	boolean icache_emulation;