From: kub <derkub@gmail.com>
Date: Sun, 21 Mar 2021 22:04:14 +0000 (+0100)
Subject: cleanup for psp
X-Git-Tag: v2.00~579
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c28911fdb194b8356b85da133bba31148d4bf41c;p=picodrive.git

cleanup for psp
---

diff --git a/platform/common/emu.c b/platform/common/emu.c
index ecc91726..b296a647 100644
--- a/platform/common/emu.c
+++ b/platform/common/emu.c
@@ -669,12 +669,6 @@ int emu_read_config(const char *rom_fname, int no_defaults)
 	PicoIn.overclockM68k = currentConfig.overclock_68k;
 
 	// some sanity checks
-#ifdef PSP
-	/* TODO: mv to plat_validate_config() */
-	if (currentConfig.CPUclock < 10 || currentConfig.CPUclock > 4096) currentConfig.CPUclock = 200;
-	if (currentConfig.gamma < -4 || currentConfig.gamma >  16) currentConfig.gamma = 0;
-	if (currentConfig.gamma2 < 0 || currentConfig.gamma2 > 2)  currentConfig.gamma2 = 0;
-#endif
 	if (currentConfig.volume < 0 || currentConfig.volume > 99)
 		currentConfig.volume = 50;
 
diff --git a/platform/psp/emu.c b/platform/psp/emu.c
index fa32175a..6c6c5b17 100644
--- a/platform/psp/emu.c
+++ b/platform/psp/emu.c
@@ -593,6 +593,10 @@ void pemu_validate_config(void)
 		currentConfig.hscale40 = 0.01;
 	if (currentConfig.hscale32 < 0.01)
 		currentConfig.hscale32 = 0.01;
+	if (currentConfig.gamma < -4 || currentConfig.gamma >  16)
+		currentConfig.gamma = 0;
+	if (currentConfig.gamma2 < 0 || currentConfig.gamma2 > 2)
+		currentConfig.gamma2 = 0;
 }
 
 /* finalize rendering a frame */
diff --git a/platform/psp/main.c b/platform/psp/main.c
deleted file mode 100644
index e4a5c207..00000000
--- a/platform/psp/main.c
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * PicoDrive
- * (C) notaz, 2007,2008
- *
- * This work is licensed under the terms of MAME license.
- * See COPYING file in the top-level directory.
- */
-
-#include <string.h>
-#include "psp.h"
-#include "emu.h"
-#include "menu.h"
-#include "mp3.h"
-#include "../common/emu.h"
-#include "../libpicofe/menu.h"
-#include "../libpicofe/lprintf.h"
-
-#ifdef GPROF
-#include <pspprof.h>
-#endif
-
-#ifdef GCOV
-#include <stdio.h>
-#include <stdlib.h>
-
-void dummy(void)
-{
-	engineState = atoi(rom_fname_reload);
-	setbuf(NULL, NULL);
-	getenv(NULL);
-}
-#endif
-
-int pico_main(void)
-{
-	psp_init();
-
-	emu_prepareDefaultConfig();
-	emu_ReadConfig(0, 0);
-	config_readlrom(PicoConfigFile);
-
-	emu_Init();
-	menu_init();
-	// moved to emu_Loop(), after CPU clock change..
-	//mp3_init();
-
-	engineState = PGS_Menu;
-
-	for (;;)
-	{
-		switch (engineState)
-		{
-			case PGS_Menu:
-#ifndef GPROF
-				menu_loop();
-#else
-				strcpy(rom_fname_reload, rom_fname_loaded);
-				engineState = PGS_ReloadRom;
-#endif
-				break;
-
-			case PGS_ReloadRom:
-				if (emu_reload_rom(rom_fname_reload)) {
-					engineState = PGS_Running;
-					if (mp3_last_error != 0)
-						engineState = PGS_Menu; // send to menu to display mp3 error
-				} else {
-					lprintf("PGS_ReloadRom == 0\n");
-					engineState = PGS_Menu;
-				}
-				break;
-
-			case PGS_Suspending:
-				while (engineState == PGS_Suspending)
-					psp_wait_suspend();
-				break;
-
-			case PGS_SuspendWake:
-				psp_unhandled_suspend = 0;
-				psp_resume_suspend();
-				emu_HandleResume();
-				engineState = engineStateSuspend;
-				break;
-
-			case PGS_RestartRun:
-				engineState = PGS_Running;
-
-			case PGS_Running:
-				if (psp_unhandled_suspend) {
-					psp_unhandled_suspend = 0;
-					psp_resume_suspend();
-					emu_HandleResume();
-					break;
-				}
-				pemu_loop();
-#ifdef GPROF
-				goto endloop;
-#endif
-				break;
-
-			case PGS_Quit:
-				goto endloop;
-
-			default:
-				lprintf("engine got into unknown state (%i), exitting\n", engineState);
-				goto endloop;
-		}
-	}
-
-	endloop:
-
-	mp3_deinit();
-	emu_Deinit();
-#ifdef GPROF
-	gprof_cleanup();
-#endif
-#ifndef GCOV
-	psp_finish();
-#endif
-
-	return 0;
-}
-