X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fmisc.c;h=6853e30ee726a88032208e6e4c20832d9d91a2f3;hb=e00f508524e343b3494155b724d60deafa2c9c81;hp=e3d227ab713fbb4567c34a6be036ae11b9ca9846;hpb=0a2601833173a2516afb4d87f1157b59e55e96f1;p=pcsx_rearmed.git

diff --git a/libpcsxcore/misc.c b/libpcsxcore/misc.c
index e3d227ab..6853e30e 100644
--- a/libpcsxcore/misc.c
+++ b/libpcsxcore/misc.c
@@ -28,6 +28,7 @@
 #include "gpu.h"
 #include "ppf.h"
 #include "database.h"
+#include "lightrec/plugin.h"
 #include <zlib.h>
 
 char CdromId[10] = "";
@@ -55,10 +56,11 @@ struct iso_directory_record {
 	char name			[1];
 };
 
-void mmssdd( char *b, char *p )
+static void mmssdd( char *b, char *p )
 {
 	int m, s, d;
-	int block = SWAP32(*((uint32_t*) b));
+	unsigned char *ub = (void *)b;
+	int block = (ub[3] << 24) | (ub[2] << 16) | (ub[1] << 8) | ub[0];
 
 	block += 150;
 	m = block / 4500;			// minutes
@@ -89,7 +91,7 @@ void mmssdd( char *b, char *p )
 	time[0] = itob(time[0]); time[1] = itob(time[1]); time[2] = itob(time[2]);
 
 #define READTRACK() \
-	if (CDR_readTrack(time) == -1) return -1; \
+	if (!CDR_readTrack(time)) return -1; \
 	buf = (void *)CDR_getBuffer(); \
 	if (buf == NULL) return -1; \
 	else CheckPPFCache((u8 *)buf, time[0], time[1], time[2]);
@@ -596,15 +598,6 @@ static const char PcsxHeader[32] = "STv4 PCSX v" PCSX_VERSION;
 // If you make changes to the savestate version, please increment the value below.
 static const u32 SaveVersion = 0x8b410006;
 
-static int drc_is_lightrec(void)
-{
-#if defined(LIGHTREC)
-	return 1;
-#else
-	return 0;
-#endif
-}
-
 int SaveState(const char *file) {
 	void *f;
 	GPUFreeze_t *gpufP;