X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Flibretro.c;h=d46cc4a2c180320ae324c128eb11728902d8e683;hb=be7867d8756f15956447d3275382a77a71922feb;hp=a6bc50f09b5910862cc282b36089f91d3501fece;hpb=8c8b72847259871bc50cd796383d9eeb83970bb1;p=picodrive.git

diff --git a/platform/libretro.c b/platform/libretro.c
index a6bc50f..d46cc4a 100644
--- a/platform/libretro.c
+++ b/platform/libretro.c
@@ -17,6 +17,7 @@
 #endif
 
 #include <pico/pico_int.h>
+#include <pico/state.h>
 #include "common/input_pico.h"
 #include "common/version.h"
 #include "libretro.h"
@@ -40,10 +41,6 @@ static int vout_width, vout_height;
 
 static short __attribute__((aligned(4))) sndBuffer[2*44100/50];
 
-// FIXME: these 2 shouldn't be here
-static unsigned char PicoDraw2FB_[(8+320) * (8+240+8)];
-unsigned char *PicoDraw2FB = PicoDraw2FB_;
-
 static void snd_write(int len);
 
 #ifdef _WIN32
@@ -151,7 +148,6 @@ void emu_video_mode_change(int start_line, int line_count, int is_32cols)
 
 void emu_32x_startup(void)
 {
-	PicoDrawSetOutFormat(PDF_RGB555, 1);
 }
 
 #ifndef ANDROID
@@ -231,20 +227,124 @@ void retro_get_system_av_info(struct retro_system_av_info *info)
 	info->geometry.aspect_ratio = 4.0 / 3.0;
 }
 
-/* savestates - TODO */
+/* savestates */
+struct savestate_state {
+	const char *load_buf;
+	char *save_buf;
+	size_t size;
+	size_t pos;
+};
+
+size_t state_read(void *p, size_t size, size_t nmemb, void *file)
+{
+	struct savestate_state *state = file;
+	size_t bsize = size * nmemb;
+
+	if (state->pos + bsize > state->size) {
+		lprintf("savestate error: %u/%u\n",
+			state->pos + bsize, state->size);
+		bsize = state->size - state->pos;
+		if ((int)bsize <= 0)
+			return 0;
+	}
+
+	memcpy(p, state->load_buf + state->pos, bsize);
+	state->pos += bsize;
+	return bsize;
+}
+
+size_t state_write(void *p, size_t size, size_t nmemb, void *file)
+{
+	struct savestate_state *state = file;
+	size_t bsize = size * nmemb;
+
+	if (state->pos + bsize > state->size) {
+		lprintf("savestate error: %u/%u\n",
+			state->pos + bsize, state->size);
+		bsize = state->size - state->pos;
+		if ((int)bsize <= 0)
+			return 0;
+	}
+
+	memcpy(state->save_buf + state->pos, p, bsize);
+	state->pos += bsize;
+	return bsize;
+}
+
+size_t state_skip(void *p, size_t size, size_t nmemb, void *file)
+{
+	struct savestate_state *state = file;
+	size_t bsize = size * nmemb;
+
+	state->pos += bsize;
+	return bsize;
+}
+
+size_t state_eof(void *file)
+{
+	struct savestate_state *state = file;
+
+	return state->pos >= state->size;
+}
+
+int state_fseek(void *file, long offset, int whence)
+{
+	struct savestate_state *state = file;
+
+	switch (whence) {
+	case SEEK_SET:
+		state->pos = offset;
+		break;
+	case SEEK_CUR:
+		state->pos += offset;
+		break;
+	case SEEK_END:
+		state->pos = state->size + offset;
+		break;
+	}
+	return (int)state->pos;
+}
+
+/* savestate sizes vary wildly depending if cd/32x or
+ * carthw is active, so run the whole thing to get size */
 size_t retro_serialize_size(void) 
 { 
-       return 0;
+	struct savestate_state state = { 0, };
+	int ret;
+
+	ret = PicoStateFP(&state, 1, NULL, state_skip, NULL, state_fseek);
+	if (ret != 0)
+		return 0;
+
+	return state.pos;
 }
 
 bool retro_serialize(void *data, size_t size)
 { 
-       return false;
+	struct savestate_state state = { 0, };
+	int ret;
+
+	state.save_buf = data;
+	state.size = size;
+	state.pos = 0;
+
+	ret = PicoStateFP(&state, 1, NULL, state_write,
+		NULL, state_fseek);
+	return ret == 0;
 }
 
 bool retro_unserialize(const void *data, size_t size)
 {
-       return false;
+	struct savestate_state state = { 0, };
+	int ret;
+
+	state.load_buf = data;
+	state.size = size;
+	state.pos = 0;
+
+	ret = PicoStateFP(&state, 0, state_read, NULL,
+		state_eof, state_fseek);
+	return ret == 0;
 }
 
 /* cheats - TODO */
@@ -609,15 +709,12 @@ void retro_init(void)
 	PicoAutoRgnOrder = 0x184; // US, EU, JP
 	PicoCDBuffers = 0;
 
-	p32x_msh2_multiplier = MSH2_MULTI_DEFAULT;
-	p32x_ssh2_multiplier = SSH2_MULTI_DEFAULT;
-
 	vout_width = 320;
 	vout_height = 240;
 	vout_buf = malloc(VOUT_MAX_WIDTH * VOUT_MAX_HEIGHT * 2);
 
 	PicoInit();
-	PicoDrawSetOutFormat(PDF_RGB555, 1);
+	PicoDrawSetOutFormat(PDF_RGB555, 0);
 	PicoDrawSetOutBuf(vout_buf, vout_width * 2);
 
 	//PicoMessage = plat_status_msg_busy_next;