rearrange globals
[picodrive.git] / platform / psp / emu.c
index 77b20d1..8f77f39 100644 (file)
@@ -1,7 +1,10 @@
-// (c) Copyright 2007 notaz, All rights reserved.
-// Free for non-commercial use.
-
-// For commercial use, separate licencing terms must be obtained.
+/*
+ * PicoDrive
+ * (C) notaz, 2007,2008
+ *
+ * This work is licensed under the terms of MAME license.
+ * See COPYING file in the top-level directory.
+ */
 
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -33,7 +36,7 @@ int sceAudio_E0727056(int volume, void *buffer);      // blocking output
 int sceAudioOutput2GetRestSample();
 
 
-unsigned char *PicoDraw2FB = (unsigned char *)VRAM_CACHED_STUFF + 8; // +8 to be able to skip border with 1 quadword..
+//unsigned char *Draw2FB = (unsigned char *)VRAM_CACHED_STUFF + 8; // +8 to be able to skip border with 1 quadword..
 int engineStateSuspend;
 
 #define PICO_PEN_ADJUST_X 4
@@ -220,9 +223,9 @@ static void do_pal_update(int allow_sh, int allow_as)
                localPal[0xe0] = 0;
                localPal[0xf0] = 0x001f;
        }
-       else if (allow_as && (rendstatus & PDRAW_SPR_LO_ON_HI))
+       else if (allow_as && (Pico.est.rendstatus & PDRAW_SPR_LO_ON_HI))
        {
-               memcpy32((int *)dpal+0x80/2, (void *)localPal, 0x40*2/4);
+               memcpy(dpal + 0x80/2, localPal, 0x40*2);
        }
 }
 
@@ -239,15 +242,15 @@ static void do_slowmode_lines(int line_to)
 
 static void EmuScanPrepare(void)
 {
-       HighCol = (unsigned char *)VRAM_CACHED_STUFF + 8;
-       if (!(Pico.video.reg[1]&8)) HighCol += 8*512;
+       Pico.est.HighCol = (unsigned char *)VRAM_CACHED_STUFF + 8;
+       if (!(Pico.video.reg[1]&8)) Pico.est.HighCol += 8*512;
 
        if (dynamic_palette > 0)
                dynamic_palette--;
 
        if (Pico.m.dirtyPal)
                do_pal_update(1, 1);
-       if ((rendstatus & PDRAW_SPR_LO_ON_HI) && !(Pico.video.reg[0xC]&8))
+       if ((Pico.est.rendstatus & PDRAW_SPR_LO_ON_HI) && !(Pico.video.reg[0xC]&8))
             amips_clut_f = amips_clut_6bit;
        else amips_clut_f = amips_clut;
 }
@@ -255,7 +258,7 @@ static void EmuScanPrepare(void)
 static int EmuScanSlowBegin(unsigned int num)
 {
        if (!dynamic_palette)
-               HighCol = (unsigned char *)VRAM_CACHED_STUFF + num * 512 + 8;
+               Pico.est.HighCol = (unsigned char *)VRAM_CACHED_STUFF + num * 512 + 8;
 
        return 0;
 }
@@ -273,7 +276,7 @@ static int EmuScanSlowEnd(unsigned int num)
        if (dynamic_palette) {
                int line_len = (Pico.video.reg[12]&1) ? 320 : 256;
                void *dst = (char *)VRAM_STUFF + 512*240 + 512*2*num;
-               amips_clut_f(dst, HighCol + 8, localPal, line_len);
+               amips_clut_f(dst, Pico.est.HighCol + 8, localPal, line_len);
        }
 
        return 0;
@@ -306,7 +309,7 @@ static void blitscreen_clut(void)
                        blit_16bit_mode = 0;
                }
 
-               if ((PicoOpt&0x10) && Pico.m.dirtyPal)
+               if ((PicoIn.opt&0x10) && Pico.m.dirtyPal)
                        do_pal_update(0, 0);
 
                sceKernelDcacheWritebackAll();
