diff options
| author | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-05-08 08:07:45 +0000 |
|---|---|---|
| committer | SND\weimingzhi_cp <SND\weimingzhi_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97> | 2010-05-08 08:07:45 +0000 |
| commit | 85cb5305c337de06976d1a3257864a3ee05ec50a (patch) | |
| tree | fff0cba7974c20c3c992e15cf08b037aca72f017 /libpcsxcore/misc.c | |
| parent | 0abc3643dd620150c4fec7f70cbd32b7d7177c97 (diff) | |
| download | pcsxr-85cb5305c337de06976d1a3257864a3ee05ec50a.tar.gz | |
got rid of 0x80000000 flag in psxRegs.interrupt. such flag doesn't seem to exist in other emus and not likely in real hardware either.
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@47625 e17a0e51-4ae3-4d35-97c3-1a29b211df97
Diffstat (limited to 'libpcsxcore/misc.c')
| -rw-r--r-- | libpcsxcore/misc.c | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/libpcsxcore/misc.c b/libpcsxcore/misc.c index 0d801f7b..e9a069dd 100644 --- a/libpcsxcore/misc.c +++ b/libpcsxcore/misc.c @@ -29,7 +29,7 @@ char CdromId[10] = ""; char CdromLabel[33] = ""; -/* PSX Executable types */ +// PSX Executable types #define PSX_EXE 1 #define CPE_EXE 2 #define COFF_EXE 3 @@ -52,24 +52,24 @@ struct iso_directory_record { }; void mmssdd( char *b, char *p ) - { +{ int m, s, d; #if defined(__BIGENDIAN__) - int block = (b[0]&0xff) | ((b[1]&0xff)<<8) | ((b[2]&0xff)<<16) | (b[3]<<24); + int block = (b[0] & 0xff) | ((b[1] & 0xff) << 8) | ((b[2] & 0xff) << 16) | (b[3] << 24); #else int block = *((int*)b); #endif - + block += 150; - m = block / 4500; // minuten - block = block - m * 4500; // minuten rest - s = block / 75; // sekunden - d = block - s * 75; // sekunden rest - - m = ( ( m / 10 ) << 4 ) | m % 10; - s = ( ( s / 10 ) << 4 ) | s % 10; - d = ( ( d / 10 ) << 4 ) | d % 10; - + m = block / 4500; // minutes + block = block - m * 4500; // minutes rest + s = block / 75; // seconds + d = block - s * 75; // seconds rest + + m = ((m / 10) << 4) | m % 10; + s = ((s / 10) << 4) | s % 10; + d = ((d / 10) << 4) | d % 10; + p[0] = m; p[1] = s; p[2] = d; @@ -95,11 +95,11 @@ void mmssdd( char *b, char *p ) #define READDIR(_dir) \ READTRACK(); \ - memcpy(_dir, buf+12, 2048); \ + memcpy(_dir, buf + 12, 2048); \ \ incTime(); \ READTRACK(); \ - memcpy(_dir+2048, buf+12, 2048); + memcpy(_dir + 2048, buf + 12, 2048); int GetCdromFile(u8 *mdir, u8 *time, s8 *filename) { struct iso_directory_record *dir; @@ -223,7 +223,7 @@ int LoadCdrom() { return 0; } -int LoadCdromFile(char *filename, EXE_HEADER *head) { +int LoadCdromFile(const char *filename, EXE_HEADER *head) { struct iso_directory_record *dir; u8 time[4],*buf; u8 mdir[4096], exename[256]; @@ -372,7 +372,7 @@ static int PSXGetFileType(FILE *f) { return INVALID_EXE; } -int Load(char *ExePath) { +int Load(const char *ExePath) { FILE *tmpFile; EXE_HEADER tmpHead; int type; @@ -454,7 +454,7 @@ int Load(char *ExePath) { const char PcsxHeader[32] = "STv3 PCSX v" PACKAGE_VERSION; -int SaveState(char *file) { +int SaveState(const char *file) { gzFile f; GPUFreeze_t *gpufP; SPUFreeze_t *spufP; @@ -464,7 +464,7 @@ int SaveState(char *file) { f = gzopen(file, "wb"); if (f == NULL) return -1; - gzwrite(f, (void*)PcsxHeader, 32); + gzwrite(f, (const void *)PcsxHeader, 32); pMem = (unsigned char *)malloc(128 * 96 * 3); if (pMem == NULL) return -1; @@ -508,7 +508,7 @@ int SaveState(char *file) { return 0; } -int LoadState(char *file) { +int LoadState(const char *file) { gzFile f; GPUFreeze_t *gpufP; SPUFreeze_t *spufP; @@ -558,7 +558,7 @@ int LoadState(char *file) { return 0; } -int CheckState(char *file) { +int CheckState(const char *file) { gzFile f; char header[32]; |
