RaySollium99/picodrive
1
0
Fork 0
mirror of https://github.com/RaySollium99/picodrive.git synced 2025-09-05 15:27:46 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

core vdp, more fixes for cpu write access and save/load

Browse source
This commit is contained in:
kub 2021-12-10 23:34:03 +01:00
parent b48d7de016
commit 22a548f512
1 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

21
pico/videoport.c
View file

@ -158,7 +158,7 @@ int (*PicoDmaHook)(u32 source, int len, unsigned short **base, u32 *mask) = NULL
* full total==4 * full total==4
* wait total>4 * wait total>4
* Conditions: * Conditions:
* fifo_slot is always behind slot2cyc[cycles]. Advancing it beyond cycles * fifo_slot is normally behind slot2cyc[cycles]. Advancing it beyond cycles
* implies blocking the 68k up to that slot. * implies blocking the 68k up to that slot.
* *
* A FIFO write goes to the end of the FIFO queue, but DMA running in background * A FIFO write goes to the end of the FIFO queue, but DMA running in background
@ -213,25 +213,23 @@ static __inline int AdvanceFIFOEntry(struct VdpFIFO *vf, struct PicoVideo *pv, i
if (!(vf->fifo_queue[vf->fifo_qx] & FQ_BGDMA)) if (!(vf->fifo_queue[vf->fifo_qx] & FQ_BGDMA))
vf->fifo_total -= ((cnt & b) + l) >> b; vf->fifo_total -= ((cnt & b) + l) >> b;
cnt -= l; cnt -= l;
pv->fifo_cnt = cnt;
// if entry has been processed... // if entry has been processed...
if (cnt == 0) { if (cnt == 0) {
// remove entry from FIFO // remove entry from FIFO
if (vf->fifo_ql) {
vf->fifo_queue[vf->fifo_qx] = 0; vf->fifo_queue[vf->fifo_qx] = 0;
vf->fifo_qx = (vf->fifo_qx+1) & 7, vf->fifo_ql --; vf->fifo_qx = (vf->fifo_qx+1) & 7, vf->fifo_ql --;
}
// start processing for next entry if there is one // start processing for next entry if there is one
if (vf->fifo_ql) { if (vf->fifo_ql) {
b = vf->fifo_queue[vf->fifo_qx] & FQ_BYTE; b = vf->fifo_queue[vf->fifo_qx] & FQ_BYTE;
cnt = (vf->fifo_queue[vf->fifo_qx] >> 3) << b; pv->fifo_cnt = (vf->fifo_queue[vf->fifo_qx] >> 3) << b;
} else { // FIFO empty } else { // FIFO empty
pv->status &= ~PVS_FIFORUN; pv->status &= ~PVS_FIFORUN;
vf->fifo_total = 0; vf->fifo_total = 0;
} }
} }
pv->fifo_cnt = cnt;
return l; return l;
} }
@ -363,9 +361,9 @@ int PicoVideoFIFOWrite(int count, int flags, unsigned sr_mask,unsigned sr_flags)
// XXX if interrupting a DMA fill, fill data changes // XXX if interrupting a DMA fill, fill data changes
if (x == vf->fifo_qx) { // overtaking to queue head? if (x == vf->fifo_qx) { // overtaking to queue head?
int f = vf->fifo_queue[x] & 7; int f = vf->fifo_queue[x] & 7;
vf->fifo_queue[(x+1) & 7] = (pv->fifo_cnt >> (f & FQ_BYTE) << 3) | f; vf->fifo_queue[x] = (pv->fifo_cnt >> (f & FQ_BYTE) << 3) | f;
pv->status &= ~PVS_FIFORUN; pv->status &= ~PVS_FIFORUN;
} else }
// push background DMA back // push background DMA back
vf->fifo_queue[(x+1) & 7] = vf->fifo_queue[x]; vf->fifo_queue[(x+1) & 7] = vf->fifo_queue[x];
x = (x-1) & 7; x = (x-1) & 7;
@ -1152,16 +1150,17 @@ void PicoVideoLoad(void)
// convert former dma_xfers (why was this in PicoMisc anyway?) // convert former dma_xfers (why was this in PicoMisc anyway?)
if (Pico.m.dma_xfers) { if (Pico.m.dma_xfers) {
pv->status |= SR_DMA; pv->status |= SR_DMA;
pv->fifo_cnt = Pico.m.dma_xfers * (b ? 2 : 1); pv->fifo_cnt = Pico.m.dma_xfers << b;
Pico.m.dma_xfers = 0; Pico.m.dma_xfers = 0;
} }
// make an entry in the FIFO if there are outstanding transfers // make an entry in the FIFO if there are outstanding transfers
vf->fifo_ql = vf->fifo_total = 0; vf->fifo_ql = vf->fifo_total = 0;
if (pv->fifo_cnt) { if (pv->fifo_cnt) {
pv->status |= PVS_FIFORUN|PVS_CPUWR; pv->status |= PVS_FIFORUN|PVS_CPUWR;
vf->fifo_total = (pv->fifo_cnt + (b)) >> b; if (!(pv->status & PVS_DMABG))
if (pv->status & SR_DMA) vf->fifo_total = (pv->fifo_cnt + b) >> b;
b |= (pv->status & (PVS_DMAFILL|PVS_DMABG)) ? FQ_BGDMA : FQ_FGDMA; if ((pv->status & SR_DMA) && !(pv->status & PVS_DMAFILL))
b |= (pv->status & PVS_DMABG) ? FQ_BGDMA : FQ_FGDMA;
vf->fifo_queue[vf->fifo_qx] = (vf->fifo_total << 3) | b; vf->fifo_queue[vf->fifo_qx] = (vf->fifo_total << 3) | b;
vf->fifo_ql = 1; vf->fifo_ql = 1;
} }