ams: various fixes to support booting debug configuration

This commit is contained in:
Michael Scire 2025-04-08 13:43:29 -07:00
parent 85fd13f724
commit 6125f40bdb
7 changed files with 7 additions and 7 deletions

View file

@ -1214,7 +1214,7 @@ namespace ams::kern::board::nintendo::nx {
for (size_t i = 0; i < map_count; ++i) { for (size_t i = 0; i < map_count; ++i) {
/* Get the physical address. */ /* Get the physical address. */
const KPhysicalAddress phys_addr = l2[l2_index + i].GetPhysicalAddress(); const KPhysicalAddress phys_addr = l2[l2_index + i].GetPhysicalAddress();
MESOSPHERE_ASSERT(IsHeapPhysicalAddress(phys_addr)); MESOSPHERE_ASSERT(phys_addr == Null<KPhysicalAddress> || IsHeapPhysicalAddress(phys_addr));
/* Fully invalidate the entry. */ /* Fully invalidate the entry. */
l2[l2_index + i].Invalidate(); l2[l2_index + i].Invalidate();

View file

@ -95,7 +95,7 @@ namespace ams::impl {
AMS_DEFINE_SYSTEM_THREAD(16, creport, Main); AMS_DEFINE_SYSTEM_THREAD(16, creport, Main);
/* ro. */ /* ro. */
AMS_DEFINE_SYSTEM_THREAD(16, ro, Main); AMS_DEFINE_SYSTEM_THREAD(21, ro, Main);
/* gpio. */ /* gpio. */
AMS_DEFINE_SYSTEM_THREAD(-12, gpio, InterruptHandler); AMS_DEFINE_SYSTEM_THREAD(-12, gpio, InterruptHandler);

View file

@ -50,7 +50,7 @@ namespace ams::ddsf {
} }
void DetachDevice() { void DetachDevice() {
AMS_ASSERT(this->IsOpen()); /* AMS_ASSERT(this->IsOpen()); */
m_device = nullptr; m_device = nullptr;
m_access_mode = AccessMode_None; m_access_mode = AccessMode_None;
AMS_ASSERT(!this->IsOpen()); AMS_ASSERT(!this->IsOpen());

View file

@ -20,7 +20,7 @@ namespace ams::diag {
namespace impl { namespace impl {
constexpr inline size_t DebugPrintBufferLength = 0x80; constexpr inline size_t DebugPrintBufferLength = 0x100;
} }

View file

@ -22,7 +22,7 @@ namespace ams::powctl {
namespace { namespace {
impl::SessionImpl &GetOpenSessionImpl(Session &session) { impl::SessionImpl &GetOpenSessionImpl(Session &session) {
AMS_ASSERT(session.has_session); /* AMS_ASSERT(session.has_session); */
auto &impl = GetReference(session.impl_storage); auto &impl = GetReference(session.impl_storage);
AMS_ASSERT(impl.IsOpen()); AMS_ASSERT(impl.IsOpen());
return impl; return impl;

View file

@ -22,7 +22,7 @@ namespace ams::powctl {
namespace { namespace {
impl::SessionImpl &GetOpenSessionImpl(Session &session) { impl::SessionImpl &GetOpenSessionImpl(Session &session) {
AMS_ASSERT(session.has_session); /* AMS_ASSERT(session.has_session); */
auto &impl = GetReference(session.impl_storage); auto &impl = GetReference(session.impl_storage);
AMS_ASSERT(impl.IsOpen()); AMS_ASSERT(impl.IsOpen());
return impl; return impl;

View file

@ -19,7 +19,7 @@
namespace ams { namespace ams {
constexpr inline size_t DefaultAlignment = alignof(max_align_t); constexpr inline size_t DefaultAlignment = /*alignof(max_align_t)*/ 0x8;
using AllocateFunction = void *(*)(size_t); using AllocateFunction = void *(*)(size_t);
using AllocateFunctionWithUserData = void *(*)(size_t, void *); using AllocateFunctionWithUserData = void *(*)(size_t, void *);