mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-29 09:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix new 3ds xl not being detected, others

Browse Source 
Also fixes whitespace in makefile and platform_ctr.c and compiles with debug libctru when DEBUG=1
This commit is contained in:
meepingsnesroms 2017-12-29 19:30:54 -08:00
parent 7dbaa45172
commit d18ee7eaed
4 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile.ctr
View File

@ -79,7 +79,7 @@ else
endif endif
ifeq ($(strip $(DEVKITPRO)),) ifeq ($(strip $(DEVKITPRO)),)
$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>devkitpro") $(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>devkitpro")
endif endif
ifeq ($(strip $(CTRULIB)),) ifeq ($(strip $(CTRULIB)),)
@ -136,19 +136,25 @@ LDFLAGS += -specs=ctr/3dsx_custom.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
CFLAGS += -std=gnu99 -ffast-math CFLAGS += -std=gnu99 -ffast-math
LIBS := $(WHOLE_START) -lretro_ctr $(WHOLE_END) -lctru -lm LIBS := $(WHOLE_START) -lretro_ctr $(WHOLE_END) -lm
ifeq ($(DEBUG), 1)
LIBS += -lctrud
else
LIBS += -lctru
endif
ifeq ($(BUILD_3DSX), 1) ifeq ($(BUILD_3DSX), 1)
TARGET_3DSX := $(TARGET).3dsx $(TARGET).smdh TARGET_3DSX := $(TARGET).3dsx $(TARGET).smdh
endif endif
ifeq ($(BUILD_3DS), 1) ifeq ($(BUILD_3DS), 1)
TARGET_3DS := $(TARGET).3ds TARGET_3DS := $(TARGET).3ds
endif endif
ifeq ($(BUILD_CIA), 1) ifeq ($(BUILD_CIA), 1)
TARGET_CIA := $(TARGET).cia TARGET_CIA := $(TARGET).cia
endif endif
.PHONY: $(BUILD) clean all .PHONY: $(BUILD) clean all

20
frontend/drivers/platform_ctr.c
View File

@ -327,25 +327,25 @@ static void frontend_ctr_init(void *data)
gfxInit(GSP_BGR8_OES,GSP_RGB565_OES,false); gfxInit(GSP_BGR8_OES,GSP_RGB565_OES,false);
u32 topSize = 400 * 240 * 3; u32 topSize = 400 * 240 * 3;
u32 bottomSize = 320 * 240 * 2; u32 bottomSize = 320 * 240 * 2;
linearFree(gfxTopLeftFramebuffers[0]); linearFree(gfxTopLeftFramebuffers[0]);
linearFree(gfxTopLeftFramebuffers[1]); linearFree(gfxTopLeftFramebuffers[1]);
linearFree(gfxBottomFramebuffers[0]); linearFree(gfxBottomFramebuffers[0]);
linearFree(gfxBottomFramebuffers[1]); linearFree(gfxBottomFramebuffers[1]);
linearFree(gfxTopRightFramebuffers[0]); linearFree(gfxTopRightFramebuffers[0]);
linearFree(gfxTopRightFramebuffers[1]); linearFree(gfxTopRightFramebuffers[1]);
gfxTopLeftFramebuffers[0]=linearAlloc(topSize * 2); gfxTopLeftFramebuffers[0]=linearAlloc(topSize * 2);
gfxTopRightFramebuffers[0] = gfxTopLeftFramebuffers[0] + topSize; gfxTopRightFramebuffers[0] = gfxTopLeftFramebuffers[0] + topSize;
gfxTopLeftFramebuffers[1]=linearAlloc(topSize * 2); gfxTopLeftFramebuffers[1]=linearAlloc(topSize * 2);
gfxTopRightFramebuffers[1] = gfxTopLeftFramebuffers[1] + topSize; gfxTopRightFramebuffers[1] = gfxTopLeftFramebuffers[1] + topSize;
gfxBottomFramebuffers[0]=linearAlloc(bottomSize); gfxBottomFramebuffers[0]=linearAlloc(bottomSize);
gfxBottomFramebuffers[1]=linearAlloc(bottomSize); gfxBottomFramebuffers[1]=linearAlloc(bottomSize);
gfxSetFramebufferInfo(GFX_TOP, 0); gfxSetFramebufferInfo(GFX_TOP, 0);
gfxSetFramebufferInfo(GFX_BOTTOM, 0); gfxSetFramebufferInfo(GFX_BOTTOM, 0);
gfxSet3D(true); gfxSet3D(true);
consoleInit(GFX_BOTTOM, NULL); consoleInit(GFX_BOTTOM, NULL);

1
libretro-common/features/features_cpu.c
View File

@ -486,6 +486,7 @@ unsigned cpu_features_get_core_amount(void)
return 2; return 2;
case 2: case 2:
case 4:
case 5: case 5:
/*New 3/2DS*/ /*New 3/2DS*/
return 4; return 4;

2
libretro-common/net/net_compat.c
View File

@ -321,11 +321,9 @@ bool network_init(void)
_net_compat_net_memory = (u32*)memalign(SOC_ALIGN, SOC_BUFFERSIZE); _net_compat_net_memory = (u32*)memalign(SOC_ALIGN, SOC_BUFFERSIZE);
if (_net_compat_net_memory == NULL) if (_net_compat_net_memory == NULL)
return false; return false;
//RARCH_LOG("Wifi Buffer at: [0x%08X]\n", (u32)_net_compat_net_memory);
Result ret = socInit(_net_compat_net_memory, SOC_BUFFERSIZE);//WIFI init Result ret = socInit(_net_compat_net_memory, SOC_BUFFERSIZE);//WIFI init
if (ret != 0) if (ret != 0)
return false; return false;
//RARCH_LOG("Socket Status: [0x%08X]\n", (uint32_t)ret);
#else #else
signal(SIGPIPE, SIG_IGN); /* Do not like SIGPIPE killing our app. */ signal(SIGPIPE, SIG_IGN); /* Do not like SIGPIPE killing our app. */
#endif #endif