cdrom: change pause timing again

[pcsx_rearmed.git] / maemo / main.c

diff --git a/maemo/main.c b/maemo/main.c
index c382c51..44fec65 100644 (file)
--- a/maemo/main.c
+++ b/maemo/main.c
@@ -17,12 +17,10 @@
 #include "../libpcsxcore/misc.h"
 #include "../libpcsxcore/cdriso.h"
 #include "../libpcsxcore/new_dynarec/new_dynarec.h"
-#include "../plugins/dfinput/main.h"
 #include "../plugins/dfsound/spu_config.h"
 #include "maemo_common.h"
 
 extern int in_enable_vibration;
-extern int cycle_multiplier;
 extern int in_type1, in_type2;
 
 accel_option accelOptions;
@@ -197,7 +195,6 @@ int main(int argc, char **argv)
        strcpy(Config.Bios, "HLE");
        spu_config.iUseReverb = 1;
        spu_config.iUseInterpolation = 1;
-       spu_config.idiablofix = 0;
        in_type1 = PSE_PAD_TYPE_STANDARD;
        in_type2 = PSE_PAD_TYPE_STANDARD;
 
@@ -252,10 +249,6 @@ int main(int argc, char **argv)
                else if (!strcmp(argv[i], "-unai"))                         strcpy(Config.Gpu, "gpu_unai.so");
                else if (!strcmp(argv[i], "-cdda"))             Config.Cdda = 1;
                else if (!strcmp(argv[i], "-xa"))               Config.Xa = 1;
-               else if (!strcmp(argv[i], "-rcnt"))             Config.RCntFix = 1 ;
-               else if (!strcmp(argv[i], "-sio"))              Config.Sio = 1;
-               else if (!strcmp(argv[i], "-spuirq"))   Config.SpuIrq = 1;
-               else if (!strcmp(argv[i], "-vsync"))    Config.VSyncWA = 1;
                else if (!strcmp(argv[i], "-fps"))                          g_opts |=OPT_SHOWFPS;
                else if (!strcmp(argv[i], "-cpu"))                          g_opts |=OPT_SHOWCPU;
                else if (!strcmp(argv[i], "-spu"))                          g_opts |=OPT_SHOWSPU;
@@ -263,7 +256,7 @@ int main(int argc, char **argv)
                else if (!strcmp(argv[i], "-mcd1"))                 sprintf(Config.Mcd1, "%s", argv[++i]);
                else if (!strcmp(argv[i], "-mcd2"))                 sprintf(Config.Mcd2, "%s", argv[++i]);
 
-               else if (!strcmp(argv[i], "-cpuclock"))                 cycle_multiplier = 10000 / atol(argv[++i]);
+               else if (!strcmp(argv[i], "-cpuclock"))                 Config.cycle_multiplier = 10000 / atol(argv[++i]);
                else if (!strcmp(argv[i], "-guncon"))               in_type1 = PSE_PAD_TYPE_GUNCON;
                else if (!strcmp(argv[i], "-gunnotrigger"))             g_opts |= OPT_TSGUN_NOTRIGGER;
                else if (!strcmp(argv[i], "-analog"))               in_type1 = PSE_PAD_TYPE_ANALOGPAD;
@@ -399,7 +392,6 @@ int main(int argc, char **argv)
        if (Config.HLE)
                printf("Note: running without BIOS, expect compatibility problems\n");
 
-       dfinput_activate();
        pl_timing_prepare(Config.PsxType);
 
        while (1)