applied patches

Signed-off-by: Adrian Lungu <lunguadrian30@gmail.com>

Author: addrian-77

tockloader-lib/src/command_impl/probers/io.rs

@@ -45,11 +45,11 @@ impl IOCommands for ProbeRSConnection {
         if !self.is_open() {
             return Err(InternalError::ConnectionNotOpen.into());
         }
-        let settings = self.get_settings();
+        let start_address = self.get_settings().start_address;
         let session = self.session.as_mut().expect("Board must be open");
         let mut core = session.core(self.target_info.core)?;
 
-        AppAttributes::read_apps_data_probe(&mut core, settings.start_address)
+        AppAttributes::read_apps_data_probe(&mut core, start_address)
     }
 
     async fn read_system_attributes(&mut self) -> Result<SystemAttributes, TockloaderError> {

tockloader-lib/src/command_impl/serial/io.rs

@@ -34,26 +34,20 @@ impl IO for SerialConnection {
     }
 
     async fn write(&mut self, address: u64, pkt: &[u8]) -> Result<(), TockloaderError> {
-        let settings = self.get_settings();
+        let page_size = self.get_settings().page_size as usize;
         let stream = self.stream.as_mut().expect("Board must be open");
         let mut binary = pkt.to_vec();
 
-        if !binary.len().is_multiple_of(settings.page_size as usize) {
-            binary.extend(vec![
-                0u8;
-                settings.page_size as usize
-                    - (binary.len() % settings.page_size as usize)
-            ]);
+        if !binary.len().is_multiple_of(page_size) {
+            binary.extend(vec![0u8; page_size - (binary.len() % page_size)]);
         }
 
-        for page_number in 0..(binary.len() / settings.page_size as usize) {
-            let mut pkt = (address as u32 + page_number as u32 * settings.page_size as u32)
+        for page_number in 0..(binary.len() / page_size) {
+            let mut pkt = (address as u32 + page_number as u32 * page_size as u32)
                 .to_le_bytes()
                 .to_vec();
             pkt.append(
-                &mut binary[(page_number * settings.page_size as usize)
-                    ..((page_number + 1) * settings.page_size as usize)]
-                    .to_vec(),
+                &mut binary[(page_number * page_size)..((page_number + 1) * page_size)].to_vec(),
             );
             let _ = issue_command(stream, Command::WritePage, pkt, true, 0, Response::OK).await?;
         }
@@ -73,12 +67,12 @@ impl IOCommands for SerialConnection {
         if !self.is_open() {
             return Err(InternalError::ConnectionNotOpen.into());
         }
-        let settings = self.get_settings();
+        let start_address = self.get_settings().start_address;
         let stream = self.stream.as_mut().expect("Board must be open");
 
         ping_bootloader_and_wait_for_response(stream).await?;
 
-        AppAttributes::read_apps_data_serial(stream, settings.start_address).await
+        AppAttributes::read_apps_data_serial(stream, start_address).await
     }
 
     async fn read_system_attributes(&mut self) -> Result<SystemAttributes, TockloaderError> {

tockloader-lib/src/connection.rs

@@ -52,7 +52,7 @@ pub trait Connection {
     /// `open` or any other method is undefined behavior.
     async fn close(&mut self) -> Result<(), TockloaderError>;
     fn is_open(&self) -> bool;
-    fn get_settings(&self) -> BoardSettings;
+    fn get_settings(&self) -> &BoardSettings;
 }
 
 pub struct ProbeRSConnection {
@@ -102,8 +102,8 @@ impl Connection for ProbeRSConnection {
         self.session.is_some()
     }
 
-    fn get_settings(&self) -> BoardSettings {
-        self.settings.clone()
+    fn get_settings(&self) -> &BoardSettings {
+        &self.settings
     }
 }
 
@@ -165,8 +165,8 @@ impl Connection for SerialConnection {
         self.stream.is_some()
     }
 
-    fn get_settings(&self) -> BoardSettings {
-        self.settings.clone()
+    fn get_settings(&self) -> &BoardSettings {
+        &self.settings
     }
 }
 
@@ -213,7 +213,7 @@ impl Connection for TockloaderConnection {
         }
     }
 
-    fn get_settings(&self) -> BoardSettings {
+    fn get_settings(&self) -> &BoardSettings {
         match self {
             TockloaderConnection::ProbeRS(conn) => conn.get_settings(),
             TockloaderConnection::Serial(conn) => conn.get_settings(),