From f9229590f552bf67d7b88dfeb945f970db086383 Mon Sep 17 00:00:00 2001 From: meepingsnesroms Date: Sun, 20 Jan 2019 14:26:51 -0800 Subject: [PATCH] Add CPU speed to muExpDriver --- qtBuildSystem/Mu/mainwindow.cpp | 2 +- tools/palm/muExpansionDriver/muExpDriver.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/qtBuildSystem/Mu/mainwindow.cpp b/qtBuildSystem/Mu/mainwindow.cpp index 633a7af..a5a69f2 100644 --- a/qtBuildSystem/Mu/mainwindow.cpp +++ b/qtBuildSystem/Mu/mainwindow.cpp @@ -292,7 +292,7 @@ void MainWindow::on_right_released(){ //emu control void MainWindow::on_ctrlBtn_clicked(){ if(!emu.isInited()){ - uint32_t enabledFeatures = FEATURE_EXT_KEYS | FEATURE_EMU_HONEST | FEATURE_HYBRID_CPU | FEATURE_CUSTOM_FB | FEATURE_DEBUG; + uint32_t enabledFeatures = FEATURE_EXT_KEYS | FEATURE_EMU_HONEST | FEATURE_FAST_CPU | FEATURE_HYBRID_CPU | FEATURE_CUSTOM_FB | FEATURE_DEBUG; QString sysDir = settings->value("resourceDirectory", "").toString(); uint32_t error = emu.init(sysDir + "/palmos41-en-m515.rom", QFile(sysDir + "/bootloader-en-m515.rom").exists() ? sysDir + "/bootloader-en-m515.rom" : "", sysDir + "/userdata-en-m515.ram", sysDir + "/sd-en-m515.img", enabledFeatures); diff --git a/tools/palm/muExpansionDriver/muExpDriver.c b/tools/palm/muExpansionDriver/muExpDriver.c index 0771538..3c81277 100644 --- a/tools/palm/muExpansionDriver/muExpDriver.c +++ b/tools/palm/muExpansionDriver/muExpDriver.c @@ -19,11 +19,11 @@ enum{ LCD_WIDTH, LCD_HEIGHT, EXTRA_RAM_MB_DYNAMIC_HEAP, + BOOT_CPU_SPEED, /*add new entries above*/ CONFIG_FILE_ENTRIES }; - static void install128mbRam(uint8_t mbDynamicHeap){ /*these functions are called by HwrInit, which can be called directly by apps*/ /*PrvGetRAMSize_10002C5E, small ROM*/ @@ -141,6 +141,7 @@ static void setConfigDefaults(uint32_t* configFile){ configFile[ARM_STACK_SIZE] = 0x4000; configFile[LCD_WIDTH] = 160; configFile[LCD_HEIGHT] = 220; + configFile[BOOT_CPU_SPEED] = 800;/*temp, hack for Chuzzle demo*/ configFile[EXTRA_RAM_MB_DYNAMIC_HEAP] = 10; } @@ -233,6 +234,9 @@ static void initBoot(uint32_t* configFile){ } setProperDeviceId(configFile[LCD_WIDTH], configFile[LCD_HEIGHT], !!(enabledFeatures & FEATURE_HYBRID_CPU), !!(enabledFeatures & FEATURE_EXT_KEYS)); + + writeArbitraryMemory32(EMU_REG_ADDR(EMU_VALUE), configFile[BOOT_CPU_SPEED]); + writeArbitraryMemory32(EMU_REG_ADDR(EMU_CMD), CMD_SET_CPU_SPEED); } }