Merge branch 'master' into medusa
Vicki Pfau vi@endrift.com
Sat, 08 Aug 2020 20:50:18 -0700
58 files changed,
120 insertions(+),
70 deletions(-)
jump to
M
CHANGES
→
CHANGES
@@ -49,6 +49,7 @@ - GBA: Fix timing advancing too quickly in rare cases
- GBA BIOS: Implement dummy sound driver calls - GBA BIOS: Improve HLE BIOS timing - GBA BIOS: Fix reloading video registers after reset (fixes mgba.io/i/1808) + - GBA BIOS: Make HLE BIOS calls interruptable (fixes mgba.io/i/1711 and mgba.io/i/1823) - GBA DMA: Linger last DMA on bus (fixes mgba.io/i/301 and mgba.io/i/1320) - GBA Memory: Improve gamepak prefetch timing - GBA Memory: Stall on VRAM access in mode 2 (fixes mgba.io/i/190)@@ -56,8 +57,11 @@ - GBA SIO: Fix copying Normal mode transfer values
- GBA SIO: Fix Normal mode being totally broken (fixes mgba.io/i/1800) - GBA Video: Latch scanline at end of Hblank (fixes mgba.io/i/1319) - GBA Video: Fix Hblank timing + - GBA Video: Invalidate map cache when modifying BGCNT (fixes mgba.io/i/1846) - SM83: Emulate HALT bug Other fixes: + - 3DS: Redo video sync to be more precise + - 3DS: Fix crash with libctru 2.0 when exiting - All: Improve export headers (fixes mgba.io/i/1738) - Core: Ensure ELF regions can be written before trying - Debugger: Don't skip undefined instructions when debugger attached@@ -66,6 +70,9 @@ - FFmpeg: Fix encoding of time base
- Qt: Force OpenGL paint engine creation thread (fixes mgba.io/i/1642) - Qt: Fix static compilation in MinGW (fixes mgba.io/i/1769) - Qt: Fix a race condition in the frame inspector + - Qt: Add dummy English translation file (fixes mgba.io/i/1469) + - mGUI: Fix closing down a game if an exit is signalled + - mVL: Fix injecting accidentally draining non-injection buffer - SM83: Simplify register pair access on big endian - VFS: Fix directory node listing on some filesystems Misc:
M
CMakeLists.txt
→
CMakeLists.txt
@@ -654,6 +654,8 @@
if(USE_LIBZIP) if(TARGET libzip::zip) list(APPEND DEPENDENCY_LIB libzip::zip) + elseif(TARGET zip) + list(APPEND DEPENDENCY_LIB zip) else() include_directories(AFTER ${LIBZIP_INCLUDE_DIRS}) link_directories(${LIBZIP_LIBRARY_DIRS})
M
include/mgba/internal/gba/gba.h
→
include/mgba/internal/gba/gba.h
@@ -109,6 +109,8 @@ bool haltPending;
bool cpuBlocked; bool earlyExit; uint32_t dmaPC; + uint32_t biosStall; + int idleDetectionStep; int idleDetectionFailures; int32_t cachedRegisters[16];
M
include/mgba/internal/gba/serialize.h
→
include/mgba/internal/gba/serialize.h
@@ -201,7 +201,8 @@ * | bit 0: Is CPU halted?
* | bit 1: POSTFLG * | bit 2: Is IRQ pending? * 0x00320 - 0x00323: Next IRQ event - * 0x00324 - 0x003FF: Reserved (leave zero) + * 0x00324 - 0x00327: Interruptable BIOS stall cycles + * 0x00328 - 0x003FF: Reserved (leave zero) * 0x00400 - 0x007FF: I/O memory * 0x00800 - 0x00BFF: Palette * 0x00C00 - 0x00FFF: OAM@@ -334,8 +335,9 @@ uint64_t globalCycles;
uint32_t lastPrefetchedPc; GBASerializedMiscFlags miscFlags; uint32_t nextIrq; + int32_t biosStall; - uint32_t reserved[55]; + uint32_t reserved[54]; uint16_t io[SIZE_IO >> 1]; uint16_t pram[SIZE_PALETTE_RAM >> 1];
M
src/feature/gui/gui-runner.c
→
src/feature/gui/gui-runner.c
@@ -541,6 +541,9 @@ }
++frame; } } + if (!running) { + break; + } if (runner->paused) { runner->paused(runner);@@ -651,7 +654,7 @@ for (i = 0; runner->keySources[i].id; ++i) {
mInputMapLoad(&runner->params.keyMap, runner->keySources[i].id, mCoreConfigGetInput(&runner->config)); } } - while (true) { + while (runner->running(runner)) { char path[PATH_MAX]; const char* preselect = mCoreConfigGetValue(&runner->config, "lastGame"); if (preselect) {
M
src/feature/video-logger.c
→
src/feature/video-logger.c
@@ -1000,7 +1000,7 @@ }
data = (uint8_t*) data + size; length -= size; } - if (!_fillBuffer(context, channelId, BUFFER_BASE_SIZE)) { + if (channel->injecting || !_fillBuffer(context, channelId, BUFFER_BASE_SIZE)) { return size; } size += CircleBufferRead(buffer, data, length);
M
src/gba/bios.c
→
src/gba/bios.c
@@ -298,10 +298,10 @@ int loops = clz32(denom) - clz32(num);
if (loops < 1) { loops = 1; } - cpu->cycles += 4 /* prologue */ + 13 * loops + 7 /* epilogue */; + gba->biosStall = 4 /* prologue */ + 13 * loops + 7 /* epilogue */; } -static int16_t _ArcTan(int32_t i, int32_t* r1, int32_t* r3, int32_t* cycles) { +static int16_t _ArcTan(int32_t i, int32_t* r1, int32_t* r3, uint32_t* cycles) { int currentCycles = 37; currentCycles += _mulWait(i * i); int32_t a = -((i * i) >> 14);@@ -325,11 +325,11 @@ }
if (r3) { *r3 = b; } - *cycles += currentCycles; + *cycles = currentCycles; return (i * b) >> 16; } -static int16_t _ArcTan2(int32_t x, int32_t y, int32_t* r1, int32_t* cycles) { +static int16_t _ArcTan2(int32_t x, int32_t y, int32_t* r1, uint32_t* cycles) { if (!y) { if (x >= 0) { return 0;@@ -363,9 +363,9 @@ return 0xC000 - _ArcTan((x << 14) / y, r1, NULL, cycles);
} } -static int32_t _Sqrt(uint32_t x, int32_t* cycles) { +static int32_t _Sqrt(uint32_t x, uint32_t* cycles) { if (!x) { - *cycles += 53; + *cycles = 53; return 0; } int32_t currentCycles = 15;@@ -412,7 +412,7 @@ bound = oldBound;
break; } } - *cycles += currentCycles; + *cycles = currentCycles; return bound; }@@ -422,6 +422,9 @@ mLOG(GBA_BIOS, DEBUG, "SWI: %02X r0: %08X r1: %08X r2: %08X r3: %08X",
immediate, cpu->gprs[0], cpu->gprs[1], cpu->gprs[2], cpu->gprs[3]); switch (immediate) { + case 0xF0: // Used for internal stall counting + cpu->gprs[4] = gba->biosStall; + return; case 0xFA: GBAPrintFlush(gba); return;@@ -431,6 +434,8 @@ if (gba->memory.fullBios) {
ARMRaiseSWI(cpu); return; } + + bool useStall = false; switch (immediate) { case GBA_SWI_SOFT_RESET: _SoftReset(gba);@@ -452,19 +457,24 @@ // IntrWait
ARMRaiseSWI(cpu); return; case GBA_SWI_DIV: + useStall = true; _Div(gba, cpu->gprs[0], cpu->gprs[1]); break; case GBA_SWI_DIV_ARM: + useStall = true; _Div(gba, cpu->gprs[1], cpu->gprs[0]); break; case GBA_SWI_SQRT: - cpu->gprs[0] = _Sqrt(cpu->gprs[0], &cpu->cycles); + useStall = true; + cpu->gprs[0] = _Sqrt(cpu->gprs[0], &gba->biosStall); break; case GBA_SWI_ARCTAN: - cpu->gprs[0] = _ArcTan(cpu->gprs[0], &cpu->gprs[1], &cpu->gprs[3], &cpu->cycles); + useStall = true; + cpu->gprs[0] = _ArcTan(cpu->gprs[0], &cpu->gprs[1], &cpu->gprs[3], &gba->biosStall); break; case GBA_SWI_ARCTAN2: - cpu->gprs[0] = (uint16_t) _ArcTan2(cpu->gprs[0], cpu->gprs[1], &cpu->gprs[1], &cpu->cycles); + useStall = true; + cpu->gprs[0] = (uint16_t) _ArcTan2(cpu->gprs[0], cpu->gprs[1], &cpu->gprs[1], &gba->biosStall); cpu->gprs[3] = 0x170; break; case GBA_SWI_CPU_SET:@@ -589,12 +599,25 @@ return;
default: mLOG(GBA_BIOS, STUB, "Stub software interrupt: %02X", immediate); } - gba->cpu->cycles += 45 + cpu->memory.activeNonseqCycles16 /* 8 bit load for SWI # */; - // Return cycles - if (gba->cpu->executionMode == MODE_ARM) { - gba->cpu->cycles += cpu->memory.activeNonseqCycles32 + cpu->memory.activeSeqCycles32; - } else { - gba->cpu->cycles += cpu->memory.activeNonseqCycles16 + cpu->memory.activeSeqCycles16; + if (useStall) { + if (gba->biosStall >= 18) { + gba->biosStall -= 18; + gba->cpu->cycles += gba->biosStall & 3; + gba->biosStall &= ~3; + ARMRaiseSWI(cpu); + } else { + gba->cpu->cycles += gba->biosStall; + useStall = false; + } + } + if (!useStall) { + gba->cpu->cycles += 45 + cpu->memory.activeNonseqCycles16 /* 8 bit load for SWI # */; + // Return cycles + if (gba->cpu->executionMode == MODE_ARM) { + gba->cpu->cycles += cpu->memory.activeNonseqCycles32 + cpu->memory.activeSeqCycles32; + } else { + gba->cpu->cycles += cpu->memory.activeNonseqCycles16 + cpu->memory.activeSeqCycles16; + } } gba->memory.biosPrefetch = 0xE3A02004; }
M
src/gba/gba.c
→
src/gba/gba.c
@@ -201,6 +201,7 @@
gba->cpuBlocked = false; gba->earlyExit = false; gba->dmaPC = 0; + gba->biosStall = 0; if (gba->yankedRomSize) { gba->memory.romSize = gba->yankedRomSize; gba->memory.romMask = toPow2(gba->memory.romSize) - 1;@@ -927,4 +928,4 @@
static void _clearSoftwareBreakpoint(struct ARMDebugger* debugger, const struct ARMDebugBreakpoint* breakpoint) { GBAClearBreakpoint((struct GBA*) debugger->cpu->master, breakpoint->d.address, breakpoint->sw.mode, breakpoint->sw.opcode); } -#endif+#endif
M
src/gba/hardware.c
→
src/gba/hardware.c
@@ -236,6 +236,7 @@ rtc->command = command;
rtc->bytesRemaining = RTC_BYTES[RTCCommandDataGetCommand(command)]; rtc->commandActive = rtc->bytesRemaining > 0; + mLOG(GBA_HW, DEBUG, "Got RTC command %x", RTCCommandDataGetCommand(command)); switch (RTCCommandDataGetCommand(command)) { case RTC_DATETIME: case RTC_TIME:
M
src/gba/hle-bios.c
→
src/gba/hle-bios.c
@@ -3,28 +3,28 @@
#include <mgba/internal/gba/memory.h> const uint8_t hleBios[SIZE_BIOS] = { - 0x06, 0x00, 0x00, 0xea, 0x66, 0x00, 0x00, 0xea, 0x0b, 0x00, 0x00, 0xea, + 0x06, 0x00, 0x00, 0xea, 0x66, 0x00, 0x00, 0xea, 0x0c, 0x00, 0x00, 0xea, 0xfe, 0xff, 0xff, 0xea, 0xfe, 0xff, 0xff, 0xea, 0x00, 0x00, 0xa0, 0xe1, 0x59, 0x00, 0x00, 0xea, 0xfe, 0xff, 0xff, 0xea, 0x02, 0x03, 0xa0, 0xe3, 0x03, 0x10, 0xd0, 0xe5, 0xea, 0x00, 0x51, 0xe3, 0x4c, 0x01, 0x9f, 0x15, 0x10, 0xff, 0x2f, 0xe1, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x29, 0xe1, - 0x00, 0x00, 0x5d, 0xe3, 0x01, 0xd3, 0xa0, 0x03, 0x20, 0xd0, 0x4d, 0x02, - 0x00, 0x58, 0x2d, 0xe9, 0x02, 0xb0, 0x5e, 0xe5, 0xd4, 0xc0, 0xa0, 0xe3, - 0x0b, 0xb1, 0x9c, 0xe7, 0x00, 0x00, 0x5b, 0xe3, 0x00, 0xc0, 0x4f, 0xe1, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5d, 0xe3, 0x01, 0xd3, 0xa0, 0x03, + 0x20, 0xd0, 0x4d, 0x02, 0x10, 0x58, 0x2d, 0xe9, 0x02, 0xb0, 0x5e, 0xe5, + 0xd4, 0xc0, 0xa0, 0xe3, 0x0b, 0xb1, 0x9c, 0xe7, 0xd2, 0xcf, 0xa0, 0xe3, + 0x0b, 0x00, 0x5c, 0xe1, 0x00, 0x00, 0xf0, 0x0f, 0x00, 0xc0, 0x4f, 0xe1, 0x00, 0x10, 0x2d, 0xe9, 0x80, 0xc0, 0x0c, 0xe2, 0x1f, 0xc0, 0x8c, 0xe3, - 0x0c, 0xf0, 0x29, 0xe1, 0x00, 0x40, 0x2d, 0xe9, 0x00, 0x00, 0xa0, 0xe1, - 0x00, 0x00, 0xa0, 0xe1, 0x00, 0x00, 0xa0, 0xe1, 0x00, 0x00, 0xa0, 0xe1, + 0x0c, 0xf0, 0x21, 0xe1, 0x00, 0x40, 0x2d, 0xe9, 0x00, 0x00, 0x5b, 0xe3, 0x00, 0x00, 0xa0, 0xe1, 0x00, 0x00, 0xa0, 0xe1, 0x00, 0x00, 0xa0, 0xe1, 0x00, 0x00, 0xa0, 0xe1, 0x00, 0x00, 0xa0, 0xe1, 0x00, 0x00, 0xa0, 0xe1, 0x0f, 0xe0, 0xa0, 0xe1, 0x1b, 0xff, 0x2f, 0x11, 0x00, 0x00, 0xa0, 0xe1, - 0x00, 0x00, 0xa0, 0xe1, 0x00, 0x00, 0xa0, 0xe1, 0x00, 0x00, 0xa0, 0xe1, - 0x00, 0x40, 0xbd, 0xe8, 0x93, 0xf0, 0x29, 0xe3, 0x00, 0x10, 0xbd, 0xe8, - 0x0c, 0xf0, 0x69, 0xe1, 0x00, 0x58, 0xbd, 0xe8, 0x0e, 0xf0, 0xb0, 0xe1, - 0x00, 0x00, 0x00, 0x00, 0x04, 0x20, 0xa0, 0xe3, 0xb0, 0x01, 0x00, 0x00, + 0x00, 0x00, 0xa0, 0xe1, 0x00, 0x00, 0xa0, 0xe1, 0x00, 0x40, 0xbd, 0xe8, + 0x93, 0xf0, 0x29, 0xe3, 0x00, 0x10, 0xbd, 0xe8, 0x0c, 0xf0, 0x69, 0xe1, + 0x10, 0x58, 0xbd, 0xe8, 0x0e, 0xf0, 0xb0, 0xe1, 0x00, 0x00, 0x00, 0x00, + 0x04, 0x20, 0xa0, 0xe3, 0x00, 0x00, 0x00, 0x00, 0xb0, 0x01, 0x00, 0x00, 0xb0, 0x01, 0x00, 0x00, 0xb4, 0x01, 0x00, 0x00, 0xb0, 0x01, 0x00, 0x00, - 0xcc, 0x01, 0x00, 0x00, 0xc4, 0x01, 0x00, 0x00, 0xb0, 0x01, 0x00, 0x00, - 0xb0, 0x01, 0x00, 0x00, 0xb0, 0x01, 0x00, 0x00, 0xb0, 0x01, 0x00, 0x00, - 0xb0, 0x01, 0x00, 0x00, 0x14, 0x02, 0x00, 0x00, 0xa8, 0x02, 0x00, 0x00, + 0xcc, 0x01, 0x00, 0x00, 0xc4, 0x01, 0x00, 0x00, 0x48, 0x03, 0x00, 0x00, + 0x48, 0x03, 0x00, 0x00, 0x48, 0x03, 0x00, 0x00, 0x48, 0x03, 0x00, 0x00, + 0x48, 0x03, 0x00, 0x00, 0x14, 0x02, 0x00, 0x00, 0xa8, 0x02, 0x00, 0x00, 0xb0, 0x01, 0x00, 0x00, 0xb0, 0x01, 0x00, 0x00, 0xb0, 0x01, 0x00, 0x00, 0xb0, 0x01, 0x00, 0x00, 0xb0, 0x01, 0x00, 0x00, 0xb0, 0x01, 0x00, 0x00, 0xb0, 0x01, 0x00, 0x00, 0xb0, 0x01, 0x00, 0x00, 0xb0, 0x01, 0x00, 0x00,@@ -72,5 +72,6 @@ 0x01, 0x40, 0xa0, 0xe1, 0x01, 0x50, 0xa0, 0xe1, 0x01, 0x60, 0xa0, 0xe1,
0x01, 0x70, 0xa0, 0xe1, 0x01, 0x80, 0xa0, 0xe1, 0x01, 0x90, 0xa0, 0xe1, 0x01, 0xa0, 0xa0, 0xe1, 0xfa, 0x07, 0xa0, 0xe8, 0xfa, 0x07, 0xa0, 0xe8, 0xfa, 0x07, 0xa0, 0xe8, 0xfa, 0x07, 0xa0, 0xe8, 0x00, 0x10, 0xa0, 0xe3, - 0xf0, 0x07, 0xbd, 0xe8, 0x1e, 0xff, 0x2f, 0xe1, 0xb0, 0x01, 0x00, 0x00 + 0xf0, 0x07, 0xbd, 0xe8, 0x1e, 0xff, 0x2f, 0xe1, 0xb0, 0x01, 0x00, 0x00, + 0x04, 0x40, 0x54, 0xe2, 0xfd, 0xff, 0xff, 0x8a, 0x1e, 0xff, 0x2f, 0xe1 };
M
src/gba/hle-bios.s
→
src/gba/hle-bios.s
@@ -25,25 +25,26 @@ bx r0
.word 0 .word 0xE129F000 +.word 0 @ Padding for back-compat + swiBase: cmp sp, #0 moveq sp, #0x04000000 subeq sp, #0x20 -stmfd sp!, {r11-r12, lr} +stmfd sp!, {r4, r11-r12, lr} ldrb r11, [lr, #-2] mov r12, #swiTable ldr r11, [r12, r11, lsl #2] -cmp r11, #0 +mov r12, #StallCall +cmp r12, r11 +swieq 0xF00000 @ Special mGBA-internal call to load the stall count into r4 mrs r12, spsr stmfd sp!, {r12} and r12, #0x80 orr r12, #0x1F -msr cpsr, r12 +msr cpsr_c, r12 stmfd sp!, {lr} -nop -nop -nop -nop +cmp r11, #0 nop nop nop@@ -55,15 +56,16 @@ bxne r11
nop nop nop -nop ldmfd sp!, {lr} msr cpsr, #0x93 ldmfd sp!, {r12} msr spsr, r12 -ldmfd sp!, {r11-r12, lr} +ldmfd sp!, {r4, r11-r12, lr} movs pc, lr .word 0 .word 0xE3A02004 + +.word 0 @ Padding for back-compat swiTable: .word SoftReset @ 0x00@@ -131,11 +133,6 @@ @ Unimplemented
SoftReset: RegisterRamReset: Stop: -Div: -DivArm: -Sqrt: -ArcTan: -ArcTan2: GetBiosChecksum: BgAffineSet: ObjAffineSet:@@ -305,3 +302,14 @@ ldmfd sp!, {r4-r10}
bx lr .ltorg + +Div: +DivArm: +Sqrt: +ArcTan: +ArcTan2: + +StallCall: +subs r4, #4 +bhi StallCall +bx lr
M
src/gba/renderers/video-software.c
→
src/gba/renderers/video-software.c
@@ -800,6 +800,7 @@ bg->screenBase |= GBARegisterBGCNTGetScreenBase(value) << 11;
bg->overflow = GBARegisterBGCNTGetOverflow(value); bg->size = GBARegisterBGCNTGetSize(value); bg->control = value; + bg->yCache = -1; } static void GBAVideoSoftwareRendererWriteBGX_LO(struct GBAVideoSoftwareBackground* bg, uint16_t value) {
M
src/gba/serialize.c
→
src/gba/serialize.c
@@ -69,6 +69,7 @@ STORE_32(gba->irqEvent.when - mTimingCurrentTime(&gba->timing), 0, &state->nextIrq);
} miscFlags = GBASerializedMiscFlagsSetBlocked(miscFlags, gba->cpuBlocked); STORE_32(miscFlags, 0, &state->miscFlags); + STORE_32(gba->biosStall, 0, &state->nextIrq); GBAMemorySerialize(&gba->memory, state); GBAIOSerialize(gba, state);@@ -187,6 +188,7 @@ LOAD_32(when, 0, &state->nextIrq);
mTimingSchedule(&gba->timing, &gba->irqEvent, when); } gba->cpuBlocked = GBASerializedMiscFlagsGetBlocked(miscFlags); + LOAD_32(gba->biosStall, 0, &state->nextIrq); GBAVideoDeserialize(&gba->video, state); GBAMemoryDeserialize(&gba->memory, state);
M
src/platform/3ds/main.c
→
src/platform/3ds/main.c
@@ -95,7 +95,7 @@ static int activeOutputTexture = 0;
static ndspWaveBuf dspBuffer[DSP_BUFFERS]; static int bufferId = 0; static bool frameLimiter = true; -static u64 tickCounter; +static u32 frameCounter; static C3D_RenderTarget* topScreen[2]; static C3D_RenderTarget* bottomScreen[2];@@ -107,7 +107,6 @@ static C3D_Tex upscaleBufferTex;
static bool interframeBlending = false; static bool sgbCrop = false; -static aptHookCookie cookie; static bool core2; static bool _initGpu(void) {@@ -190,18 +189,6 @@ ndspExit();
ptmuExit(); } -static void _aptHook(APT_HookType hook, void* user) { - UNUSED(user); - switch (hook) { - case APTHOOK_ONEXIT: - _cleanup(); - exit(0); - break; - default: - break; - } -} - static void _map3DSKey(struct mInputMap* map, int ctrKey, enum GBAKey key) { mInputBindKey(map, _3DS_INPUT, __builtin_ctz(ctrKey), key); }@@ -213,11 +200,17 @@ if (frameStarted) {
return; } frameStarted = true; + + int screen = screenMode >= SM_PA_TOP ? GSP_SCREEN_TOP : GSP_SCREEN_BOTTOM; if (frameLimiter) { - if (tickCounter + 4481000 > svcGetSystemTick()) { - C3D_FrameSync(); + u32 oldFrame = frameCounter; + frameCounter = C3D_FrameCounter(screen); + while (oldFrame == frameCounter) { + gspWaitForAnyEvent(); + frameCounter = C3D_FrameCounter(screen); } - tickCounter = svcGetSystemTick(); + } else { + frameCounter = C3D_FrameCounter(screen); } C3D_FrameBegin(0); ctrStartFrame();@@ -350,7 +343,7 @@ break;
} osSetSpeedupEnable(true); - double ratio = GBAAudioCalculateRatio(1, 59.8260982880808, 1); + double ratio = GBAAudioCalculateRatio(1, 268111856.f / 4481136.f, 1); blip_set_rates(runner->core->getAudioChannel(runner->core, 0), runner->core->frequency(runner->core), 32768 * ratio); blip_set_rates(runner->core->getAudioChannel(runner->core, 1), runner->core->frequency(runner->core), 32768 * ratio); if (hasSound != NO_SOUND) {@@ -659,7 +652,6 @@ if (frameLimiter == limit) {
return; } frameLimiter = limit; - tickCounter = svcGetSystemTick(); } static bool _running(struct mGUIRunner* runner) {@@ -821,8 +813,6 @@ camera.d.requestImage = _requestImage;
camera.buffer = NULL; camera.bufferSize = 0; camera.cam = SELECT_IN1; - - aptHook(&cookie, _aptHook, 0); ptmuInit(); camInit();
M
src/platform/qt/SettingsView.cpp
→
src/platform/qt/SettingsView.cpp
@@ -300,6 +300,9 @@ if (!name.endsWith(".qm") || !name.startsWith(binaryName)) {
continue; } QLocale locale(name.remove(QString("%0-").arg(binaryName)).remove(".qm")); + if (locale.language() == QLocale::English) { + continue; + } m_ui.languages->addItem(locale.nativeLanguageName(), locale); if (locale.bcp47Name() == QLocale().bcp47Name()) { m_ui.languages->setCurrentIndex(m_ui.languages->count() - 1);
A
src/platform/qt/ts/mgba-en.ts
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1" language="en" sourcelanguage="en_US"> +</TS>