feat:io rework

Signed-off-by: addrian-77 <lunguadrian30@gmail.com>

Author: addrian-77

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

@@ -45,11 +45,19 @@ impl IOCommands for ProbeRSConnection {
         if !self.is_open() {
             return Err(InternalError::ConnectionNotOpen.into());
         }
+<<<<<<< HEAD
         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, start_address)
+=======
+        let settings = self.get_settings();
+        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)
+>>>>>>> 6df3b8d (feat:io rework)
     }
 
     async fn read_system_attributes(&mut self) -> Result<SystemAttributes, TockloaderError> {

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

@@ -12,7 +12,14 @@ use crate::{
 impl IO for SerialConnection {
     async fn read(&mut self, address: u64, size: usize) -> Result<Vec<u8>, TockloaderError> {
         let mut pkt = (address as u32).to_le_bytes().to_vec();
+<<<<<<< HEAD
         pkt.append(&mut (size as u16).to_le_bytes().to_vec());
+=======
+        let length = (size as u16).to_le_bytes().to_vec();
+        for i in length {
+            pkt.push(i);
+        }
+>>>>>>> 6df3b8d (feat:io rework)
         let stream = self.stream.as_mut().expect("Board must be open");
 
         let (_, appdata) = issue_command(
@@ -34,6 +41,7 @@ impl IO for SerialConnection {
     }
 
     async fn write(&mut self, address: u64, pkt: &[u8]) -> Result<(), TockloaderError> {
+<<<<<<< HEAD
         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();
@@ -48,6 +56,28 @@ impl IO for SerialConnection {
                 .to_vec();
             pkt.append(
                 &mut binary[(page_number * page_size)..((page_number + 1) * page_size)].to_vec(),
+=======
+        let settings = self.get_settings();
+        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)
+            ]);
+        }
+
+        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)
+                .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(),
+>>>>>>> 6df3b8d (feat:io rework)
             );
             let _ = issue_command(stream, Command::WritePage, pkt, true, 0, Response::OK).await?;
         }
@@ -67,12 +97,20 @@ impl IOCommands for SerialConnection {
         if !self.is_open() {
             return Err(InternalError::ConnectionNotOpen.into());
         }
+<<<<<<< HEAD
         let start_address = self.get_settings().start_address;
+=======
+        let settings = self.get_settings();
+>>>>>>> 6df3b8d (feat:io rework)
         let stream = self.stream.as_mut().expect("Board must be open");
 
         ping_bootloader_and_wait_for_response(stream).await?;
 
+<<<<<<< HEAD
         AppAttributes::read_apps_data_serial(stream, start_address).await
+=======
+        AppAttributes::read_apps_data_serial(stream, settings.start_address).await
+>>>>>>> 6df3b8d (feat:io rework)
     }
 
     async fn read_system_attributes(&mut self) -> Result<SystemAttributes, TockloaderError> {

tockloader-lib/src/connection.rs

@@ -52,7 +52,11 @@ pub trait Connection {
     /// `open` or any other method is undefined behavior.
     async fn close(&mut self) -> Result<(), TockloaderError>;
     fn is_open(&self) -> bool;
+<<<<<<< HEAD
     fn get_settings(&self) -> &BoardSettings;
+=======
+    fn get_settings(&self) -> BoardSettings;
+>>>>>>> 6df3b8d (feat:io rework)
 }
 
 pub struct ProbeRSConnection {
@@ -62,7 +66,11 @@ pub struct ProbeRSConnection {
     pub(crate) target_info: ProbeTargetInfo,
     /// Only used for opening a new connection
     debug_probe: DebugProbeInfo,
+<<<<<<< HEAD
     settings: BoardSettings,
+=======
+    pub settings: BoardSettings,
+>>>>>>> 6df3b8d (feat:io rework)
 }
 
 impl ProbeRSConnection {
@@ -102,8 +110,13 @@ impl Connection for ProbeRSConnection {
         self.session.is_some()
     }
 
+<<<<<<< HEAD
     fn get_settings(&self) -> &BoardSettings {
         &self.settings
+=======
+    fn get_settings(&self) -> BoardSettings {
+        self.settings.clone()
+>>>>>>> 6df3b8d (feat:io rework)
     }
 }
 
@@ -114,7 +127,11 @@ pub struct SerialConnection {
     pub(crate) target_info: SerialTargetInfo,
     /// Path to the serial port. This is only used for opening a new connection.
     port: String,
+<<<<<<< HEAD
     settings: BoardSettings,
+=======
+    pub settings: BoardSettings,
+>>>>>>> 6df3b8d (feat:io rework)
 }
 
 impl SerialConnection {
@@ -165,8 +182,13 @@ impl Connection for SerialConnection {
         self.stream.is_some()
     }
 
+<<<<<<< HEAD
     fn get_settings(&self) -> &BoardSettings {
         &self.settings
+=======
+    fn get_settings(&self) -> BoardSettings {
+        self.settings.clone()
+>>>>>>> 6df3b8d (feat:io rework)
     }
 }
 
@@ -213,7 +235,11 @@ impl Connection for TockloaderConnection {
         }
     }
 
+<<<<<<< HEAD
     fn get_settings(&self) -> &BoardSettings {
+=======
+    fn get_settings(&self) -> BoardSettings {
+>>>>>>> 6df3b8d (feat:io rework)
         match self {
             TockloaderConnection::ProbeRS(conn) => conn.get_settings(),
             TockloaderConnection::Serial(conn) => conn.get_settings(),