GP2X: low volume and fast forward

git-svn-id: file:///home/notaz/opt/svn/PicoDrive/platform@310 be3aeb3a-fb24-0410-a615-afba39da0efa

diff --git a/base_readme.txt b/base_readme.txt
index 17578a5..b7f641a 100644 (file)
--- a/base_readme.txt
+++ b/base_readme.txt
@@ -641,7 +641,11 @@ Changelog
   * Fixed a sram bug in memhandlers (fixes Shining in the Darkness saves).\r
   * PSP: fixed another bug in memhanlers, which crashed the emu for some games\r
     (like NBA Jam and NHL 9x).\r
-  * Added suspend/resume handling for Sega CD games.\r
+  + PSP: added suspend/resume handling for Sega CD games.\r
+  + GP2X: added additional low volume levels for my late-night gaming sessions\r
+    (in stereo mode only).\r
+  + GP2X: added "fast forward" action in key config. Not recommended to use for\r
+    Sega CD, may case problems there.\r
   * Some other small tweaks I forgot about.\r
 \r
 1.35a\r
@@ -649,7 +653,7 @@ Changelog
   * PSP: fixed incorrect CZ80 memory map setup, which caused Z80 crashes and\r
     graphics corruption in EU Mega CD model1 BIOS menus.\r
   + PSP: added additional "set to 4:3 scaled" display option for convenience.\r
-  + Added an option to disable frame limitter (works only with non-auto frameskip).\r
+  + PSP: Added an option to disable frame limitter (works only with non-auto frameskip).\r
 \r
 1.35\r
   + PSP port added. Lots of new code for it. Integrated modified FAME/C, CZ80 cores.\r

diff --git a/common/arm_utils.s b/common/arm_utils.s
index 787ecb9..1d14265 100644 (file)
--- a/common/arm_utils.s
+++ b/common/arm_utils.s
@@ -1,11 +1,14 @@
 @ vim:filetype=armasm\r
 @ some color conversion and blitting routines\r
 \r
-@ (c) Copyright 2006, notaz\r
+@ (c) Copyright 2006, 2007 notaz\r
 @ All Rights Reserved\r
 \r
 @ vim:filetype=armasm\r
 \r
+.text\r
+.align 4\r
+\r
 @ Convert 0000bbb0 ggg0rrr0 0000bbb0 ggg0rrr0\r
 @ to      00000000 rrr00000 ggg00000 bbb00000 ...\r
 \r
@@ -217,3 +220,4 @@ flushcache:
     swi #0x9f0002\r
     mov pc, lr\r
 \r
+\r

diff --git a/gp2x/emu.c b/gp2x/emu.c
index 3f2ed3f..a658044 100644 (file)
--- a/gp2x/emu.c
+++ b/gp2x/emu.c
@@ -25,6 +25,7 @@
 \r
 #include <Pico/PicoInt.h>\r
 #include <Pico/Patch.h>\r
+#include <Pico/sound/mix.h>\r
 #include <zlib/zlib.h>\r
 \r
 //#define PFRAMES\r
@@ -432,9 +433,69 @@ static void emu_msg_tray_open(void)
        gettimeofday(&noticeMsgTime, 0);\r
 }\r
 \r
