X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2Fcd%2Fbuffering.c;h=205e7777dcdd95f5cc5d3e7d5a633e19d8e51108;hb=583ab72c0b42549235191fd4fad239074dd896af;hp=f53db11e2189ac5099b12987fe5a4d0f2ef23ff6;hpb=6cadc2da0070781cf2d8fcff84265d3ca1f423b9;p=picodrive.git

diff --git a/Pico/cd/buffering.c b/Pico/cd/buffering.c
index f53db11..205e777 100644
--- a/Pico/cd/buffering.c
+++ b/Pico/cd/buffering.c
@@ -3,8 +3,6 @@
 
 #include "../PicoInt.h"
 
-//#include <stdlib.h>
-
 int PicoCDBuffers = 0;
 static unsigned char *cd_buffer = NULL;
 static int prev_lba = 0x80000000;
@@ -27,7 +25,7 @@ void PicoCDBufferInit(void)
 	/* try alloc'ing until we succeed */
 	while (PicoCDBuffers > 0)
 	{
-		tmp = realloc(cd_buffer, PicoCDBuffers * 2048);
+		tmp = realloc(cd_buffer, PicoCDBuffers * 2048 + 304);
 		if (tmp != NULL) break;
 		PicoCDBuffers >>= 1;
 	}
@@ -45,12 +43,12 @@ void PicoCDBufferFree(void)
 		cd_buffer = NULL;
 	}
 	if (reads)
-		printf("CD buffer hits: %i/%i (%i%%)\n", hits, reads, hits * 100 / reads);
+		elprintf(EL_STATUS, "CD buffer hits: %i/%i (%i%%)\n", hits, reads, hits * 100 / reads);
 }
 
 
 /* this is a try to fight slow SD access of GP2X */
-void PicoCDBufferRead(void *dest, int lba)
+PICO_INTERNAL void PicoCDBufferRead(void *dest, int lba)
 {
 	int is_bin, offs, read_len, moved = 0;
 	reads++;
@@ -104,12 +102,22 @@ void PicoCDBufferRead(void *dest, int lba)
 
 	if (is_bin)
 	{
-		int i;
-		for (i = 0; i < read_len; i++)
+		int i = 0;
+#if REDUCE_IO_CALLS
+		int bufs = (read_len*2048) / (2048+304);
+		pm_read(cd_buffer, bufs*(2048+304), Pico_mcd->TOC.Tracks[0].F);
+		for (i = 1; i < bufs; i++)
+			// should really use memmove here, but my memcpy32 implementation is also suitable here
+			memcpy32((int *)(cd_buffer + i*2048), (int *)(cd_buffer + i*(2048+304)), 2048/4);
+#endif
+		for (; i < read_len - 1; i++)
 		{
-			pm_read(cd_buffer + i*2048, 2048, Pico_mcd->TOC.Tracks[0].F);
-			pm_seek(Pico_mcd->TOC.Tracks[0].F, 304, SEEK_CUR);
+			pm_read(cd_buffer + i*2048, 2048 + 304, Pico_mcd->TOC.Tracks[0].F);
+			// pm_seek(Pico_mcd->TOC.Tracks[0].F, 304, SEEK_CUR); // seeking is slower, in PSP case even more
 		}
+		// further data might be moved, do not overwrite
+		pm_read(cd_buffer + i*2048, 2048, Pico_mcd->TOC.Tracks[0].F);
+		pm_seek(Pico_mcd->TOC.Tracks[0].F, 304, SEEK_CUR);
 	}
 	else
 	{