switch: updated build environment for Nintendo Switch. #476

xlanor · 2024-11-15T22:55:39Z

THIS DOES NOT INDICATE THAT CHIAKI-NG IS READY FOR THE SWITCH!

This is an initial PR fixes the build environment and updates some libraries for Nintendo Switch environment. Tested against fw 18.1.

A basic compilation works and I am able to connect locally. However, note that things like unlocking the PS5 doesnt seem to work.

I'm pretty sure the cmake stuff that I changed is not optimal but thats the only thing that can find the right libraries at compile time. open to suggestions.

switch-curl and switch-mbedtls have been updated past the devkitpro supplied versions to 8.11.0 and 3.6.2 respectively.

Both of them have been patched before compilation for compatibility with existing code in libchiaki/switch architecture. You can find the build scripts and patches for the updated development and compilation environment here. I will move them into this repository once I have stopped pushing changes every other day to test different things out.

The gist of the changes is that switch-curl has been bumped to 8.11.0 with WSS and mbedtls has been re-enabled, while mbed-tls has been bumped to 3.6.2 and patched to removed private variables in structs.

Thanks to ngynkvyn as well for helping to debug some of the environment stuff.

I am sure there will be more work to be done, but this gets the switch code to a state where it is buildable at least.

Those in #355 who wanted to help with development, this is probably a good time now that it can be compiled.

xlanor · 2024-11-15T22:56:49Z

lib/CMakeLists.txt

@@ -161,11 +195,6 @@ else()
 	target_link_libraries(chiaki-lib OpenSSL::Crypto)
 endif()

-if (CHIAKI_USE_SYSTEM_CURL)


if curl comes after mbedtls, it fails at linking time as it is unable to find the mbedtls references.

xlanor · 2024-11-15T22:57:58Z

lib/src/thread.c

@@ -251,7 +251,7 @@ static void set_timeout(struct timespec *timeout, uint64_t ms_from_now)
 }
 #endif

-#if !__APPLE__
+#if !__APPLE__ && !__SWITCH__


pthread_clockjoin_np is not avaliable in aarch64_none_elf. It appears that this function is used in chiaki-cli only (I believe) so I have removed it for switch for now.

it can be removed for switch, it's just used for the discover command in the cli

xlanor · 2024-11-15T23:01:37Z

lib/src/gkcrypt.c

@@ -384,7 +387,7 @@ CHIAKI_EXPORT ChiakiErrorCode chiaki_gkcrypt_gmac(ChiakiGKCrypt *gkcrypt, uint64
 	}

 	// encrypt without additional data
-	if(mbedtls_gcm_starts(&actx, MBEDTLS_GCM_ENCRYPT, iv, CHIAKI_GKCRYPT_BLOCK_SIZE, NULL, 0) != 0)
+	if(mbedtls_gcm_starts(&actx, MBEDTLS_GCM_ENCRYPT, iv, CHIAKI_GKCRYPT_BLOCK_SIZE) != 0)


I believe switch is the only build that uses mbedtls, I can add switch ifdefs around the mbedtls api updates if need be.

In other areas, mbedtls 3.x breaks a ton of stuff especially around ecdh calculation as all the variables are private. I have patched switch-mbedtls to remove the private checks on the structs as I don't see a clear way in the public API to extract the required variables to recalculate dhk.

lib/CMakeLists.txt

xlanor · 2024-11-15T23:36:38Z

switch/include/io.h

@@ -108,7 +108,7 @@ class IO

 		~IO();
 		void SetMesaConfig();
-		bool VideoCB(uint8_t *buf, size_t buf_size);
+		bool VideoCB(uint8_t *buf, size_t buf_size, int32_t frames_lost, bool frame_recovered, void *user);


libavcodec api changes

xlanor · 2024-11-15T23:37:38Z

switch/src/main.cpp

