final bug, now we are ready

Author: frihetselsker

boards/nucleo_u545re_q/src/main.rs

@@ -35,7 +35,7 @@ pub struct Stm32u5xxDefaultPeripherals<'a> {
     pub dma1: &'a Dma,
     pub gpio_a: gpio::Port<'a>,
     pub gpio_c: gpio::Port<'a>,
-    pub hash: &'a hash::Hash<'a>,
+    pub hash: &'a hash::core_unit::Hash<'a>,
 }
 
 fn enable_tim2_clock() {
@@ -48,7 +48,7 @@ impl<'a> Stm32u5xxDefaultPeripherals<'a> {
         usart1: &'a usart::Usart<'a>,
         exti: &'a exti::Exti<'a>,
         dma1: &'a Dma,
-        hash: &'a hash::Hash<'a>,
+        hash: &'a hash::core_unit::Hash<'a>,
     ) -> Self {
         Self {
             rcc: rcc::Rcc::new(rcc::RCC_BASE),
@@ -83,7 +83,7 @@ impl<'a> Stm32u5xxDefaultPeripherals<'a> {
         }
 
         if let Some(tx) = hash_channel {
-            hash::Hash::set_dma(self.hash, self.dma1, tx);
+            hash::core_unit::Hash::set_dma(self.hash, self.dma1, tx);
         }
     }
 }

chips/stm32u5xx/src/chip.rs

@@ -6,8 +6,7 @@ use kernel::hil::digest;
 use kernel::utilities::cells::OptionalCell;
 use kernel::ErrorCode;
 
-use crate::hash::traits::HashAdaptee;
-use crate::hash::{Hash, HashAdapter, HashClient};
+use crate::hash::{core_unit::Hash, utils::HashClient};
 
 const MD5_DIGEST_LEN: usize = 16;
 
@@ -25,8 +24,8 @@ impl<'a> Md5Adapter<'a> {
     }
 }
 
-impl<'a> HashAdapter<'a, Hash<'a>> for Md5Adapter<'a> {
-    fn add_data_done(
+impl Md5Adapter<'_> {
+    pub(crate) fn add_data_done(
         &self,
         result: Result<(), kernel::ErrorCode>,
         data: kernel::utilities::leasable_buffer::SubSlice<'static, u8>,
@@ -36,7 +35,7 @@ impl<'a> HashAdapter<'a, Hash<'a>> for Md5Adapter<'a> {
         });
     }
 
-    fn add_mut_data_done(
+    pub(crate) fn add_mut_data_done(
         &self,
         result: Result<(), kernel::ErrorCode>,
         data: kernel::utilities::leasable_buffer::SubSliceMut<'static, u8>,
@@ -46,13 +45,17 @@ impl<'a> HashAdapter<'a, Hash<'a>> for Md5Adapter<'a> {
         });
     }
 
-    fn hash_done(&self, result: Result<(), kernel::ErrorCode>, digest: &'static mut [u8]) {
+    pub(crate) fn hash_done(
+        &self,
+        result: Result<(), kernel::ErrorCode>,
+        digest: &'static mut [u8],
+    ) {
         // terrible
         self.client
             .map(|client| client.hash_done(result, digest.try_into().unwrap()));
     }
 
-    fn verification_done(
+    pub(crate) fn verification_done(
         &self,
         result: Result<bool, kernel::ErrorCode>,
         compare: &'static mut [u8],
@@ -98,9 +101,6 @@ impl<'a> digest::DigestData<'a, MD5_DIGEST_LEN> for Md5Adapter<'a> {
         ),
     > {
         self.hash.add_mut_data(data)
-
-        // self.hash
-        //     .map_or(Err((ErrorCode::FAIL, data)), |hash| hash.add_mut_data(data))
     }
 
     fn clear_data(&self) {
@@ -128,9 +128,6 @@ impl<'a> digest::DigestHash<'a, MD5_DIGEST_LEN> for Md5Adapter<'a> {
             let correct_buf: &'static mut [u8; MD5_DIGEST_LEN] = buf.try_into().unwrap();
             (e, correct_buf)
         })
-
-        // self.hash
-        //     .map(|hash| hash.run(digest).inspect_err(|(e, buf)| {}))
     }
 }
 
@@ -157,12 +154,6 @@ impl<'a> digest::DigestVerify<'a, MD5_DIGEST_LEN> for Md5Adapter<'a> {
             let correct_buf: &'static mut [u8; MD5_DIGEST_LEN] = buf.try_into().unwrap();
             (e, correct_buf)
         })
-
-        // self.hash.verify(compare).map_err(|(error, buf)| {
-        //     // terrible
-        //     let correct_buf: &'static mut [u8; 32] = buf.try_into().unwrap();
-        //     (error, correct_buf)
-        // })
     }
 }