diff options
author | hizzlekizzle | 2019-08-03 08:33:29 -0500 |
---|---|---|
committer | GitHub | 2019-08-03 08:33:29 -0500 |
commit | 0c510f87cbd5c7089e66ab09ffb7570073c1f63c (patch) | |
tree | 99b4ed96c372825a41018465bfddf907a48084ad /libpcsxcore/psxbios.c | |
parent | fcb84f0c6ad095c355d8c0835fc6c5fcdc2a6813 (diff) | |
parent | e6f1e7f70c3ee3816e417f97aef1501a1f950976 (diff) | |
download | pcsx_rearmed-0c510f87cbd5c7089e66ab09ffb7570073c1f63c.tar.gz pcsx_rearmed-0c510f87cbd5c7089e66ab09ffb7570073c1f63c.tar.bz2 pcsx_rearmed-0c510f87cbd5c7089e66ab09ffb7570073c1f63c.zip |
Merge pull request #326 from retro-wertz/silence_warnings
silence warnings and a few core fixes
Diffstat (limited to 'libpcsxcore/psxbios.c')
-rw-r--r-- | libpcsxcore/psxbios.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/libpcsxcore/psxbios.c b/libpcsxcore/psxbios.c index 388d606..0121a7b 100644 --- a/libpcsxcore/psxbios.c +++ b/libpcsxcore/psxbios.c @@ -347,6 +347,7 @@ static inline void LoadRegs() { ptr = Mcd##mcd##Data + offset; \ memcpy(ptr, Ra1, length); \ FDesc[1 + mcd].offset += length; \ + SaveMcd(Config.Mcd##mcd, Mcd##mcd##Data, offset, length); \ if (FDesc[1 + mcd].mode & 0x8000) { \ DeliverEvent(0x11, 0x2); /* 0xf0000011, 0x0004 */ \ DeliverEvent(0x81, 0x2); /* 0xf4000001, 0x0004 */ \ @@ -2025,17 +2026,18 @@ void psxBios_UnDeliverEvent() { // 0x20 char ffile[64], *pfile; int nfile; -static void buopen(int mcd, u8 *ptr, u8 *cfg) + +static void buopen(int mcd, char *ptr, char *cfg) { int i; - u8 *fptr = ptr; + char *mcd_data = ptr; strcpy(FDesc[1 + mcd].name, Ra0+5); FDesc[1 + mcd].offset = 0; FDesc[1 + mcd].mode = a1; for (i=1; i<16; i++) { - fptr += 128; + const char *fptr = mcd_data + 128 * i; if ((*fptr & 0xF0) != 0x50) continue; if (strcmp(FDesc[1 + mcd].name, fptr+0xa)) continue; FDesc[1 + mcd].mcfile = i; @@ -2044,12 +2046,11 @@ static void buopen(int mcd, u8 *ptr, u8 *cfg) break; } if (a1 & 0x200 && v0 == -1) { /* FCREAT */ - fptr = ptr; for (i=1; i<16; i++) { int j, xor, nblk = a1 >> 16; - u8 *pptr, *fptr2; + char *pptr, *fptr2; + char *fptr = mcd_data + 128 * i; - fptr += 128; if ((*fptr & 0xF0) != 0xa0) continue; FDesc[1 + mcd].mcfile = i; @@ -2094,8 +2095,6 @@ static void buopen(int mcd, u8 *ptr, u8 *cfg) */ void psxBios_open() { // 0x32 - int i; - char *ptr; void *pa0 = Ra0; #ifdef PSXBIOS_LOG |