feat(threading): remove support for riot_main

examples/benchmark/src/main.rs

@@ -1,10 +1,12 @@
 #![no_main]
 #![no_std]
+#![feature(type_alias_impl_trait)]
+#![feature(used_with_arg)]
 
 use riot_rs::rt::debug::println;
 
-#[no_mangle]
-fn riot_main() {
+#[riot_rs::thread]
+fn main() {
     match riot_rs::rt::benchmark(10000, || {
         //
     }) {

examples/core-sizes/src/main.rs

@@ -1,18 +1,19 @@
 #![no_main]
 #![no_std]
+#![feature(type_alias_impl_trait)]
+#![feature(used_with_arg)]
 
-use riot_rs as _;
 use riot_rs::rt::debug::{exit, println, EXIT_SUCCESS};
 
-#[no_mangle]
-fn riot_main() {
+#[riot_rs::thread]
+fn main() {
     println!(
         "riot_rs::thread::lock::Lock: {}",
-        core::mem::size_of::<riot_rs::thread::lock::Lock>()
+        core::mem::size_of::<riot_rs::thread::lock::Lock>(),
     );
     println!(
         "riot_rs::thread::Thread: {}",
-        core::mem::size_of::<riot_rs::thread::Thread>()
+        core::mem::size_of::<riot_rs::thread::Thread>(),
     );
 
     exit(EXIT_SUCCESS);

examples/embassy/src/main.rs

@@ -1,8 +1,7 @@
 #![no_main]
 #![no_std]
 #![feature(type_alias_impl_trait)]
-
-use riot_rs as _;
+#![feature(used_with_arg)]
 
 use riot_rs::rt::debug::exit;
 use riot_rs::rt::debug::println;
@@ -28,13 +27,13 @@ async fn async_task() {
     }
 }
 
-#[no_mangle]
-fn riot_main() {
+#[riot_rs::thread]
+fn main() {
     use embassy_time::Instant;
 
     println!(
-        "Hello from riot_main()! Running on a {} board.",
-        riot_rs::buildinfo::BOARD
+        "Hello from main()! Running on a {} board.",
+        riot_rs::buildinfo::BOARD,
     );
 
     let spawner = EXECUTOR.spawner();
@@ -45,7 +44,7 @@ fn riot_main() {
         println!(
             "now={}ms threadtest() val={}",
             Instant::now().as_millis(),
-            val
+            val,
         );
     }
 

examples/hello-world/Cargo.toml

@@ -8,4 +8,3 @@ publish = false
 [dependencies]
 riot-rs = { path = "../../src/riot-rs", features = [ "threading" ] }
 riot-rs-boards = { path = "../../src/riot-rs-boards" }
-riot-wrappers = { workspace = true, optional = true }

examples/hello-world/src/main.rs

@@ -1,21 +1,16 @@
 #![no_main]
 #![no_std]
+#![feature(type_alias_impl_trait)]
+#![feature(used_with_arg)]
 
-use riot_rs as _;
+use riot_rs::rt::debug::{exit, println};
 
-#[cfg(not(feature = "riot-wrappers"))]
-use riot_rs::rt::debug::println;
-
-#[cfg(feature = "riot-wrappers")]
-use riot_wrappers::println;
-
-use riot_rs::rt::debug::exit;
-
-#[no_mangle]
-fn riot_main() {
+#[riot_rs::thread]
+fn main() {
     println!(
-        "Hello from riot_main()! Running on a {} board.",
-        riot_rs::buildinfo::BOARD
+        "Hello from main()! Running on a {} board.",
+        riot_rs::buildinfo::BOARD,
     );
+
     exit(Ok(()));
 }

examples/minimal/Cargo.toml

@@ -7,5 +7,5 @@ edition = "2021"
 publish = false
 
 [dependencies]
-riot-rs = { path = "../../src/riot-rs" }
+riot-rs = { path = "../../src/riot-rs", features = ["threading"] }
 riot-rs-boards = { path = "../../src/riot-rs-boards" }

examples/minimal/src/main.rs

@@ -1,7 +1,7 @@
 #![no_main]
 #![no_std]
+#![feature(type_alias_impl_trait)]
+#![feature(used_with_arg)]
 
-use riot_rs as _;
-
-#[no_mangle]
-fn riot_main() {}
+#[riot_rs::thread]
+fn main() {}

src/riot-rs-rt/src/threading.rs

@@ -1,17 +1,4 @@
-use riot_rs_threads::{start_threading, thread_create, THREAD_FNS};
-
-const MAIN_STACK_SIZE: usize = 2048;
-
-extern "Rust" {
-    fn riot_main();
-}
-
-fn main_trampoline(_arg: usize) {
-    // SAFETY: FFI call to a Rust function
-    unsafe {
-        riot_main();
-    }
-}
+use riot_rs_threads::{start_threading, THREAD_FNS};
 
 /// # Safety
 ///
@@ -21,9 +8,6 @@ pub unsafe fn start() -> ! {
         thread_fn();
     }
 
-    let mut main_stack: [u8; MAIN_STACK_SIZE] = [0; MAIN_STACK_SIZE];
-    thread_create(main_trampoline, 0, &mut main_stack, 0);
-
     // SAFETY: this function must only be called once, enforced by caller
     unsafe {
         start_threading();