X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FPico.c;h=6f9ed4bad6b9b10d7ac57b009252e6e17809a380;hb=83c093a48ab58670ea82d0ec81658daa9f9b950a;hp=e6a3b296339f54c4dcb721e3dc0c44127d94359a;hpb=a12e01162349cd970e9b6fe5674497760631279b;p=picodrive.git diff --git a/Pico/Pico.c b/Pico/Pico.c index e6a3b29..6f9ed4b 100644 --- a/Pico/Pico.c +++ b/Pico/Pico.c @@ -8,7 +8,6 @@ #include "PicoInt.h" -#include "sound/sound.h" #include "sound/ym2612.h" int PicoVer=0x0110; @@ -218,8 +217,8 @@ static int dma_bsycles[] = { (488<<8)/9, (488<<8)/18, (488<<8)/17, (488<<8)/9 }; -//static -int CheckDMA(void) + +PICO_INTERNAL int CheckDMA(void) { int burn = 0, bytes_can = 0, dma_op = Pico.video.reg[0x17]>>6; // see gens for 00 and 01 modes int bytes = Pico.m.dma_bytes; @@ -459,19 +458,9 @@ static void PicoRunZ80Simple(int line_from, int line_to) { int line_from_r=line_from, line_to_r=line_to, line = line_from; int line_sample = Pico.m.pal ? 68 : 93; - extern const unsigned short vcounts[]; if(!(PicoOpt&4) || Pico.m.z80Run == 0) { line_from_r = line_to_r; line_to_r = 0; } - if(z80startCycle != 0x01000000) { - line_from_r = vcounts[z80startCycle>>8]+1; - z80startCycle = 0x01000000; - } - if(z80stopCycle != 0x01000000) { - line_to_r = vcounts[z80stopCycle>>8]+1; - z80stopCycle = 0x01000000; - } - if(PicoOpt&1) { // we have ym2612 enabled, so we have to run Z80 in lines, so we could update DAC and timers for(; line < line_to; line++) { @@ -689,6 +678,7 @@ char *debugString(void) dstrp+=strlen(dstrp); sprintf(dstrp, "scroll size: w: %i, h: %i SRAM: %i; eeprom: %i\n", reg[0x10]&3, (reg[0x10]&0x30)>>4, bit(Pico.m.sram_reg, 4), bit(Pico.m.sram_reg, 2)); dstrp+=strlen(dstrp); + sprintf(dstrp, "sram range: %06x-%06x, reg: %02x\n", SRam.start, SRam.end, Pico.m.sram_reg); dstrp+=strlen(dstrp); sprintf(dstrp, "pend int: v:%i, h:%i, vdp status: %04x\n", bit(pv->pending_ints,5), bit(pv->pending_ints,4), pv->status); dstrp+=strlen(dstrp); #ifdef EMU_C68K