Skip to content

Commit 51ea963

Browse files
committed
More cleanup
1 parent 8d67685 commit 51ea963

3 files changed

Lines changed: 2 additions & 4 deletions

File tree

src/core/kernel/kernel.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,6 @@ void Kernel::getProcessInfo() {
269269
// According to 3DBrew: Amount of private (code, data, heap) memory used by the process + total supervisor-mode
270270
// stack size + page-rounded size of the external handle table
271271
case 2:
272-
// FIXME
273272
regs[1] = fcramManager.getUsedCount(FcramRegion::App) * Memory::pageSize;
274273
regs[2] = 0;
275274
break;

src/core/memory.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -521,15 +521,14 @@ Result::HorizonResult Memory::queryMemory(MemoryInfo& out, u32 vaddr) {
521521
}
522522

523523
// Official kernel just returns an error here
524-
Helpers::panic("Failed to find block in QueryMemory!");
524+
Helpers::warn("Failed to find block in QueryMemory!");
525525
return Result::FailurePlaceholder;
526526
}
527527

528528
Result::HorizonResult Memory::testMemoryState(u32 vaddr, s32 pages, MemoryState desiredState) {
529529
for (auto& alloc : memoryInfo) {
530530
// Don't bother checking if we're to the left of the requested region
531531
if (vaddr >= alloc.end()) continue;
532-
533532
if (alloc.state != desiredState) return Result::FailurePlaceholder; // TODO: error for state mismatch
534533

535534
// If the end of this block comes after the end of the requested range with no errors, it's a success

src/panda_qt/config_window.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ ConfigWindow::ConfigWindow(ConfigCallback configCallback, MainWindowCallback win
172172
connectCheckbox(circlePadProEnabled, config.circlePadProEnabled);
173173
genLayout->addRow(circlePadProEnabled);
174174

175-
QCheckBox* fastmemEnabled = new QCheckBox(tr("Enable fastmem"));
175+
QCheckBox* fastmemEnabled = new QCheckBox(tr("Enable Fastmem"));
176176
connectCheckbox(fastmemEnabled, config.fastmemEnabled);
177177
genLayout->addRow(fastmemEnabled);
178178

0 commit comments

Comments
 (0)