Merge branch 'update-toolchain' of https://github.com/tosc-rs/mnemos …

…into update-toolchain
tosc-rs · Aug 13, 2024 · afdd704 · afdd704
2 parents 67e2091 + e69c2bc
commit afdd704
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git a/platforms/allwinner-d1/d1-core/src/drivers/smhc.rs b/platforms/allwinner-d1/d1-core/src/drivers/smhc.rs
@@ -519,9 +519,7 @@ impl Smhc {
                 self.smhc.smhc_resp2.read().bits(),
                 self.smhc.smhc_resp3.read().bits(),
             ];
-            // TODO warning: transmute used without annotations
-            #[allow(clippy::missing_transmute_annotations)]
-            Ok(sdmmc::Response::Long(unsafe { core::mem::transmute(rsp) }))
+            Ok(sdmmc::Response::Long(unsafe { core::mem::transmute::<[u32; 4], u128>(rsp) }))
         } else {
             Ok(sdmmc::Response::Short {
                 value: self.smhc.smhc_resp0.read().bits(),

diff --git a/platforms/melpomene/README.md b/platforms/melpomene/README.md
@@ -8,14 +8,14 @@ Drivers to implement platform-specific behavior, such as serial ports, are provi
 
 ## Running the simulator
 
-### MacOS specific notes
-
-`embedded-graphics-simulator`, which melpomeme depends on, requires sdl2. If you installed sdl2 via homebrew,
-you probably need to add this to your shell environment:
-
-```sh
-export LIBRARY_PATH="$LIBRARY_PATH:$(brew --prefix)/lib"
-```
+> [!NOTE]
+>
+> **For MacOS users**: `embedded-graphics-simulator`, which melpomeme depends on, requires sdl2. If you installed sdl2 via homebrew,
+> you probably need to add this to your shell environment:
+>
+> ```sh
+> export LIBRARY_PATH="$LIBRARY_PATH:$(brew --prefix)/lib"
+> ```
 
 ### Using an alias
 

diff --git a/platforms/x86_64/core/src/interrupt.rs b/platforms/x86_64/core/src/interrupt.rs
@@ -74,8 +74,8 @@ static TSS: sync::Lazy<task::StateSegment> = sync::Lazy::new(|| {
     let mut tss = task::StateSegment::empty();
     tss.interrupt_stacks[Idt::DOUBLE_FAULT_IST_OFFSET] = unsafe {
         // safety: asdf
-        #[allow(static_mut_refs)]
-        VAddr::of(&DOUBLE_FAULT_STACK).offset(DOUBLE_FAULT_STACK_SIZE as i32)
+        VAddr::from_usize_unchecked(core::ptr::addr_of!(DOUBLE_FAULT_STACK) as usize)
+            .offset(DOUBLE_FAULT_STACK_SIZE as i32)
     };
     tracing::debug!(?tss, "TSS initialized");
     tss

diff --git a/source/abi/src/bbqueue_ipc/bbbuffer.rs b/source/abi/src/bbqueue_ipc/bbbuffer.rs
@@ -15,6 +15,7 @@ use crate::bbqueue_ipc::{
     framed::{FrameConsumer, FrameProducer},
     Error, Result,
 };
+
 #[derive(Debug)]
 #[repr(C)]
 /// A backing structure for a BBQueue. Can be used to create either