git rekt — mgba.git: dffb5eec30663812a9e83b599cf93500b6250c57

GB: Rotation support

Jeffrey Pfau jeffrey@endrift.com

Thu, 18 Feb 2016 21:54:06 -0800

commit

dffb5eec30663812a9e83b599cf93500b6250c57

parent

5bd0bacb8bbf7eac890fb9570fcbb8ae1c28407d

6 files changed, 65 insertions(+), 12 deletions(-)

jump to

src/core/core.h

src/gb/core.c

src/gba/core.c

src/platform/3ds/main.c

src/platform/qt/GameController.cpp

src/platform/wii/main.c

M src/core/core.h → src/core/core.h

@@ -91,6 +91,7 @@ void (*getGameTitle)(struct mCore*, char* title);
 	void (*getGameCode)(struct mCore*, char* title);
 
 	void (*setRTC)(struct mCore*, struct mRTCSource*);
+	void (*setRotation)(struct mCore*, struct mRotationSource*);
 };
 
 #if !defined(MINIMAL_CORE) || MINIMAL_CORE < 2

M src/gb/core.c → src/gb/core.c

@@ -239,6 +239,11 @@ struct GB* gb = core->board;
 	gb->memory.rtc = rtc;
 }
 
+static void _GBCoreSetRotation(struct mCore* core, struct mRotationSource* rotation) {
+	struct GB* gb = core->board;
+	gb->memory.rotation = rotation;
+}
+
 struct mCore* GBCoreCreate(void) {
 	struct GBCore* gbcore = malloc(sizeof(*gbcore));
 	struct mCore* core = &gbcore->d;
@@ -278,5 +283,6 @@ core->frequency = _GBCoreFrequency;
 	core->getGameTitle = _GBCoreGetGameTitle;
 	core->getGameCode = _GBCoreGetGameCode;
 	core->setRTC = _GBCoreSetRTC;
+	core->setRotation = _GBCoreSetRotation;
 	return core;
 }

M src/gba/core.c → src/gba/core.c

@@ -272,6 +272,11 @@ struct GBA* gba = core->board;
 	gba->rtcSource = rtc;
 }
 
+static void _GBACoreSetRotation(struct mCore* core, struct mRotationSource* rotation) {
+	struct GBA* gba = core->board;
+	gba->rotationSource = rotation;
+}
+
 struct mCore* GBACoreCreate(void) {
 	struct GBACore* gbacore = malloc(sizeof(*gbacore));
 	struct mCore* core = &gbacore->d;
@@ -311,5 +316,6 @@ core->frequency = _GBACoreFrequency;
 	core->getGameTitle = _GBACoreGetGameTitle;
 	core->getGameCode = _GBACoreGetGameCode;
 	core->setRTC = _GBACoreSetRTC;
+	core->setRotation = _GBACoreSetRotation;
 	return core;
 }

M src/platform/3ds/main.c → src/platform/3ds/main.c

@@ -4,10 +4,15 @@ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#ifdef M_CORE_GBA
 #include "gba/gba.h"
 #include "gba/gui/gui-runner.h"
 #include "gba/input.h"
 #include "gba/video.h"
+#endif
+#ifdef M_CORE_GB
+#include "gb/gb.h"
+#endif
 #include "util/gui.h"
 #include "util/gui/file-select.h"
 #include "util/gui/font.h"
