From 40ac911a05f2efa88163a554301df999bf491464 Mon Sep 17 00:00:00 2001 From: aliaspider Date: Thu, 24 Dec 2015 21:17:44 +0100 Subject: [PATCH 1/3] build fix. --- Makefile.ctr | 18 +++++------------- audio/drivers/ctr_csnd_audio.c | 1 + audio/drivers/ctr_dsp_audio.c | 1 + command_event.c | 2 ++ dynamic.c | 1 + frontend/drivers/platform_ctr.c | 1 + input/drivers_joypad/ctr_joypad.c | 1 + libretro_version_1.c | 1 + 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Makefile.ctr b/Makefile.ctr index f23dc5fc96..2395f456c5 100644 --- a/Makefile.ctr +++ b/Makefile.ctr @@ -50,7 +50,6 @@ else OBJS += gfx/video_context_driver.o OBJS += gfx/drivers_context/gfx_null_ctx.o OBJS += gfx/image/image.o - OBJS += gfx/video_texture.o OBJS += libretro-common/formats/tga/rtga.o OBJS += libretro-common/formats/png/rpng.o OBJS += libretro-common/formats/png/rpng_encode.o @@ -59,18 +58,15 @@ else OBJS += libretro-common/gfx/math/matrix_3x3.o OBJS += gfx/drivers/ctr_gfx.o OBJS += gfx/drivers/nullgfx.o - OBJS += gfx/font_renderer_driver.o - OBJS += gfx/drivers_font_renderer/bitmapfont.o OBJS += gfx/font_driver.o + OBJS += gfx/drivers_font_renderer/bitmapfont.o OBJS += input/input_autodetect.o OBJS += input/input_joypad_driver.o - OBJS += input/input_joypad.o OBJS += input/input_hid_driver.o - OBJS += input/input_common.o + OBJS += input/input_config.o OBJS += input/input_keymaps.o OBJS += input/input_remapping.o - OBJS += input/input_sensor.o - OBJS += input/keyboard_line.o + OBJS += input/input_keyboard.o OBJS += input/drivers/ctr_input.o OBJS += input/drivers_joypad/ctr_joypad.o OBJS += input/autoconf/builtin_ctr.o @@ -95,7 +91,6 @@ else OBJS += audio/audio_driver.o OBJS += camera/camera_driver.o OBJS += location/location_driver.o - OBJS += menu/menu_driver.o OBJS += driver.o OBJS += libretro-common/gfx/scaler/scaler_filter.o OBJS += libretro-common/gfx/scaler/pixconv.o @@ -151,11 +146,7 @@ else OBJS += frontend/frontend.o OBJS += libretro_version_1.o OBJS += retroarch.o - OBJS += retroarch_info.o OBJS += runloop.o - OBJS += runloop_data.o - OBJS += runloop_msg.o - OBJS += system.o OBJS += tasks/tasks.o OBJS += msg_hash.o OBJS += intl/msg_hash_de.o @@ -170,10 +161,11 @@ else OBJS += movie.o OBJS += record/record_driver.o OBJS += record/drivers/record_null.o + OBJS += tasks/task_decompress.o OBJS += tasks/task_file_transfer.o OBJS += screenshot.o OBJS += playlist.o - OBJS += menu/menu.o + OBJS += menu/menu_driver.o OBJS += menu/menu_hash.o OBJS += menu/menu_input.o OBJS += menu/menu_entry.o diff --git a/audio/drivers/ctr_csnd_audio.c b/audio/drivers/ctr_csnd_audio.c index 542b73dbc1..073370a251 100644 --- a/audio/drivers/ctr_csnd_audio.c +++ b/audio/drivers/ctr_csnd_audio.c @@ -19,6 +19,7 @@ #include "../audio_driver.h" #include "../../configuration.h" #include "../../performance.h" +#include "../../runloop.h" typedef struct { diff --git a/audio/drivers/ctr_dsp_audio.c b/audio/drivers/ctr_dsp_audio.c index 616f20349a..b46642fc20 100644 --- a/audio/drivers/ctr_dsp_audio.c +++ b/audio/drivers/ctr_dsp_audio.c @@ -19,6 +19,7 @@ #include "../audio_driver.h" #include "../../configuration.h" #include "../../performance.h" +#include "../../runloop.h" #include "../../ctr/ctr_debug.h" typedef struct diff --git a/command_event.c b/command_event.c index ce62ed42df..bb7a36d155 100644 --- a/command_event.c +++ b/command_event.c @@ -41,6 +41,8 @@ #include "cheevos.h" #endif +#include "libretro_private.h" +#include "libretro_version_1.h" #include "verbosity.h" #include "runloop.h" #include "configuration.h" diff --git a/dynamic.c b/dynamic.c index f7856b2da6..b08e73ef1c 100644 --- a/dynamic.c +++ b/dynamic.c @@ -38,6 +38,7 @@ #include "libretro_private.h" #include "cores/internal_cores.h" +#include "frontend/frontend_driver.h" #include "retroarch.h" #include "configuration.h" #include "general.h" diff --git a/frontend/drivers/platform_ctr.c b/frontend/drivers/platform_ctr.c index 0832cea4a7..74145cc31f 100644 --- a/frontend/drivers/platform_ctr.c +++ b/frontend/drivers/platform_ctr.c @@ -27,6 +27,7 @@ #endif #include "../frontend_driver.h" +#include "../../verbosity.h" #include "../../defaults.h" #include "retroarch.h" #include "audio/audio_driver.h" diff --git a/input/drivers_joypad/ctr_joypad.c b/input/drivers_joypad/ctr_joypad.c index 55b8607544..51c70fe385 100644 --- a/input/drivers_joypad/ctr_joypad.c +++ b/input/drivers_joypad/ctr_joypad.c @@ -20,6 +20,7 @@ #include "../../general.h" #include "../../configuration.h" #include "../../retroarch.h" +#include "../../command_event.h" #include "string.h" #include "3ds.h" diff --git a/libretro_version_1.c b/libretro_version_1.c index de5874bbe6..bceafa3b4e 100644 --- a/libretro_version_1.c +++ b/libretro_version_1.c @@ -25,6 +25,7 @@ #include #include "libretro.h" +#include "libretro_version_1.h" #include "general.h" #include "rewind.h" #include "gfx/video_driver.h" From 90c08dfd12cfa7c2c04d1debe19627c2daece146 Mon Sep 17 00:00:00 2001 From: aliaspider Date: Thu, 24 Dec 2015 23:11:25 +0100 Subject: [PATCH 2/3] (3DS) dsp audio driver: incorrect value was being used due to missing parentheses, resulting in a random lockup. fixes #2587. --- audio/drivers/ctr_dsp_audio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/audio/drivers/ctr_dsp_audio.c b/audio/drivers/ctr_dsp_audio.c index b46642fc20..fd5e0e283f 100644 --- a/audio/drivers/ctr_dsp_audio.c +++ b/audio/drivers/ctr_dsp_audio.c @@ -111,7 +111,7 @@ static ssize_t ctr_dsp_audio_write(void *data, const void *buf, size_t size) do{ svcSleepThread(100000); sample_pos = ndspChnGetSamplePos(ctr->channel); - }while (((sample_pos - (ctr->pos + size >>2)) & CTR_DSP_AUDIO_COUNT_MASK) > (CTR_DSP_AUDIO_COUNT >> 1) + }while (((sample_pos - (ctr->pos + (size >>2))) & CTR_DSP_AUDIO_COUNT_MASK) > (CTR_DSP_AUDIO_COUNT >> 1) || (((ctr->pos - (CTR_DSP_AUDIO_COUNT >> 4) - sample_pos) & CTR_DSP_AUDIO_COUNT_MASK) > (CTR_DSP_AUDIO_COUNT >> 1))); } } From fdad936fab4018f6fec26f2c8434722e0e7b1da6 Mon Sep 17 00:00:00 2001 From: aliaspider Date: Thu, 24 Dec 2015 23:16:40 +0100 Subject: [PATCH 3/3] (3DS) update makefile. --- Makefile.ctr | 6 +++--- ctr/ctr_debug.h | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile.ctr b/Makefile.ctr index 2395f456c5..3e12022026 100644 --- a/Makefile.ctr +++ b/Makefile.ctr @@ -66,7 +66,7 @@ else OBJS += input/input_config.o OBJS += input/input_keymaps.o OBJS += input/input_remapping.o - OBJS += input/input_keyboard.o + OBJS += input/input_keyboard.o OBJS += input/drivers/ctr_input.o OBJS += input/drivers_joypad/ctr_joypad.o OBJS += input/autoconf/builtin_ctr.o @@ -161,7 +161,7 @@ else OBJS += movie.o OBJS += record/record_driver.o OBJS += record/drivers/record_null.o - OBJS += tasks/task_decompress.o + OBJS += tasks/task_decompress.o OBJS += tasks/task_file_transfer.o OBJS += screenshot.o OBJS += playlist.o @@ -251,7 +251,7 @@ INCDIRS := -I$(CTRULIB)/include LIBDIRS := -L. -L$(CTRULIB)/lib -ARCH := -march=armv6k -mtune=mpcore -mfloat-abi=hard -marm -mfpu=vfp +ARCH := -march=armv6k -mtune=mpcore -mfloat-abi=hard -marm -mfpu=vfp -mtp=soft CFLAGS += -mword-relocations \ -fomit-frame-pointer -ffast-math \ diff --git a/ctr/ctr_debug.h b/ctr/ctr_debug.h index a31e3eb9ed..c8e79de9c7 100644 --- a/ctr/ctr_debug.h +++ b/ctr/ctr_debug.h @@ -16,6 +16,7 @@ void dump_result_value(Result val); #define DEBUG_LINE() do{printf("%s:%d.\n",__FUNCTION__, __LINE__);fflush(stdout);}while(0) #define DEBUG_STR(X) printf( "%s: %s\n", #X, (char*)(X)) #define DEBUG_VAR(X) printf( "%-20s: 0x%08X\n", #X, (u32)(X)) +#define DEBUG_INT(X) printf( "%-20s: %10i\n", #X, (s32)(X)) #define DEBUG_VAR64(X) printf( #X"\r\t\t\t\t : 0x%016llX\n", (u64)(X)) #define DEBUG_ERROR(X) do{if(X)dump_result_value(X)}while(0) #define PRINTFPOS(X,Y) "\x1b["#X";"#Y"H"