From 4174fbc23f8c6df49a553d527b047f99fca12b15 Mon Sep 17 00:00:00 2001 From: RadWolfie Date: Sun, 4 Feb 2024 13:29:40 -0600 Subject: [PATCH] review remarks --- src/core/kernel/exports/EmuKrnlXbox.cpp | 14 +++++++++----- src/devices/Xbox.h | 1 + 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/core/kernel/exports/EmuKrnlXbox.cpp b/src/core/kernel/exports/EmuKrnlXbox.cpp index 3aeeabd3d..17756295a 100644 --- a/src/core/kernel/exports/EmuKrnlXbox.cpp +++ b/src/core/kernel/exports/EmuKrnlXbox.cpp @@ -41,15 +41,19 @@ XBSYSAPI EXPORTNUM(321) xbox::XBOX_KEY_DATA xbox::XboxEEPROMKey = { 0 }; // ****************************************************************** // * 0x0142 - XboxHardwareInfo // ****************************************************************** +// TODO: The main goal is to completely unset custom init values and have +// them set from kernel's initialization end and device classes. +// Although, device classes does not really set this value but read +// from PCI space for Gpu rev, Mcp rev, and possibility INTERNAL_USB flag. XBSYSAPI EXPORTNUM(322) xbox::XBOX_HARDWARE_INFO xbox::XboxHardwareInfo = { // TODO: What exactly 0xC0000030 flags are? Might need default to null then set them later properly. // NOTE: Will be set by src/devices/Xbox.cpp and maybe other file(s)... - 0xC0000030, // Flags: 1=INTERNAL_USB, 2=DEVKIT, 4=MACROVISION, 8=CHIHIRO - 0xD3, // GpuRevision, byte read from NV2A first register, at 0xFD0000000 - see NV_PMC_BOOT_0 - 0, // NOTE: Will be set by src/devices/Xbox.cpp file. - 0, // unknown - 0 // unknown + .Flags = 0xC0000030, // Flags: 1=INTERNAL_USB, 2=DEVKIT, 4=MACROVISION, 8=CHIHIRO + .GpuRevision = 0xD3, // GpuRevision, byte read from NV2A first register, at 0xFD0000000 - see NV_PMC_BOOT_0 + .McpRevision = 0, // NOTE: Will be set by src/devices/Xbox.cpp file. + .Unknown3 = 0, // unknown + .Unknown4 = 0 // unknown }; // ****************************************************************** diff --git a/src/devices/Xbox.h b/src/devices/Xbox.h index c47479aa1..22a426ca5 100644 --- a/src/devices/Xbox.h +++ b/src/devices/Xbox.h @@ -54,6 +54,7 @@ typedef enum { Revision1_5, Revision1_6, Retail = 0x00, + // We don't need include revison 1.0 to 1.6 here, use above revision range instead. DebugKit = 0x10, // TODO: Since there are 1.0/1.1/1.2 revisions. For now, let's go with 1.2 by default. DebugKit_r1_2 = DebugKit | Revision1_2, Chihiro = 0x20,