Basic ("the console boots and functions as expected") 22.0.0 support by alula · Pull Request #2744 · Atmosphere-NX/Atmosphere

alula · 2026-03-17T10:38:35Z

Heavily work in progress :)

(I've opened it just because a lot of people tend to be impatient right now)

TODO (please avoid building / using until it's done):

borntohonk · 2026-03-17T10:56:09Z

        alignas(se::AesBlockSize) constexpr inline const u8 EristaMasterKekSource[se::AesBlockSize] = {
            /* TODO: Update on next change of keys. */
-            0x66, 0xC8, 0xCB, 0x3D, 0xEC, 0xF4, 0x59, 0x73, 0x54, 0x88, 0xE1, 0x2E, 0xE6, 0x3D, 0x68, 0x46
+            0x2E, 0x27, 0x44, 0xEA, 0x32, 0xF8, 0x2C, 0xF0, 0x6F, 0xCA, 0xCD, 0x77, 0xAE, 0xAE, 0x1A, 0x1B


0x15, 0xAC, 0x96, 0x34, 0xF5, 0x32, 0x56, 0x68, 0xFE, 0x5B, 0x9D, 0xD7, 0xED, 0x19, 0xB7, 0x8E

see my pr #2743

nice catch, thank you :3

borntohonk · 2026-03-17T11:03:17Z


    constexpr inline int MinimumValidDataVersion  = 0;   /* We allow older package2 to load; this value is currently 0x18 in Nintendo's code. */
-    constexpr inline int CurrentBootloaderVersion = 0x18;
+    constexpr inline int CurrentBootloaderVersion = 0x19;


The bootloader version is 0x17, incrementing this is not necessary.

borntohonk · 2026-03-17T11:07:32Z

kinda sus that you set up a PR almost identical to mine an hour later than me, ngl

masagrator · 2026-03-17T11:18:22Z

kinda sus that you set up a PR almost identical to mine an hour later than me, ngl

If you would read ReSwitched discord you would know that they were getting ready for this since SciresM retired.

You updated just keys and patches while they updated kernel on top of that.

alula · 2026-03-17T11:24:02Z

kinda sus that you set up a PR almost identical to mine an hour later than me, ngl

I literally started working on this few hours before you opened the PR and I've only opened a PR here to let people outside ReSwitched know it's being worked on. And to precisely avoid low effort / super hacky fixes.

Other than that, thanks for pointing the mistakes out :)

impeeza · 2026-03-17T20:46:05Z

Heavily work in progress :)

(I've opened it just because a lot of people tend to be impatient right now)

TODO (please avoid building / using until it's done):
* [ ]  kernel

* [ ]  erpt

* [ ]  LogManager

* [ ]  pgl

Hello there, thanks a lot for your work, and please do not let other people to push you or be rude.

GoodmanBCN10 · 2026-03-17T21:12:37Z

Step by step!! 🙌🏻🙌🏻

rezatnoMsirhC

Thank you for taking on this effort! I'm interested in the solution and want to contribute in any way possible, so apologies in advance for my basic review and general unfamiliarity with this codebase.

rezatnoMsirhC · 2026-03-18T20:47:53Z

        R_UNLESS(m_capabilities.GetIntendedKernelVersion() <= ams::svc::SupportedKernelVersion, svc::ResultInvalidCombination());

+        /* Enable mapping device pages as executable on legacy processes. */
+        if (m_capabilities.GetIntendedKernelMajorVersion() < 26) {


Not sure if the 26 here is derived from SDKMajorVersion 22 + 4 based on the SDK->SVC Major Version conversion logic, but if it is, it would be more readable if ams::svc::ConvertToSvcMajorVersion(22) from svc_version.hpp were used in this expression.

Suggested change

if (m_capabilities.GetIntendedKernelMajorVersion() < 26) {

if (m_capabilities.GetIntendedKernelMajorVersion() < ams::svc::ConvertToSvcMajorVersion(22)) {

rezatnoMsirhC · 2026-03-18T20:53:00Z

    constexpr inline int MinimumValidDataVersion  = 0;   /* We allow older package2 to load; this value is currently 0x18 in Nintendo's code. */
-    constexpr inline int CurrentBootloaderVersion = 0x18;
+    constexpr inline int CurrentBootloaderVersion = 0x17;


Is 0x17 the confirmed bootloader-version from 22.0.0 pk2 header, is this a work-in-progress placeholder pending reverse engineering, or is this an accidental regression?

The comment above mentions:

this value is currently 0x18 in Nintendo's code

Just noticed @borntohonk suggested this should be 0x17 earlier. I'm still curious why this should be decremented, but I'm sure y'all know what you're doing.

I think it is safe to put it at 0x18 as ScriesM did in the last release.

hexkyz · 2026-03-18T21:43:17Z

Please change the target branch to the new 22_support. I'll review these along with #2743.

Co-authored-by: nvnprogram <[email protected]>

kapeas · 2026-03-19T03:40:56Z

Damn, you guys are fast. Trying to understand all the hex values changes with no idea, but thank all of you who decided to put your time and skills so atms keeps maintained. Waiting patiently and grateful 👏
EDIT: removed comment of unrequested tip

alula · 2026-03-19T04:55:09Z

Damn, you guys are fast. Trying to understand all the hex values changes with no idea, but thank all of you who decided to put your time and skills so atms keeps maintained. Waiting patiently and grateful 👏

Also, if you haven't done already, maybe add copilot as reviewer for typos, performance, and other not always desired complains/warnings helps me at job sometimes

LLMs without right knowledge and context will keep generating completely useless noise.

SciresM · 2026-03-19T05:32:32Z

I may be retired (and am not working on updates or involved), but I will permanently ban anyone who submits llm garbage to this repository from interacting with the whole organization.

Remaining changes are duplicated in pull request #2744

masagrator · 2026-03-20T05:05:22Z

No it won't, that's a Hekate error 🤣Also piracy is not supported and after deleting that line error is definitely different.

Wait for Atmosphere release, current code is incomplete.

Remaining changes are duplicated in pull request Atmosphere-NX#2744

@alula

- KProcess::Run() and CreateThread() SVC now write the current thread handle to TLS+0x110 - KPageTableBase::LockForMapDeviceAddressSpace now checks for a new KPageTableBase boolean, m_allowed_exec_device_mapping - Stub `am` + `acc` + `settings` cmd module that needs to work for qlaunch Thanks to: @alula and @yellows8 Source for changes: Atmosphere-NX/Atmosphere#2744, https://switchbrew.org/, https://yls8.mtheall.com/ Co-authored-by: PavelBARABANOV <[email protected]> Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3761 Reviewed-by: CamilleLaVey <[email protected]>

borntohonk reviewed Mar 17, 2026

View reviewed changes

alula force-pushed the 22_support branch from 875aad2 to f847028 Compare March 17, 2026 11:16

alula force-pushed the 22_support branch from f847028 to 9eca1b0 Compare March 17, 2026 18:28

rezatnoMsirhC reviewed Mar 18, 2026

View reviewed changes

hexkyz mentioned this pull request Mar 18, 2026

22.0.0 key enum, nogc, emummc - minimum viable product #2743

Closed

alula changed the base branch from master to 22_support March 18, 2026 22:02

alula and others added 10 commits March 18, 2026 23:25

fusee/exo/ams: update with new keydata/version enums

9cc82c6

kern: write thread handle to tls +0x110 on creation

0ee6277

svc: bump supported kernel version

76bceff

fs: DisableAutoSaveDataCreation was removed in 22

26990b3

pinmux: add a build time option to configure JC rail uart

5b0a483

kern: N made this an u32 for some reason

a985bdb

kern: make KProcess layout accurate to N's code

4e653f6

kern: don't allow mapping device pages as executable on abi 26.x+

b29dbea

erpt: make FieldType u8 to match Nintendo

f028802

erpt: Implement 22.0.0 commands and changes

1847db0

Co-authored-by: nvnprogram <[email protected]>

alula force-pushed the 22_support branch from e33ed24 to 1847db0 Compare March 18, 2026 22:34

erpt: rename old ControllerStyleList field

49e2330

hexkyz approved these changes Mar 19, 2026

View reviewed changes

hexkyz added a commit that referenced this pull request Mar 20, 2026

Merge emummc changes from pull request #2743

5dfdc6e

Remaining changes are duplicated in pull request #2744

alula marked this pull request as ready for review March 20, 2026 00:20

hexkyz merged commit b108318 into Atmosphere-NX:22_support Mar 20, 2026

aftercares0 mentioned this pull request Mar 20, 2026

22.0.0 Support #2746

Open

14 tasks

MasonT8198 mentioned this pull request Mar 23, 2026

ams/emummc: update for 22.0.0 m4xw/emuMMC#35

Closed

xinitrcn1 mentioned this pull request Mar 24, 2026

fw: support 22 citron-neo/emulator#66

Merged

NaGaa95 pushed a commit to NaGaa95/Atmosphere-Pro that referenced this pull request Apr 4, 2026

Merge emummc changes from pull request Atmosphere-NX#2743

ed4c9d5

Remaining changes are duplicated in pull request Atmosphere-NX#2744

	if (m_capabilities.GetIntendedKernelMajorVersion() < 26) {
	if (m_capabilities.GetIntendedKernelMajorVersion() < ams::svc::ConvertToSvcMajorVersion(22)) {

Conversation

alula commented Mar 17, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

borntohonk Mar 17, 2026

Choose a reason for hiding this comment

Uh oh!

alula Mar 17, 2026

Choose a reason for hiding this comment

Uh oh!

borntohonk Mar 17, 2026

Choose a reason for hiding this comment

Uh oh!

borntohonk commented Mar 17, 2026

Uh oh!

masagrator commented Mar 17, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

alula commented Mar 17, 2026

Uh oh!

impeeza commented Mar 17, 2026

Uh oh!

GoodmanBCN10 commented Mar 17, 2026

Uh oh!

rezatnoMsirhC left a comment

Choose a reason for hiding this comment

Uh oh!

rezatnoMsirhC Mar 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rezatnoMsirhC Mar 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rezatnoMsirhC Mar 18, 2026

Choose a reason for hiding this comment

Uh oh!

ELY3M Mar 19, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

hexkyz commented Mar 18, 2026

Uh oh!

kapeas commented Mar 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

alula commented Mar 19, 2026

Uh oh!

SciresM commented Mar 19, 2026

Uh oh!

masagrator commented Mar 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

alula commented Mar 17, 2026 •

edited

Loading

masagrator commented Mar 17, 2026 •

edited

Loading

rezatnoMsirhC Mar 18, 2026 •

edited

Loading

rezatnoMsirhC Mar 18, 2026 •

edited

Loading

kapeas commented Mar 19, 2026 •

edited

Loading

masagrator commented Mar 20, 2026 •

edited

Loading