+static void update_volume(int has_changed, int is_up)\r
+{\r
+       static int prev_frame = 0, wait_frames = 0;\r
+       int vol = currentConfig.volume;\r
+\r
+       if (has_changed)\r
+       {\r
+               if (vol < 5 && (PicoOpt&8) && prev_frame == Pico.m.frame_count - 1 && wait_frames < 12)\r
+                       wait_frames++;\r
+               else {\r
+                       if (is_up) {\r
+                               if (vol < 99) vol++;\r
+                       } else {\r
+                               if (vol >  0) vol--;\r
+                       }\r
+                       wait_frames = 0;\r
+                       gp2x_sound_volume(vol, vol);\r
+                       currentConfig.volume = vol;\r
+               }\r
+               sprintf(noticeMsg, "VOL: %02i", vol);\r
+               gettimeofday(&noticeMsgTime, 0);\r
+               prev_frame = Pico.m.frame_count;\r
+       }\r
+\r
+       // set the right mixer func\r
+       if (!(PicoOpt&8)) return; // just use defaults for mono\r
+       if (vol >= 5)\r
+               PsndMix_32_to_16l = mix_32_to_16l_stereo;\r
+       else {\r
+               mix_32_to_16l_level = 5 - vol;\r
+               PsndMix_32_to_16l = mix_32_to_16l_stereo_lvl;\r
+       }\r
+}\r
+\r
+static void change_fast_forward(int set_on)\r
+{\r
+       static void *set_PsndOut = NULL;\r
+       static int set_Frameskip, set_EmuOpt, is_on = 0;\r
+\r
+       if (set_on && !is_on) {\r
+               set_PsndOut = PsndOut;\r
+               set_Frameskip = currentConfig.Frameskip;\r
+               set_EmuOpt = currentConfig.EmuOpt;\r
+               PsndOut = NULL;\r
+               currentConfig.Frameskip = 8;\r
+               currentConfig.EmuOpt &= ~4;\r
+               is_on = 1;\r
+       }\r
+       else if (!set_on && is_on) {\r
+               PsndOut = set_PsndOut;\r
+               currentConfig.Frameskip = set_Frameskip;\r
+               currentConfig.EmuOpt = set_EmuOpt;\r
+               PsndRerate(1);\r
+               update_volume(0, 0);\r
+               reset_timing = 1;\r
+               is_on = 0;\r
+       }\r
+}\r
+\r
 static void RunEvents(unsigned int which)\r
 {\r
-       if(which & 0x1800) { // save or load (but not both)\r
+       if (which & 0x1800) // save or load (but not both)\r
+       {\r
                int do_it = 1;\r
                if ( emu_checkSaveFile(state_slot) &&\r
                                (( (which & 0x1000) && (currentConfig.EmuOpt & 0x800)) ||   // load\r
@@ -456,7 +517,8 @@ static void RunEvents(unsigned int which)
 \r
                reset_timing = 1;\r
        }\r
-       if(which & 0x0400) { // switch renderer\r
+       if (which & 0x0400) // switch renderer\r
+       {\r
                if      (  PicoOpt&0x10)             { PicoOpt&=~0x10; currentConfig.EmuOpt |= 0x80; }\r
                else if (!(currentConfig.EmuOpt&0x80)) PicoOpt|= 0x10;\r
                else   currentConfig.EmuOpt &= ~0x80;\r
@@ -473,7 +535,8 @@ static void RunEvents(unsigned int which)
 \r
                gettimeofday(&noticeMsgTime, 0);\r
        }\r
-       if(which & 0x0300) {\r
+       if (which & 0x0300)\r
+       {\r
                if(which&0x0200) {\r
                        state_slot -= 1;\r
                        if(state_slot < 0) state_slot = 9;\r
@@ -484,7 +547,7 @@ static void RunEvents(unsigned int which)
                sprintf(noticeMsg, "SAVE SLOT %i [%s]", state_slot, emu_checkSaveFile(state_slot) ? "USED" : "FREE");\r
                gettimeofday(&noticeMsgTime, 0);\r
        }\r
-       if(which & 0x0080) {\r
+       if (which & 0x0080) {\r
                engineState = PGS_Menu;\r
        }\r
 }\r
@@ -552,18 +615,11 @@ static void updateKeys(void)
        events = (allActions[0] | allActions[1]) >> 16;\r
 \r
        // volume is treated in special way and triggered every frame\r
-       if(events & 0x6000) {\r
-               int vol = currentConfig.volume;\r
-               if (events & 0x2000) {\r
-                       if (vol < 99) vol++;\r
-               } else {\r
-                       if (vol >  0) vol--;\r
-               }\r
-               gp2x_sound_volume(vol, vol);\r
-               sprintf(noticeMsg, "VOL: %02i", vol);\r
-               gettimeofday(&noticeMsgTime, 0);\r
-               currentConfig.volume = vol;\r
-       }\r
+       if (events & 0x6000)\r
+               update_volume(1, events & 0x2000);\r
+\r
+       if ((events ^ prevEvents) & 0x40)\r
+               change_fast_forward(events & 0x40);\r
 \r
        events &= ~prevEvents;\r
        if (events) RunEvents(events);\r
@@ -685,15 +741,11 @@ void emu_Loop(void)
        reset_timing = 1;\r
 \r
        // prepare sound stuff\r
-       if(currentConfig.EmuOpt & 4) {\r
+       if (currentConfig.EmuOpt & 4)\r
+       {\r
                int snd_excess_add;\r
                if (PsndRate != PsndRate_old || (PicoOpt&0x20b) != (PicoOpt_old&0x20b) || Pico.m.pal != pal_old ||\r
                                ((PicoOpt&0x200) && crashed_940)) {\r
-                       /* if 940 is turned off, we need it to be put back to sleep */\r
-                       if (!(PicoOpt&0x200) && ((PicoOpt^PicoOpt_old)&0x200)) {\r
-                               Reset940(1, 2);\r
-                               Pause940(1);\r
-                       }\r
                        PsndRerate(Pico.m.frame_count ? 1 : 0);\r
                }\r
                snd_excess_add = ((PsndRate - PsndLen*target_fps)<<16) / target_fps;\r
@@ -702,13 +754,14 @@ void emu_Loop(void)
                gp2x_start_sound(PsndRate, 16, (PicoOpt&8)>>3);\r
                gp2x_sound_volume(currentConfig.volume, currentConfig.volume);\r
                PicoWriteSound = updateSound;\r
+               update_volume(0, 0);\r
                memset(sndBuffer, 0, sizeof(sndBuffer));\r
                PsndOut = sndBuffer;\r
                PsndRate_old = PsndRate;\r
                PicoOpt_old  = PicoOpt;\r
                pal_old = Pico.m.pal;\r
        } else {\r
-               PsndOut = 0;\r
+               PsndOut = NULL;\r
        }\r
 \r
        // prepare CD buffer\r
@@ -733,14 +786,15 @@ void emu_Loop(void)
                int modes;\r
 \r
                gettimeofday(&tval, 0);\r
-               if(reset_timing) {\r
+               if (reset_timing) {\r
                        reset_timing = 0;\r
                        thissec = tval.tv_sec;\r
                        frames_shown = frames_done = tval.tv_usec/target_frametime;\r
                }\r
 \r
                // show notice message?\r
-               if(noticeMsgTime.tv_sec) {\r
+               if (noticeMsgTime.tv_sec)\r
+               {\r
                        static int noticeMsgSum;\r
                        if((tval.tv_sec*1000000+tval.tv_usec) - (noticeMsgTime.tv_sec*1000000+noticeMsgTime.tv_usec) > 2000000) { // > 2.0 sec\r
                                noticeMsgTime.tv_sec = noticeMsgTime.tv_usec = 0;\r
@@ -755,7 +809,8 @@ void emu_Loop(void)
 \r
                // check for mode changes\r
                modes = ((Pico.video.reg[12]&1)<<2)|(Pico.video.reg[1]&8);\r
-               if (modes != oldmodes) {\r
+               if (modes != oldmodes)\r
+               {\r
                        int scalex = 320;\r
                        osd_fps_x = OSD_FPS_X;\r
                        if (modes & 4) {\r
@@ -777,10 +832,11 @@ void emu_Loop(void)
                }\r
 \r
                // second changed?\r
-               if(thissec != tval.tv_sec) {\r
+               if (thissec != tval.tv_sec)\r
+               {\r
 #ifdef BENCHMARK\r
                        static int bench = 0, bench_fps = 0, bench_fps_s = 0, bfp = 0, bf[4];\r
-                       if(++bench == 10) {\r
+                       if (++bench == 10) {\r
                                bench = 0;\r
                                bench_fps_s = bench_fps;\r
                                bf[bfp++ & 3] = bench_fps;\r
@@ -789,12 +845,13 @@ void emu_Loop(void)
                        bench_fps += frames_shown;\r
                        sprintf(fpsbuff, "%02i/%02i/%02i", frames_shown, bench_fps_s, (bf[0]+bf[1]+bf[2]+bf[3])>>2);\r
 #else\r
-                       if(currentConfig.EmuOpt & 2)\r
+                       if (currentConfig.EmuOpt & 2)\r
                                sprintf(fpsbuff, "%02i/%02i", frames_shown, frames_done);\r
+                       if (fpsbuff[5] == 0) { fpsbuff[5] = fpsbuff[6] = ' '; fpsbuff[7] = 0; }\r
 #endif\r
                        thissec = tval.tv_sec;\r
 \r
-                       if(PsndOut == 0 && currentConfig.Frameskip >= 0) {\r
+                       if (PsndOut == 0 && currentConfig.Frameskip >= 0) {\r
                                frames_done = frames_shown = 0;\r
                        } else {\r
                                // it is quite common for this implementation to leave 1 fame unfinished\r
@@ -818,7 +875,7 @@ void emu_Loop(void)
                        for(i = 0; i < currentConfig.Frameskip; i++) {\r
                                updateKeys();\r
                                SkipFrame(1); frames_done++;\r
-                               if (PsndOut) { // do framelimitting if sound is enabled\r
+                               if (PsndOut && !reset_timing) { // do framelimitting if sound is enabled\r
                                        gettimeofday(&tval, 0);\r
                                        if(thissec != tval.tv_sec) tval.tv_usec+=1000000;\r
                                        if(tval.tv_usec < lim_time) { // we are too fast\r
@@ -911,7 +968,7 @@ if (Pico.m.frame_count == 31563) {
                {\r
                        // sleep or vsync if we are still too fast\r
                        // usleep sleeps for ~20ms minimum, so it is not a solution here\r
-                       if(tval.tv_usec < lim_time)\r
+                       if (!reset_timing && tval.tv_usec < lim_time)\r
                        {\r
                                // we are too fast\r
                                if (vsync_offset) {\r
@@ -929,6 +986,7 @@ if (Pico.m.frame_count == 31563) {
                frames_done++; frames_shown++;\r
        }\r
 \r
+       change_fast_forward(0);\r
 \r
        if (PicoMCD & 1) PicoCDBufferFree();\r
 \r

diff --git a/gp2x/gp2x.c b/gp2x/gp2x.c
index 3ed64fb..7a5156c 100644 (file)
--- a/gp2x/gp2x.c
+++ b/gp2x/gp2x.c
@@ -232,8 +232,8 @@ void gp2x_start_sound(int rate, int bits, int stereo)
        if (sounddev == -1)\r
                printf("open(\"/dev/dsp\") failed with %i\n", errno);\r
 \r
-       ioctl(sounddev, SNDCTL_DSP_SPEED,  &rate);\r
        ioctl(sounddev, SNDCTL_DSP_SETFMT, &bits);\r
+       ioctl(sounddev, SNDCTL_DSP_SPEED,  &rate);\r
        ioctl(sounddev, SNDCTL_DSP_STEREO, &stereo);\r
        // calculate buffer size\r
        buffers = 16;\r
@@ -242,11 +242,12 @@ void gp2x_start_sound(int rate, int bits, int stereo)
        while ((bsize>>=1)) frag++;\r
        frag |= buffers<<16; // 16 buffers\r
        ioctl(sounddev, SNDCTL_DSP_SETFRAGMENT, &frag);\r
+       usleep(192*1024);\r
+\r
        printf("gp2x_set_sound: %i/%ibit/%s, %i buffers of %i bytes\n",\r
                rate, bits, stereo?"stereo":"mono", frag>>16, 1<<(frag&0xffff));\r
 \r
        s_oldrate = rate; s_oldbits = bits; s_oldstereo = stereo;\r
-       usleep(100000);\r
 }\r
 \r
 \r

diff --git a/gp2x/menu.c b/gp2x/menu.c
index ddb9d2e..ef54ed6 100644 (file)
--- a/gp2x/menu.c
+++ b/gp2x/menu.c
@@ -838,6 +838,7 @@ static bind_action_t emuctrl_actions[] =
        { "Switch Renderer", 1<<26 },\r
        { "Volume Down    ", 1<<30 },\r
        { "Volume Up      ", 1<<29 },\r
+       { "Fast forward   ", 1<<22 },\r
        { "Enter Menu     ", 1<<23 },\r
 };\r
 \r