X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Flinux%2Femu.c;h=931031b4c9705405afed258328485665cba36863;hb=cff531af94bd9c9c89ae162e80f48ddc26a4e504;hp=0ef599d6f1fd39c791183b6b6a4fa2a9da745626;hpb=e51e5983fe5cac8486df76bf349bde8aa23d1e5d;p=picodrive.git

diff --git a/platform/linux/emu.c b/platform/linux/emu.c
index 0ef599d..931031b 100644
--- a/platform/linux/emu.c
+++ b/platform/linux/emu.c
@@ -1,27 +1,27 @@
-// (c) Copyright 2006-2009 notaz, All rights reserved.
-// Free for non-commercial use.
-
-// For commercial use, separate licencing terms must be obtained.
+/*
+ * PicoDrive
+ * (C) notaz, 2006-2010
+ *
+ * This work is licensed under the terms of MAME license.
+ * See COPYING file in the top-level directory.
+ */
 
 #include <stdio.h>
 #include <unistd.h>
 
+#include "../libpicofe/menu.h"
+#include "../libpicofe/plat.h"
+#include "../libpicofe/linux/sndout_oss.h"
 #include "../common/emu.h"
-#include "../common/menu.h"
-#include "../common/plat.h"
 #include "../common/arm_utils.h"
-#include "../linux/sndout_oss.h"
 #include "version.h"
 
 #include <pico/pico_int.h>
 
 
 static short __attribute__((aligned(4))) sndBuffer[2*44100/50];
-char cpu_clk_name[] = "unused";
-const char *renderer_names_[] = { "16bit accurate", " 8bit accurate", "     8bit fast", NULL };
-const char *renderer_names32x_[] = { "accurate", "faster  ", "fastest ", NULL };
-const char **renderer_names = renderer_names_;
-const char **renderer_names32x = renderer_names32x_;
+const char *renderer_names[] = { "16bit accurate", " 8bit accurate", " 8bit fast", NULL };
+const char *renderer_names32x[] = { "accurate", "faster", "fastest", NULL };
 enum renderer_types { RT_16BIT, RT_8BIT_ACC, RT_8BIT_FAST, RT_COUNT };
 
 