@@ -28,7 +28,6 @@ bool appletMainLoop()
 // use a custom nintendo switch socket config
 // chiaki requiers many threads with udp/tcp sockets
 static const SocketInitConfig g_chiakiSocketInitConfig = {
-	.bsdsockets_version = 1,


libnx changes, doxygen

streetpea · 2024-11-16T00:47:38Z

@xlanor the icon is different from the logo and is here: https://github.com/streetpea/chiaki-ng/blob/main/gui/chiaking.png

xlanor · 2024-11-16T00:49:08Z

@xlanor the icon is different from the logo and is here: https://github.com/streetpea/chiaki-ng/blob/main/gui/chiaking.png

Will swap in the morning

streetpea · 2024-11-16T00:55:47Z

other than the icon swapping and potentially looking at setting CPATH instead of hardcoding the path, LGTM

Signed-off-by: xlanor <[email protected]>

xlanor · 2024-11-16T10:14:40Z

@streetpea changes made!

Signed-off-by: xlanor <[email protected]>

xlanor · 2024-11-16T10:30:24Z

hmm I just realised the changes worked for mbedtls + curl but not jsonc.

Will come back and look at json c again. For some reason the INCLUDE_DIRECTORIES is not being set which I think is causing this


-- CMAKE_FIND_ROOT_PATH = 
-- PKG_CONFIG_EXECUTABLE = /opt/devkitpro/portlibs/switch/bin/aarch64-none-elf-pkg-config
-- CMAKE_EXE_LINKER_FLAGS = 
-- INCLUDE_DIRECTORIES = 
-- CMAKE_C_COMPILER = /opt/devkitpro/devkitA64/bin/aarch64-none-elf-gcc
-- CMAKE_CXX_COMPILER = /opt/devkitpro/devkitA64/bin/aarch64-none-elf-g++
-- elf2nro: /opt/devkitpro/tools/bin/elf2nro - found
-- nacptool: /opt/devkitpro/tools/bin/nacptool - found
-- CMAKE_FIND_ROOT_PATH = 
-- PKG_CONFIG_EXECUTABLE = /opt/devkitpro/portlibs/switch/bin/aarch64-none-elf-pkg-config
-- CMAKE_EXE_LINKER_FLAGS = 
-- INCLUDE_DIRECTORIES = 
-- CMAKE_C_COMPILER = /opt/devkitpro/devkitA64/bin/aarch64-none-elf-gcc
-- CMAKE_CXX_COMPILER = /opt/devkitpro/devkitA64/bin/aarch64-none-elf-g++
-- elf2nro: /opt/devkitpro/tools/bin/elf2nro - found
-- nacptool: /opt/devkitpro/tools/bin/nacptool - found
-- The C compiler identification is GNU 14.2.0
-- The CXX compiler identification is GNU 14.2.0

Will look at it tonight.

Black-Hill852 · 2024-11-16T11:23:18Z

can someone upload a compiled .nro for the switch 2 use?

xlanor · 2024-11-16T11:24:41Z

This is not ready for use yet, only updates the build environment. Please keep this PR to dev discussion

…

Sent from my iPhone

On Sat, 16 Nov 2024 at 11:23, Black-Hill852 ***@***.***> wrote: can someone upload a compiled .ro for the switch 2 use? — Reply to this email directly, view it on GitHub <#476 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AG64FNRKNT3OVPNZMDYQXVL2A4TLZAVCNFSM6AAAAABR4DVI6SVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDIOBQGUZDQNRRGU> . You are receiving this because you were mentioned.Message ID: ***@***.***>

Black-Hill852 · 2024-11-16T11:29:04Z

This is not ready for use yet, only updates the build environment.
…
Sent from my iPhone
On Sat, 16 Nov 2024 at 11:23, Black-Hill852 @.> wrote: can someone upload a compiled .ro for the switch 2 use? — Reply to this email directly, view it on GitHub <#476 (comment)>, or unsubscribe https://github.com/notifications/unsubscribe-auth/AG64FNRKNT3OVPNZMDYQXVL2A4TLZAVCNFSM6AAAAABR4DVI6SVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDIOBQGUZDQNRRGU . You are receiving this because you were mentioned.Message ID: @.>

okay thanks for that info. I use the old chiaki.nro and there is the Problem, no Pin Support.

Signed-off-by: xlanor <[email protected]>

squashed: updated environment and various functions for Nintendo Switch

ab1d031

xlanor commented Nov 15, 2024

View reviewed changes

lib/CMakeLists.txt Outdated Show resolved Hide resolved

xlanor changed the title ~~switch: updated environment and various functions for Nintendo Switch~~ switch: updated build environment for Nintendo Switch. Nov 15, 2024

xlanor commented Nov 15, 2024

View reviewed changes

xlanor added 3 commits November 16, 2024 10:00

fix: CMake absolute paths

8307b71

Signed-off-by: xlanor <[email protected]>

fix: changed to nro icon

43f97df

Signed-off-by: xlanor <[email protected]>

fix: update title, looking for new icon...

948b87e

Signed-off-by: xlanor <[email protected]>

fix: in-app icon

ca27ac7

Signed-off-by: xlanor <[email protected]>

do not hardcode /opt/devkitpro

ca60091

Signed-off-by: xlanor <[email protected]>

xlanor requested a review from streetpea November 16, 2024 17:03

added readme

48163b5

Signed-off-by: xlanor <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

switch: updated build environment for Nintendo Switch. #476

switch: updated build environment for Nintendo Switch. #476

xlanor commented Nov 15, 2024 •

edited

Loading

xlanor Nov 15, 2024

xlanor Nov 15, 2024 •

edited

Loading

streetpea Nov 16, 2024

xlanor Nov 15, 2024 •

edited

Loading

xlanor Nov 15, 2024 •

edited

Loading

xlanor Nov 15, 2024

streetpea commented Nov 16, 2024

xlanor commented Nov 16, 2024

streetpea commented Nov 16, 2024

xlanor commented Nov 16, 2024 •

edited

Loading

xlanor commented Nov 16, 2024 •

edited

Loading

Black-Hill852 commented Nov 16, 2024 •

edited

Loading

xlanor commented Nov 16, 2024 via email •

edited

Loading

Black-Hill852 commented Nov 16, 2024

switch: updated build environment for Nintendo Switch. #476

Are you sure you want to change the base?

switch: updated build environment for Nintendo Switch. #476

Conversation

xlanor commented Nov 15, 2024 • edited Loading

THIS DOES NOT INDICATE THAT CHIAKI-NG IS READY FOR THE SWITCH!

xlanor Nov 15, 2024

Choose a reason for hiding this comment

xlanor Nov 15, 2024 • edited Loading

Choose a reason for hiding this comment

streetpea Nov 16, 2024

Choose a reason for hiding this comment

xlanor Nov 15, 2024 • edited Loading

Choose a reason for hiding this comment

xlanor Nov 15, 2024 • edited Loading

Choose a reason for hiding this comment

xlanor Nov 15, 2024

Choose a reason for hiding this comment

streetpea commented Nov 16, 2024

xlanor commented Nov 16, 2024

streetpea commented Nov 16, 2024

xlanor commented Nov 16, 2024 • edited Loading

xlanor commented Nov 16, 2024 • edited Loading

Black-Hill852 commented Nov 16, 2024 • edited Loading

xlanor commented Nov 16, 2024 via email • edited Loading

Black-Hill852 commented Nov 16, 2024

xlanor commented Nov 15, 2024 •

edited

Loading

xlanor Nov 15, 2024 •

edited

Loading

xlanor Nov 15, 2024 •

edited

Loading

xlanor Nov 15, 2024 •

edited

Loading

xlanor commented Nov 16, 2024 •

edited

Loading

xlanor commented Nov 16, 2024 •

edited

Loading

Black-Hill852 commented Nov 16, 2024 •

edited

Loading

xlanor commented Nov 16, 2024 via email •

edited

Loading