extracted OSS code to sndout_oss_*, BTN->PBTN, refactoring

[picodrive.git] / platform / gizmondo / emu.c

diff --git a/platform/gizmondo/emu.c b/platform/gizmondo/emu.c
index cde2e47..5469c56 100644 (file)
--- a/platform/gizmondo/emu.c
+++ b/platform/gizmondo/emu.c
@@ -16,7 +16,7 @@
 #include "giz.h"
 #include "asm_utils.h"
 
-#include <Pico/PicoInt.h>
+#include <pico/pico_int.h>
 
 #ifdef BENCHMARK
 #define OSD_FPS_X 220
@@ -45,9 +45,11 @@ void emu_noticeMsgUpdated(void)
        noticeMsgTime = GetTickCount();
 }
 
-void emu_getMainDir(char *dst, int len)
+int emu_getMainDir(char *dst, int len)
 {
        if (len > 0) *dst = 0;
+
+       return 0;
 }
 
 static void emu_msg_cb(const char *msg)
@@ -143,16 +145,6 @@ void emu_prepareDefaultConfig(void)
        defaultConfig.turbo_rate = 15;
 }
 
-void emu_setDefaultConfig(void)
-{
-       memcpy(&currentConfig, &defaultConfig, sizeof(currentConfig));
-       PicoOpt = currentConfig.s_PicoOpt;
-       PsndRate = currentConfig.s_PsndRate;
-       PicoRegionOverride = currentConfig.s_PicoRegion;
-       PicoAutoRgnOrder = currentConfig.s_PicoAutoRgnOrder;
-       PicoCDBuffers = currentConfig.s_PicoCDBuffers;
-}
-
 
 static int EmuScanBegin16(unsigned int num)
 {
@@ -398,10 +390,10 @@ static void RunEvents(unsigned int which)
                {
                        int keys;
                        blit("", (which & 0x1000) ? "LOAD STATE? (PLAY=yes, STOP=no)" : "OVERWRITE SAVE? (PLAY=yes, STOP=no)");
-                       while( !((keys = Framework_PollGetButtons()) & (BTN_PLAY|BTN_STOP)) )
+                       while( !((keys = Framework_PollGetButtons()) & (PBTN_PLAY|PBTN_STOP)) )
                                Sleep(50);
-                       if (keys & BTN_STOP) do_it = 0;
-                       while(  ((keys = Framework_PollGetButtons()) & (BTN_PLAY|BTN_STOP)) ) // wait for release
+                       if (keys & PBTN_STOP) do_it = 0;
+                       while(  ((keys = Framework_PollGetButtons()) & (PBTN_PLAY|PBTN_STOP)) ) // wait for release
                                Sleep(50);
                        clearArea(0);
                }
@@ -457,7 +449,7 @@ static void updateKeys(void)
        int i;
 
        keys = Framework_PollGetButtons();
-       if (keys & BTN_HOME)
+       if (keys & PBTN_HOME)
                engineState = PGS_Menu;
 
        keys &= CONFIGURABLE_KEYS;