@@ -127,9 +127,6 @@ void pemu_finalize_frame(const char *fps, const char *notice)
 
 static void apply_renderer(void)
 {
-	PicoScanBegin = NULL;
-	PicoScanEnd = NULL;
-
 	switch (currentConfig.renderer) {
 	case RT_16BIT:
 		PicoOpt &= ~POPT_ALT_RENDERER;
@@ -180,7 +177,7 @@ void plat_video_menu_enter(int is_rom_loaded)
 
 void plat_video_menu_begin(void)
 {
-	memcpy32(g_screen_ptr, g_menubg_ptr, g_screen_width * g_screen_height * 2 / 4);
+	g_menuscreen_ptr = g_screen_ptr;
 }
 
 void plat_video_menu_end(void)
@@ -214,62 +211,42 @@ void plat_update_volume(int has_changed, int is_up)
 {
 }
 
-void pemu_forced_frame(int opts)
+void pemu_forced_frame(int no_scale, int do_emu)
 {
-	int po_old = PicoOpt;
-	int eo_old = currentConfig.EmuOpt;
-
-	PicoOpt &= ~POPT_ALT_RENDERER;
-	PicoOpt |= opts|POPT_ACC_SPRITES; // acc_sprites
-
-	PicoDrawSetOutFormat(PDF_RGB555, 1);
 	PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);
 	PicoDraw32xSetFrameMode(0, 0);
-
+	PicoDrawSetCallbacks(NULL, NULL);
 	Pico.m.dirtyPal = 1;
-	PicoFrameDrawOnly();
 
-	PicoOpt = po_old;
-	currentConfig.EmuOpt = eo_old;
+	emu_cmn_forced_frame(no_scale, do_emu);
+
+	g_menubg_src_ptr = g_screen_ptr;
 }
 
-static void updateSound(int len)
+static void oss_write_nonblocking(int len)
 {
-	len <<= 1;
-	if (PicoOpt & POPT_EN_STEREO)
-		len <<= 1;
-
+	// sndout_oss_can_write() is not reliable, only use with no_frmlimit
 	if ((currentConfig.EmuOpt & EOPT_NO_FRMLIMIT) && !sndout_oss_can_write(len))
 		return;
 
-	/* avoid writing audio when lagging behind to prevent audio lag */
-	if (PicoSkipFrame != 2)
-		sndout_oss_write(PsndOut, len);
+	sndout_oss_write_nb(PsndOut, len);
 }
 
 void pemu_sound_start(void)
 {
-	int target_fps = Pico.m.pal ? 50 : 60;
-
 	PsndOut = NULL;
 
 	if (currentConfig.EmuOpt & EOPT_EN_SOUND)
 	{
-		int snd_excess_add, frame_samples;
 		int is_stereo = (PicoOpt & POPT_EN_STEREO) ? 1 : 0;
 
 		PsndRerate(Pico.m.frame_count ? 1 : 0);
 
-		frame_samples = PsndLen;
-		snd_excess_add = ((PsndRate - PsndLen * target_fps)<<16) / target_fps;
-		if (snd_excess_add != 0)
-			frame_samples++;
-
-		printf("starting audio: %i len: %i (ex: %04x) stereo: %i, pal: %i\n",
-			PsndRate, PsndLen, snd_excess_add, is_stereo, Pico.m.pal);
-		sndout_oss_start(PsndRate, frame_samples, is_stereo);
+		printf("starting audio: %i len: %i stereo: %i, pal: %i\n",
+			PsndRate, PsndLen, is_stereo, Pico.m.pal);
+		sndout_oss_start(PsndRate, is_stereo, 1);
 		sndout_oss_setvol(currentConfig.volume, currentConfig.volume);
-		PicoWriteSound = updateSound;
+		PicoWriteSound = oss_write_nonblocking;
 		plat_update_volume(0, 0);
 		memset(sndBuffer, 0, sizeof(sndBuffer));
 		PsndOut = sndBuffer;
@@ -305,24 +282,10 @@ void pemu_loop_prep(void)
 
 void pemu_loop_end(void)
 {
-	int po_old = PicoOpt;
-	int eo_old = currentConfig.EmuOpt;
-
 	pemu_sound_stop();
-	memset32(g_screen_ptr, 0, g_screen_width * g_screen_height * 2 / 4);
 
 	/* do one more frame for menu bg */
-	PicoOpt &= ~POPT_ALT_RENDERER;
-	PicoOpt |= POPT_EN_SOFTSCALE|POPT_ACC_SPRITES;
-
-	PicoDrawSetOutFormat(PDF_RGB555, 1);
-	PicoDrawSetOutBuf(g_screen_ptr, g_screen_width * 2);
-	PicoDraw32xSetFrameMode(0, 0);
-	Pico.m.dirtyPal = 1;
-	PicoFrame();
-
-	PicoOpt = po_old;
-	currentConfig.EmuOpt = eo_old;
+	pemu_forced_frame(0, 1);
 }
 
 void plat_wait_till_us(unsigned int us_to)
@@ -338,24 +301,3 @@ void plat_wait_till_us(unsigned int us_to)
 	}
 }
 
-const char *plat_get_credits(void)
-{
-	return "PicoDrive v" VERSION " (c) notaz, 2006-2009\n\n\n"
-		"Credits:\n"
-		"fDave: Cyclone 68000 core,\n"
-		"      base code of PicoDrive\n"
-		"Reesy & FluBBa: DrZ80 core\n"
-		"MAME devs: YM2612 and SN76496 cores\n"
-		"rlyeh and others: minimal SDK\n"
-		"Squidge: mmuhack\n"
-		"Dzz: ARM940 sample\n"
-		"GnoStiC / Puck2099: USB joy code\n"
-		"craigix: GP2X hardware\n"
-		"ketchupgun: skin design\n"
-		"\n"
-		"special thanks (for docs, ideas):\n"
-		" Charles MacDonald, Haze,\n"
-		" Stephane Dallongeville,\n"
-		" Lordus, Exophase, Rokas,\n"
-		" Nemesis, Tasco Deluxe";
-}