diff --git a/etc/platforms.txt b/etc/platforms.txt index 42b27bc6..f93b240f 100644 --- a/etc/platforms.txt +++ b/etc/platforms.txt @@ -1,7 +1,5 @@ -p qemu_cortex_m0 -p qemu_cortex_m3 -p qemu_riscv32 --p qemu_riscv32/qemu_virt_riscv32/smp -p qemu_riscv64 --p qemu_riscv64/qemu_virt_riscv64/smp -p m2gl025_miv diff --git a/samples/bench/sample.yaml b/samples/bench/sample.yaml index 8304ffbb..0d8e5c1e 100644 --- a/samples/bench/sample.yaml +++ b/samples/bench/sample.yaml @@ -14,9 +14,7 @@ common: - qemu_cortex_m0 - qemu_cortex_m3 - qemu_riscv32 - - qemu_riscv32/qemu_virt_riscv32/smp - qemu_riscv64 - - qemu_riscv64/qemu_virt_riscv64/smp - nrf52840dk/nrf52840 tests: sample.rust/bench.plain: diff --git a/samples/blinky/sample.yaml b/samples/blinky/sample.yaml index 71590844..4878452c 100644 --- a/samples/blinky/sample.yaml +++ b/samples/blinky/sample.yaml @@ -7,9 +7,7 @@ common: - qemu_cortex_m0 - qemu_cortex_m3 - qemu_riscv32 - - qemu_riscv32/qemu_virt_riscv32/smp - qemu_riscv64 - - qemu_riscv64/qemu_virt_riscv64/smp - nrf52840dk/nrf52840 tests: sample.basic.blinky: diff --git a/samples/hello_world/sample.yaml b/samples/hello_world/sample.yaml index 470bf10d..48d2a383 100644 --- a/samples/hello_world/sample.yaml +++ b/samples/hello_world/sample.yaml @@ -13,9 +13,7 @@ common: - qemu_cortex_m0 - qemu_cortex_m3 - qemu_riscv32 - - qemu_riscv32/qemu_virt_riscv32/smp - qemu_riscv64 - - qemu_riscv64/qemu_virt_riscv64/smp - nrf52840dk/nrf52840 tests: sample.rust.helloworld: diff --git a/samples/philosophers/sample.yaml b/samples/philosophers/sample.yaml index 6aeb60f9..8738850c 100644 --- a/samples/philosophers/sample.yaml +++ b/samples/philosophers/sample.yaml @@ -15,9 +15,7 @@ common: - qemu_cortex_m0 - qemu_cortex_m3 - qemu_riscv32 - - qemu_riscv32/qemu_virt_riscv32/smp - qemu_riscv64 - - qemu_riscv64/qemu_virt_riscv64/smp - nrf52840dk/nrf52840 tests: sample.rust.philosopher.semaphore: diff --git a/samples/work-philosophers/sample.yaml b/samples/work-philosophers/sample.yaml index abddfe78..be3698fd 100644 --- a/samples/work-philosophers/sample.yaml +++ b/samples/work-philosophers/sample.yaml @@ -13,9 +13,7 @@ common: - qemu_cortex_m0 - qemu_cortex_m3 - qemu_riscv32 - - qemu_riscv32/qemu_virt_riscv32/smp - qemu_riscv64 - - qemu_riscv64/qemu_virt_riscv64/smp - nrf52840dk/nrf52840 tests: sample.rust.work-philosopher: diff --git a/tests/time/testcase.yaml b/tests/time/testcase.yaml index 6966b526..056c72d0 100644 --- a/tests/time/testcase.yaml +++ b/tests/time/testcase.yaml @@ -4,9 +4,7 @@ common: - qemu_cortex_m0 - qemu_cortex_m3 - qemu_riscv32 - - qemu_riscv32/qemu_virt_riscv32/smp - qemu_riscv64 - - qemu_riscv64/qemu_virt_riscv64/smp - nrf52840dk/nrf52840 tests: test.rust.time: diff --git a/tests/timer/testcase.yaml b/tests/timer/testcase.yaml index eb08eec7..e0451b70 100644 --- a/tests/timer/testcase.yaml +++ b/tests/timer/testcase.yaml @@ -4,9 +4,7 @@ common: - qemu_cortex_m0 - qemu_cortex_m3 - qemu_riscv32 - - qemu_riscv32/qemu_virt_riscv32/smp - qemu_riscv64 - - qemu_riscv64/qemu_virt_riscv64/smp - nrf52840dk/nrf52840 tests: test.rust.timer: diff --git a/zephyr/src/printk.rs b/zephyr/src/printk.rs index 452f2eb0..9a24a0f7 100644 --- a/zephyr/src/printk.rs +++ b/zephyr/src/printk.rs @@ -5,7 +5,10 @@ //! //! This uses the `k_str_out` syscall, which is part of printk to output to the console. -use core::fmt::{write, Arguments, Result, Write}; +use core::{ + ffi::c_char, + fmt::{write, Arguments, Result, Write}, +}; /// Print to Zephyr's console, without a newline. /// @@ -92,7 +95,7 @@ impl Context { fn flush(&mut self) { if self.count > 0 { unsafe { - zephyr_sys::k_str_out(self.buf.as_mut_ptr() as *mut i8, self.count); + zephyr_sys::k_str_out(self.buf.as_mut_ptr() as *mut c_char, self.count); } self.count = 0; }