diff options
| author | notaz | 2011-10-01 01:13:43 +0300 |
|---|---|---|
| committer | notaz | 2011-10-02 03:09:13 +0300 |
| commit | d3f3bf09b5b3f1d8b025cc9dbd902eb157aae0b7 (patch) | |
| tree | d25b4ece781d0dcd60fdaac68636043e9fdffade /frontend | |
| parent | 0c2ca3ba2ca8a191fc3f6d9782dc2420537b1964 (diff) | |
| download | pcsx_rearmed-d3f3bf09b5b3f1d8b025cc9dbd902eb157aae0b7.tar.gz pcsx_rearmed-d3f3bf09b5b3f1d8b025cc9dbd902eb157aae0b7.tar.bz2 pcsx_rearmed-d3f3bf09b5b3f1d8b025cc9dbd902eb157aae0b7.zip | |
yet more random armv5 tweaks
Diffstat (limited to 'frontend')
| -rw-r--r-- | frontend/main.c | 3 | ||||
| -rw-r--r-- | frontend/menu.c | 3 | ||||
| -rw-r--r-- | frontend/plat_pollux.c | 4 | ||||
| -rw-r--r-- | frontend/plugin_lib.c | 2 |
4 files changed, 11 insertions, 1 deletions
diff --git a/frontend/main.c b/frontend/main.c index 37a72ac..0a9bed6 100644 --- a/frontend/main.c +++ b/frontend/main.c @@ -121,6 +121,9 @@ static void set_default_paths(void) strcpy(Config.Pad1, "builtin_pad"); strcpy(Config.Pad2, "builtin_pad"); strcpy(Config.Net, "Disabled"); +#if defined(__arm__) && !defined(__ARM_ARCH_7A__) /* XXX */ + strcpy(Config.Gpu, "gpuPCSX4ALL.so"); +#endif Config.PsxAuto = 1; snprintf(Config.PatchesDir, sizeof(Config.PatchesDir), "." PATCHES_DIR); diff --git a/frontend/menu.c b/frontend/menu.c index ce65ccf..36c9f91 100644 --- a/frontend/menu.c +++ b/frontend/menu.c @@ -192,6 +192,9 @@ static void menu_set_defconfig(void) iXAPitch = 0; iSPUIRQWait = 1; iUseTimer = 2; +#ifndef __ARM_ARCH_7A__ /* XXX */ + iUseReverb = 0; +#endif menu_sync_config(); } diff --git a/frontend/plat_pollux.c b/frontend/plat_pollux.c index d214b63..4983ec7 100644 --- a/frontend/plat_pollux.c +++ b/frontend/plat_pollux.c @@ -24,6 +24,7 @@ #include "main.h" #include "menu.h" #include "plat.h" +#include "pcnt.h" static int fbdev = -1, memdev = -1, battdev = -1; static volatile unsigned short *memregs; @@ -320,6 +321,7 @@ static void raw_flip_dma(int x, int y) int i; warm_cache_op_all(WOP_D_CLEAN); + pcnt_start(PCNT_BLIT); dst &= ~7; len &= ~7; @@ -354,6 +356,8 @@ static void raw_flip_dma(int x, int y) g_menuscreen_ptr = fb_flip(); pl_flip_cnt++; + + pcnt_end(PCNT_BLIT); } static void raw_flip_soft(int x, int y) diff --git a/frontend/plugin_lib.c b/frontend/plugin_lib.c index 239e852..c719f48 100644 --- a/frontend/plugin_lib.c +++ b/frontend/plugin_lib.c @@ -410,7 +410,7 @@ static void *watchdog_thread(void *unused) int seen_dead = 0; int sleep_time = 5; -#ifndef NDEBUG +#if !defined(NDEBUG) || defined(DRC_DBG) // don't interfere with debug return NULL; #endif |