notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drc: disable some weird code
[pcsx_rearmed.git]
/
libpcsxcore
/
sio.c
diff --git
a/libpcsxcore/sio.c
b/libpcsxcore/sio.c
index
977c71d
..
6478338
100644
(file)
--- a/
libpcsxcore/sio.c
+++ b/
libpcsxcore/sio.c
@@
-24,6
+24,10
@@
#include "sio.h"
#include <sys/stat.h>
#include "sio.h"
#include <sys/stat.h>
+#ifdef USE_LIBRETRO_VFS
+#include <streams/file_stream_transforms.h>
+#endif
+
// Status Flags
#define TX_RDY 0x0001
#define RX_RDY 0x0002
// Status Flags
#define TX_RDY 0x0001
#define RX_RDY 0x0002
@@
-48,7
+52,8
@@
// *** FOR WORKS ON PADS AND MEMORY CARDS *****
static unsigned char buf[256];
// *** FOR WORKS ON PADS AND MEMORY CARDS *****
static unsigned char buf[256];
-unsigned char cardh[4] = { 0x00, 0x00, 0x5a, 0x5d };
+static unsigned char cardh1[4] = { 0xff, 0x08, 0x5a, 0x5d };
+static unsigned char cardh2[4] = { 0xff, 0x08, 0x5a, 0x5d };
// Transfer Ready and the Buffer is Empty
// static unsigned short StatReg = 0x002b;
// Transfer Ready and the Buffer is Empty
// static unsigned short StatReg = 0x002b;
@@
-64,24
+69,26
@@
static unsigned char adrH, adrL;
static unsigned int padst;
char Mcd1Data[MCD_SIZE], Mcd2Data[MCD_SIZE];
static unsigned int padst;
char Mcd1Data[MCD_SIZE], Mcd2Data[MCD_SIZE];
+char McdDisable[2];
+
+#define SIO_INT(eCycle) { \
+ psxRegs.interrupt |= (1 << PSXINT_SIO); \
+ psxRegs.intCycle[PSXINT_SIO].cycle = eCycle; \
+ psxRegs.intCycle[PSXINT_SIO].sCycle = psxRegs.cycle; \
+ new_dyna_set_event(PSXINT_SIO, eCycle); \
+}
// clk cycle byte
// 4us * 8bits = (PSXCLK / 1000000) * 32; (linuzappz)
// TODO: add SioModePrescaler and BaudReg
// clk cycle byte
// 4us * 8bits = (PSXCLK / 1000000) * 32; (linuzappz)
// TODO: add SioModePrescaler and BaudReg
-static inline void SIO_INT() {
- if (!Config.Sio) {
- psxRegs.interrupt |= 0x80;
- psxRegs.intCycle[7 + 1] = 400;
- psxRegs.intCycle[7] = psxRegs.cycle;
- }
-}
+#define SIO_CYCLES 535
void sioWrite8(unsigned char value) {
#ifdef PAD_LOG
PAD_LOG("sio write8 %x\n", value);
#endif
switch (padst) {
void sioWrite8(unsigned char value) {
#ifdef PAD_LOG
PAD_LOG("sio write8 %x\n", value);
#endif
switch (padst) {
- case 1: SIO_INT();
+ case 1: SIO_INT(
SIO_CYCLES
);
if ((value & 0x40) == 0x40) {
padst = 2; parp = 1;
if (!Config.UseNet) {
if ((value & 0x40) == 0x40) {
padst = 2; parp = 1;
if (!Config.UseNet) {
@@
-119,7
+126,7
@@
void sioWrite8(unsigned char value) {
parp++;
/* if (buf[1] == 0x45) {
buf[parp] = 0;
parp++;
/* if (buf[1] == 0x45) {
buf[parp] = 0;
- SIO_INT();
+ SIO_INT(
SIO_CYCLES
);
return;
}*/
if (!Config.UseNet) {
return;
}*/
if (!Config.UseNet) {
@@
-130,13
+137,13
@@
void sioWrite8(unsigned char value) {
}
if (parp == bufcount) { padst = 0; return; }
}
if (parp == bufcount) { padst = 0; return; }
- SIO_INT();
+ SIO_INT(
SIO_CYCLES
);
return;
}
switch (mcdst) {
case 1:
return;
}
switch (mcdst) {
case 1:
- SIO_INT();
+ SIO_INT(
SIO_CYCLES
);
if (rdwr) { parp++; return; }
parp = 1;
switch (value) {
if (rdwr) { parp++; return; }
parp = 1;
switch (value) {
@@
-146,7
+153,7
@@
void sioWrite8(unsigned char value) {
}
return;
case 2: // address H
}
return;
case 2: // address H
- SIO_INT();
+ SIO_INT(
SIO_CYCLES
);
adrH = value;
*buf = 0;
parp = 0;
adrH = value;
*buf = 0;
parp = 0;
@@
-154,7
+161,7
@@
void sioWrite8(unsigned char value) {
mcdst = 3;
return;
case 3: // address L
mcdst = 3;
return;
case 3: // address L
- SIO_INT();
+ SIO_INT(
SIO_CYCLES
);
adrL = value;
*buf = adrH;
parp = 0;
adrL = value;
*buf = adrH;
parp = 0;
@@
-162,7
+169,7
@@
void sioWrite8(unsigned char value) {
mcdst = 4;
return;
case 4:
mcdst = 4;
return;
case 4:
- SIO_INT();
+ SIO_INT(
SIO_CYCLES
);
parp = 0;
switch (rdwr) {
case 1: // read
parp = 0;
switch (rdwr) {
case 1: // read
@@
-201,10
+208,18
@@
void sioWrite8(unsigned char value) {
return;
case 5:
parp++;
return;
case 5:
parp++;
+ if ((rdwr == 1 && parp == 132) ||
+ (rdwr == 2 && parp == 129)) {
+ // clear "new card" flags
+ if (CtrlReg & 0x2000)
+ cardh2[1] &= ~8;
+ else
+ cardh1[1] &= ~8;
+ }
if (rdwr == 2) {
if (parp < 128) buf[parp + 1] = value;
}
if (rdwr == 2) {
if (parp < 128) buf[parp + 1] = value;
}
- SIO_INT();
+ SIO_INT(
SIO_CYCLES
);
return;
}
return;
}
@@
-252,16
+267,34
@@
void sioWrite8(unsigned char value) {
bufcount = 2;
parp = 0;
padst = 1;
bufcount = 2;
parp = 0;
padst = 1;
- SIO_INT();
+ SIO_INT(
SIO_CYCLES
);
return;
case 0x81: // start memcard
return;
case 0x81: // start memcard
+ if (CtrlReg & 0x2000)
+ {
+ if (McdDisable[1])
+ goto no_device;
+ memcpy(buf, cardh2, 4);
+ }
+ else
+ {
+ if (McdDisable[0])
+ goto no_device;
+ memcpy(buf, cardh1, 4);
+ }
StatReg |= RX_RDY;
StatReg |= RX_RDY;
- memcpy(buf, cardh, 4);
parp = 0;
bufcount = 3;
mcdst = 1;
rdwr = 0;
parp = 0;
bufcount = 3;
mcdst = 1;
rdwr = 0;
- SIO_INT();
+ SIO_INT(SIO_CYCLES);
+ return;
+ default:
+ no_device:
+ StatReg |= RX_RDY;
+ buf[0] = 0xff;
+ parp = 0;
+ bufcount = 0;
return;
}
}
return;
}
}
@@
-276,10
+309,10
@@
void sioWriteMode16(unsigned short value) {
void sioWriteCtrl16(unsigned short value) {
CtrlReg = value & ~RESET_ERR;
if (value & RESET_ERR) StatReg &= ~IRQ;
void sioWriteCtrl16(unsigned short value) {
CtrlReg = value & ~RESET_ERR;
if (value & RESET_ERR) StatReg &= ~IRQ;
- if ((CtrlReg & SIO_RESET) ||
(!CtrlReg
)) {
+ if ((CtrlReg & SIO_RESET) ||
!(CtrlReg & DTR
)) {
padst = 0; mcdst = 0; parp = 0;
StatReg = TX_RDY | TX_EMPTY;
padst = 0; mcdst = 0; parp = 0;
StatReg = TX_RDY | TX_EMPTY;
- psxRegs.interrupt &= ~
0x80
;
+ psxRegs.interrupt &= ~
(1 << PSXINT_SIO)
;
}
}
}
}
@@
-355,21
+388,42
@@
void sioInterrupt() {
PAD_LOG("Sio Interrupt (CP0.Status = %x)\n", psxRegs.CP0.n.Status);
#endif
// SysPrintf("Sio Interrupt\n");
PAD_LOG("Sio Interrupt (CP0.Status = %x)\n", psxRegs.CP0.n.Status);
#endif
// SysPrintf("Sio Interrupt\n");
- StatReg |= IRQ;
- psxHu32ref(0x1070) |= SWAPu32(0x80);
+ if (!(StatReg & IRQ)) {
+ StatReg |= IRQ;
+ psxHu32ref(0x1070) |= SWAPu32(0x80);
+ }
}
void LoadMcd(int mcd, char *str) {
FILE *f;
char *data = NULL;
}
void LoadMcd(int mcd, char *str) {
FILE *f;
char *data = NULL;
- if (mcd == 1) data = Mcd1Data;
- if (mcd == 2) data = Mcd2Data;
+ if (mcd != 1 && mcd != 2)
+ return;
+
+ if (mcd == 1) {
+ data = Mcd1Data;
+ cardh1[1] |= 8; // mark as new
+ }
+ if (mcd == 2) {
+ data = Mcd2Data;
+ cardh2[1] |= 8;
+ }
+
+ McdDisable[mcd - 1] = 0;
+#ifdef HAVE_LIBRETRO
+ // memcard1 is handled by libretro
+ if (mcd == 1)
+ return;
+#endif
- if (
*str
== 0) {
-
sprintf(str, "memcards/card%d.mcd", mcd)
;
-
SysPrintf(_("No memory card value was specified - creating a default card %s\n"), str)
;
+ if (
str == NULL || strcmp(str, "none")
== 0) {
+
McdDisable[mcd - 1] = 1
;
+
return
;
}
}
+ if (*str == 0)
+ return;
+
f = fopen(str, "rb");
if (f == NULL) {
SysPrintf(_("The memory card %s doesn't exist - creating it\n"), str);
f = fopen(str, "rb");
if (f == NULL) {
SysPrintf(_("The memory card %s doesn't exist - creating it\n"), str);
@@
-384,7
+438,12
@@
void LoadMcd(int mcd, char *str) {
else if(buf.st_size == MCD_SIZE + 3904)
fseek(f, 3904, SEEK_SET);
}
else if(buf.st_size == MCD_SIZE + 3904)
fseek(f, 3904, SEEK_SET);
}
- fread(data, 1, MCD_SIZE, f);
+ if (fread(data, 1, MCD_SIZE, f) != MCD_SIZE) {
+#ifndef NDEBUG
+ SysPrintf(_("File IO error in <%s:%s>.\n"), __FILE__, __func__);
+#endif
+ memset(data, 0x00, MCD_SIZE);
+ }
fclose(f);
}
else
fclose(f);
}
else
@@
-399,7
+458,12
@@
void LoadMcd(int mcd, char *str) {
else if(buf.st_size == MCD_SIZE + 3904)
fseek(f, 3904, SEEK_SET);
}
else if(buf.st_size == MCD_SIZE + 3904)
fseek(f, 3904, SEEK_SET);
}
- fread(data, 1, MCD_SIZE, f);
+ if (fread(data, 1, MCD_SIZE, f) != MCD_SIZE) {
+#ifndef NDEBUG
+ SysPrintf(_("File IO error in <%s:%s>.\n"), __FILE__, __func__);
+#endif
+ memset(data, 0x00, MCD_SIZE);
+ }
fclose(f);
}
}
fclose(f);
}
}
@@
-412,6
+476,9
@@
void LoadMcds(char *mcd1, char *mcd2) {
void SaveMcd(char *mcd, char *data, uint32_t adr, int size) {
FILE *f;
void SaveMcd(char *mcd, char *data, uint32_t adr, int size) {
FILE *f;
+ if (mcd == NULL || *mcd == 0 || strcmp(mcd, "none") == 0)
+ return;
+
f = fopen(mcd, "r+b");
if (f != NULL) {
struct stat buf;
f = fopen(mcd, "r+b");
if (f != NULL) {
struct stat buf;
@@
-670,13
+737,19
@@
void ConvertMcd(char *mcd, char *data) {
}
void GetMcdBlockInfo(int mcd, int block, McdBlock *Info) {
}
void GetMcdBlockInfo(int mcd, int block, McdBlock *Info) {
-
unsigned
char *data = NULL, *ptr, *str, *sstr;
+ char *data = NULL, *ptr, *str, *sstr;
unsigned short clut[16];
unsigned short c;
int i, x;
memset(Info, 0, sizeof(McdBlock));
unsigned short clut[16];
unsigned short c;
int i, x;
memset(Info, 0, sizeof(McdBlock));
+ if (mcd != 1 && mcd != 2)
+ return;
+
+ if (McdDisable[mcd - 1])
+ return;
+
if (mcd == 1) data = Mcd1Data;
if (mcd == 2) data = Mcd2Data;
if (mcd == 1) data = Mcd1Data;
if (mcd == 2) data = Mcd2Data;
@@
-757,7
+830,7
@@
void GetMcdBlockInfo(int mcd, int block, McdBlock *Info) {
strncpy(Info->Name, ptr, 16);
}
strncpy(Info->Name, ptr, 16);
}
-int sioFreeze(
gzFile
f, int Mode) {
+int sioFreeze(
void *
f, int Mode) {
gzfreeze(buf, sizeof(buf));
gzfreeze(&StatReg, sizeof(StatReg));
gzfreeze(&ModeReg, sizeof(ModeReg));
gzfreeze(buf, sizeof(buf));
gzfreeze(&StatReg, sizeof(StatReg));
gzfreeze(&ModeReg, sizeof(ModeReg));