@@ -249,9 +254,7 @@ screenCleanup |= SCREEN_CLEANUP_BOTTOM;
 }
 
 static void _setup(struct mGUIRunner* runner) {
-	if (runner->core->platform(runner->core) == PLATFORM_GBA) {
-		((struct GBA*) runner->core->board)->rotationSource = &rotation.d;
-	}
+	runner->core->setRotation(runner->core, &rotation.d);
 	if (hasSound != NO_SOUND) {
 		runner->core->setAVStream(runner->core, &stream);
 	}
@@ -279,13 +282,26 @@ runner->core->setAudioBufferSize(runner->core, AUDIO_SAMPLES);
 }
 
 static void _gameLoaded(struct mGUIRunner* runner) {
-	if (runner->core->platform(runner->core) == PLATFORM_GBA) {
+	switch (runner->core->platform(runner->core)) {
+#ifdef M_CORE_GBA
+	case PLATFORM_GBA:
 		if (((struct GBA*) runner->core->board)->memory.hw.devices & HW_TILT) {
 			HIDUSER_EnableAccelerometer();
 		}
 		if (((struct GBA*) runner->core->board)->memory.hw.devices & HW_GYRO) {
 			HIDUSER_EnableGyroscope();
 		}
+		break;
+#endif
+#ifdef M_CORE_GB
+	case PLATFORM_GB:
+		if (((struct GB*) runner->core->board)->memory.mbcType == GB_MBC7) {
+			HIDUSER_EnableAccelerometer();
+		}
+		break;
+#endif
+	default:
+		break;
 	}
 	osSetSpeedupEnable(true);
 
@@ -318,13 +334,26 @@ csndExecCmds(false);
 	}
 	osSetSpeedupEnable(false);
 
-	if (runner->core->platform(runner->core) == PLATFORM_GBA) {
+	switch (runner->core->platform(runner->core)) {
+#ifdef M_CORE_GBA
+	case PLATFORM_GBA:
 		if (((struct GBA*) runner->core->board)->memory.hw.devices & HW_TILT) {
 			HIDUSER_DisableAccelerometer();
 		}
 		if (((struct GBA*) runner->core->board)->memory.hw.devices & HW_GYRO) {
 			HIDUSER_DisableGyroscope();
 		}
+		break;
+#endif
+#ifdef M_CORE_GB
+	case PLATFORM_GB:
+		if (((struct GB*) runner->core->board)->memory.mbcType == GB_MBC7) {
+			HIDUSER_DisableAccelerometer();
+		}
+		break;
+#endif
+	default:
+		break;
 	}
 }
 
@@ -507,8 +536,8 @@
 static void _sampleRotation(struct mRotationSource* source) {
 	struct GBA3DSRotationSource* rotation = (struct GBA3DSRotationSource*) source;
 	// Work around ctrulib getting the entries wrong
-	rotation->accel = *(accelVector*)& hidSharedMem[0x48];
-	rotation->gyro = *(angularRate*)& hidSharedMem[0x5C];
+	rotation->accel = *(accelVector*) &hidSharedMem[0x48];
+	rotation->gyro = *(angularRate*) &hidSharedMem[0x5C];
 }
 
 static int32_t _readTiltX(struct mRotationSource* source) {

M src/platform/qt/GameController.cpp → src/platform/qt/GameController.cpp

@@ -20,12 +20,16 @@
 extern "C" {
 #include "core/config.h"
 #include "core/directories.h"
-#include "gba/audio.h"
+#ifdef M_CORE_GBA
 #include "gba/bios.h"
 #include "gba/core.h"
 #include "gba/gba.h"
 #include "gba/serialize.h"
 #include "gba/sharkport.h"
+#endif
+#ifdef M_CORE_GB
+#include "gb/gb.h"
+#endif
 #include "util/vfs.h"
 }
 
@@ -85,12 +89,19 @@ controller->m_audioProcessor->setInput(context);
 		}
 		mRTCGenericSourceInit(&controller->m_rtc, context->core);
 		context->core->setRTC(context->core, &controller->m_rtc.d);
+		context->core->setRotation(context->core, controller->m_inputController->rotationSource());
 
-		if (context->core->platform(context->core) == PLATFORM_GBA) {
-			GBA* gba = static_cast<GBA*>(context->core->board);
+#ifdef M_CORE_GBA
+		GBA* gba = static_cast<GBA*>(context->core->board);
+#endif
+#ifdef M_CORE_GB
+		GB* gb = static_cast<GB*>(context->core->board);
+#endif
+		switch (context->core->platform(context->core)) {
+#ifdef M_CORE_GBA
+		case PLATFORM_GBA:
 			gba->luminanceSource = &controller->m_lux;
 			gba->rumble = controller->m_inputController->rumble();
-			gba->rotationSource = controller->m_inputController->rotationSource();
 			gba->audio.psg.forceDisableCh[0] = !controller->m_audioChannels[0];
 			gba->audio.psg.forceDisableCh[1] = !controller->m_audioChannels[1];
 			gba->audio.psg.forceDisableCh[2] = !controller->m_audioChannels[2];

M src/platform/wii/main.c → src/platform/wii/main.c

@@ -523,8 +523,8 @@
 void _setup(struct mGUIRunner* runner) {
 	if (runner->core->platform(runner->core) == PLATFORM_GBA) {
 		((struct GBA*) runner->core->board)->rumble = &rumble;
-		((struct GBA*) runner->core->board)->rotationSource = &rotation;
 	}
+	runner->core->setRotation(runner->core, &rotation);
 
 	_mapKey(&runner->core->inputMap, GCN1_INPUT, PAD_BUTTON_A, GBA_KEY_A);
 	_mapKey(&runner->core->inputMap, GCN1_INPUT, PAD_BUTTON_B, GBA_KEY_B);

all repos — mgba @ dffb5eec30663812a9e83b599cf93500b6250c57

mGBA Game Boy Advance Emulator