github.com/captain-amygdala.pistorm
1
0
Fork 0
mirror of https://github.com/captain-amygdala/pistorm.git synced 2026-01-13 15:18:06 +00:00
Code Issues Projects Releases Wiki Activity

[HAX] Fix old-new IRQ behavior a bit?

Browse Source
This commit is contained in:
beeanyew 2021-06-20 18:00:31 +02:00
parent bab7a847c0
commit b7f62f8e5d
2 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
emulator.c
View File

@ -200,8 +200,12 @@ cpu_loop:
m68k_execute(1);
}
else {
if (cpu_emulation_running)
m68k_execute(loop_cycles);
if (cpu_emulation_running) {
if (irq)
m68k_execute(5);
else
m68k_execute(loop_cycles);
}
}
if (irq) {
@ -672,8 +676,7 @@ static inline void inline_write_16(unsigned int address, unsigned int data) {
*(gpio + 1) = GPFSEL1_INPUT;
*(gpio + 2) = GPFSEL2_INPUT;
while (*(gpio + 13) & (1 << PIN_TXN_IN_PROGRESS))
;
while (*(gpio + 13) & (1 << PIN_TXN_IN_PROGRESS)) {}
}
static inline void inline_write_8(unsigned int address, unsigned int data) {
@ -705,8 +708,7 @@ static inline void inline_write_8(unsigned int address, unsigned int data) {
*(gpio + 1) = GPFSEL1_INPUT;
*(gpio + 2) = GPFSEL2_INPUT;
while (*(gpio + 13) & (1 << PIN_TXN_IN_PROGRESS))
;
while (*(gpio + 13) & (1 << PIN_TXN_IN_PROGRESS)) {}
}
static inline void inline_write_32(unsigned int address, unsigned int value) {
@ -736,9 +738,8 @@ static inline unsigned int inline_read_16(unsigned int address) {
*(gpio + 7) = (REG_DATA << PIN_A0);
*(gpio + 7) = 1 << PIN_RD;
while (*(gpio + 13) & (1 << PIN_TXN_IN_PROGRESS)) {}
unsigned int value = *(gpio + 13);
while ((value=*(gpio + 13)) & (1 << PIN_TXN_IN_PROGRESS))
;
*(gpio + 10) = 0xffffec;
@ -767,9 +768,8 @@ static inline unsigned int inline_read_8(unsigned int address) {
*(gpio + 7) = (REG_DATA << PIN_A0);
*(gpio + 7) = 1 << PIN_RD;
while (*(gpio + 13) & (1 << PIN_TXN_IN_PROGRESS)) {}
unsigned int value = *(gpio + 13);
while ((value=*(gpio + 13)) & (1 << PIN_TXN_IN_PROGRESS))
;
*(gpio + 10) = 0xffffec;

12
gpio/ps_protocol.c
View File

@ -113,8 +113,7 @@ void ps_write_16(unsigned int address, unsigned int data) {
*(gpio + 1) = GPFSEL1_INPUT;
*(gpio + 2) = GPFSEL2_INPUT;
while (*(gpio + 13) & (1 << PIN_TXN_IN_PROGRESS))
;
while (*(gpio + 13) & (1 << PIN_TXN_IN_PROGRESS)) {}
}
void ps_write_8(unsigned int address, unsigned int data) {
@ -146,8 +145,7 @@ void ps_write_8(unsigned int address, unsigned int data) {
*(gpio + 1) = GPFSEL1_INPUT;
*(gpio + 2) = GPFSEL2_INPUT;
while (*(gpio + 13) & (1 << PIN_TXN_IN_PROGRESS))
;
while (*(gpio + 13) & (1 << PIN_TXN_IN_PROGRESS)) {}
}
void ps_write_32(unsigned int address, unsigned int value) {
@ -177,9 +175,8 @@ unsigned int ps_read_16(unsigned int address) {
*(gpio + 7) = (REG_DATA << PIN_A0);
*(gpio + 7) = 1 << PIN_RD;
while (*(gpio + 13) & (1 << PIN_TXN_IN_PROGRESS)) {}
unsigned int value = *(gpio + 13);
while ((value=*(gpio + 13)) & (1 << PIN_TXN_IN_PROGRESS))
;
*(gpio + 10) = 0xffffec;
@ -208,9 +205,8 @@ unsigned int ps_read_8(unsigned int address) {
*(gpio + 7) = (REG_DATA << PIN_A0);
*(gpio + 7) = 1 << PIN_RD;
while (*(gpio + 13) & (1 << PIN_TXN_IN_PROGRESS)) {}
unsigned int value = *(gpio + 13);
while ((value=*(gpio + 13)) & (1 << PIN_TXN_IN_PROGRESS))
;
*(gpio + 10) = 0xffffec;