@@ -392,18 +395,18 @@ static void dbg_text(void)
 /* called after rendering is done, but frame emulation is not finished */
 void blit1(void)
 {
-       if (PicoOpt&0x10)
+       if (PicoIn.opt&0x10)
        {
                int i;
                unsigned char *pd;
                // clear top and bottom trash
-               for (pd = PicoDraw2FB+8, i = 8; i > 0; i--, pd += 512)
+               for (pd = Pico.est.Draw2FB+8, i = 8; i > 0; i--, pd += 512)
                        memset32((int *)pd, 0xe0e0e0e0, 320/4);
-               for (pd = PicoDraw2FB+512*232+8, i = 8; i > 0; i--, pd += 512)
+               for (pd = Pico.est.Draw2FB+512*232+8, i = 8; i > 0; i--, pd += 512)
                        memset32((int *)pd, 0xe0e0e0e0, 320/4);
        }
 
-       if (PicoAHW & PAHW_PICO)
+       if (PicoIn.AHW & PAHW_PICO)
                draw_pico_ptr();
 
        blitscreen_clut();
@@ -421,7 +424,7 @@ static void blit2(const char *fps, const char *notice, int lagging_behind)
 
        //dbg_text();
 
-       if ((emu_opt & 0x400) && (PicoAHW & PAHW_MCD))
+       if ((emu_opt & 0x400) && (PicoIn.AHW & PAHW_MCD))
                cd_leds();
 
        if (currentConfig.EmuOpt & 0x2000) { // want vsync
@@ -466,8 +469,7 @@ static void vidResetMode(void)
 
        // slow rend.
        PicoDrawSetOutFormat(PDF_NONE, 0);
-       PicoScanBegin = EmuScanSlowBegin;
-       PicoScanEnd = EmuScanSlowEnd;
+       PicoDrawSetCallbacks(EmuScanSlowBegin, EmuScanSlowEnd);
 
        localPal[0xe0] = 0;
        localPal[0xf0] = 0x001f;
@@ -569,10 +571,10 @@ void pemu_sound_start(void)
 
        samples_made = samples_done = 0;
 
-       if (PsndRate != PsndRate_old || (PicoOpt&0x0b) != (PicoOpt_old&0x0b) || Pico.m.pal != pal_old) {
+       if (PsndRate != PsndRate_old || (PicoIn.opt&0x0b) != (PicoOpt_old&0x0b) || Pico.m.pal != pal_old) {
                PsndRerate(Pico.m.frame_count ? 1 : 0);
        }
-       stereo=(PicoOpt&8)>>3;
+       stereo=(PicoIn.opt&8)>>3;
 
        samples_block = Pico.m.pal ? SOUND_BLOCK_SIZE_PAL : SOUND_BLOCK_SIZE_NTSC;
        if (PsndRate <= 22050) samples_block /= 2;
@@ -595,7 +597,7 @@ void pemu_sound_start(void)
                samples_made = samples_block; // send 1 empty block first..
                PsndOut = sndBuffer;
                PsndRate_old = PsndRate;
-               PicoOpt_old  = PicoOpt;
+               PicoOpt_old  = PicoIn.opt;
                pal_old = Pico.m.pal;
        }
 }
@@ -638,9 +640,8 @@ static void sound_deinit(void)
 static void writeSound(int len)
 {
        int ret;
-       if (PicoOpt&8) len<<=1;
 
-       PsndOut += len;
+       PsndOut += len / 2;
        /*if (PsndOut > sndBuffer_endptr) {
                memcpy32((int *)(void *)sndBuffer, (int *)endptr, (PsndOut - endptr + 1) / 2);
                PsndOut = &sndBuffer[PsndOut - endptr];
@@ -652,7 +653,7 @@ static void writeSound(int len)
                PsndOut = sndBuffer;
 
        // signal the snd thread
-       samples_made += len;
+       samples_made += len / 2;
        if (samples_made - samples_done > samples_block*2) {
                // lprintf("signal, %i/%i\n", samples_done, samples_made);
                ret = sceKernelSignalSema(sound_sem, 1);
@@ -663,18 +664,20 @@ static void writeSound(int len)
 
 static void SkipFrame(void)
 {
-       PicoSkipFrame=1;
+       PicoIn.skipFrame=1;
        PicoFrame();
-       PicoSkipFrame=0;
+       PicoIn.skipFrame=0;
 }
 
-void pemu_forced_frame(int opts, int no_scale)
+void pemu_forced_frame(int no_scale, int do_emu)
 {
-       int po_old = PicoOpt;
+       int po_old = PicoIn.opt;
        int eo_old = currentConfig.EmuOpt;
 
-       PicoOpt &= ~0x10;
-       PicoOpt |= opts|POPT_ACC_SPRITES;
+       PicoIn.opt &= ~POPT_ALT_RENDERER;
+       PicoIn.opt |= POPT_ACC_SPRITES;
+       if (!no_scale)
+               PicoIn.opt |= POPT_EN_SOFTSCALE;
        currentConfig.EmuOpt |= 0x80;
 
        vidResetMode();
@@ -683,14 +686,13 @@ void pemu_forced_frame(int opts, int no_scale)
        memset32_uncached((int *)psp_screen + 512*264*2/4, 0, 512*8*2/4);
 
        PicoDrawSetOutFormat(PDF_NONE, 0);
-       PicoScanBegin = EmuScanSlowBegin;
-       PicoScanEnd = EmuScanSlowEnd;
+       PicoDrawSetCallbacks(EmuScanSlowBegin, EmuScanSlowEnd);
        EmuScanPrepare();
        PicoFrameDrawOnly();
        blit1();
        sceGuSync(0,0);
 
-       PicoOpt = po_old;
+       PicoIn.opt = po_old;
        currentConfig.EmuOpt = eo_old;
 }
 
@@ -701,7 +703,7 @@ static void RunEventsPico(unsigned int events, unsigned int keys)
 
        if (pico_inp_mode != 0)
        {
-               PicoPad[0] &= ~0x0f; // release UDLR
+               PicoIn.pad[0] &= ~0x0f; // release UDLR
                if (keys & PBTN_UP)   { pico_pen_y--; if (pico_pen_y < 8) pico_pen_y = 8; }
                if (keys & PBTN_DOWN) { pico_pen_y++; if (pico_pen_y > 224-PICO_PEN_ADJUST_Y) pico_pen_y = 224-PICO_PEN_ADJUST_Y; }
                if (keys & PBTN_LEFT) { pico_pen_x--; if (pico_pen_x < 0) pico_pen_x = 0; }
@@ -752,12 +754,12 @@ static void RunEvents(unsigned int which)
        }
        if (which & 0x0400) // switch renderer
        {
-               if (PicoOpt&0x10) { PicoOpt&=~0x10; currentConfig.EmuOpt |=  0x80; }
-               else              { PicoOpt|= 0x10; currentConfig.EmuOpt &= ~0x80; }
+               if (PicoIn.opt&0x10) { PicoIn.opt&=~0x10; currentConfig.EmuOpt |=  0x80; }
+               else              { PicoIn.opt|= 0x10; currentConfig.EmuOpt &= ~0x80; }
 
                vidResetMode();
 
-               if (PicoOpt & POPT_ALT_RENDERER)
+               if (PicoIn.opt & POPT_ALT_RENDERER)
                        emu_status_msg("fast renderer");
                else if (currentConfig.EmuOpt&0x80)
                        emu_status_msg("accurate renderer");
@@ -792,11 +794,11 @@ static void updateKeys(void)
 
        keys &= CONFIGURABLE_KEYS;
 
-       PicoPad[0] = allActions[0] & 0xfff;
-       PicoPad[1] = allActions[1] & 0xfff;
+       PicoIn.pad[0] = allActions[0] & 0xfff;
+       PicoIn.pad[1] = allActions[1] & 0xfff;
 
-       if (allActions[0] & 0x7000) emu_DoTurbo(&PicoPad[0], allActions[0]);
-       if (allActions[1] & 0x7000) emu_DoTurbo(&PicoPad[1], allActions[1]);
+       if (allActions[0] & 0x7000) emu_DoTurbo(&PicoIn.pad[0], allActions[0]);
+       if (allActions[1] & 0x7000) emu_DoTurbo(&PicoIn.pad[1], allActions[1]);
 
        events = (allActions[0] | allActions[1]) >> 16;
 
@@ -807,7 +809,7 @@ static void updateKeys(void)
 
        events &= ~prevEvents;
 
-       if (PicoAHW == PAHW_PICO)
+       if (PicoIn.AHW == PAHW_PICO)
                RunEventsPico(events, keys);
        if (events) RunEvents(events);
        if (movie_data) emu_updateMovie();
@@ -859,7 +861,7 @@ void pemu_loop(void)
        target_frametime = Pico.m.pal ? (1000000<<8)/50 : (1000000<<8)/60+1;
        reset_timing = 1;
 
-       if (PicoAHW & PAHW_MCD) {
+       if (PicoIn.AHW & PAHW_MCD) {
                // prepare CD buffer
                PicoCDBufferInit();
                // mp3...
@@ -984,7 +986,7 @@ void pemu_loop(void)
 
                updateKeys();
 
-               if (!(PicoOpt&0x10))
+               if (!(PicoIn.opt&0x10))
                        EmuScanPrepare();
 
                PicoFrame();
@@ -1017,7 +1019,7 @@ void pemu_loop(void)
 
        emu_set_fastforward(0);
 
-       if (PicoAHW & PAHW_MCD) PicoCDBufferFree();
+       if (PicoIn.AHW & PAHW_MCD) PicoCDBufferFree();
 
        if (PsndOut != NULL) {
                pemu_sound_stop();
@@ -1037,7 +1039,7 @@ void pemu_loop(void)
 
 void emu_HandleResume(void)
 {
-       if (!(PicoAHW & PAHW_MCD)) return;
+       if (!(PicoIn.AHW & PAHW_MCD)) return;
 
        // reopen first CD track
        if (Pico_mcd->TOC.Tracks[0].F != NULL)