refactor: io rework

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

Author: addrian-77

tockloader-lib/src/command_impl/erase_apps.rs

@@ -7,7 +7,6 @@ use crate::{CommandEraseApps, IO};
 #[async_trait]
 impl CommandEraseApps for TockloaderConnection {
     async fn erase_apps(&mut self) -> Result<(), TockloaderError> {
-        self.write(self.get_settings().start_address, &[0u8])
-            .await
+        self.write(self.get_settings().start_address, &[0u8]).await
     }
 }

tockloader-lib/src/command_impl/install.rs

@@ -7,9 +7,7 @@ use crate::CommandInstall;
 
 #[async_trait]
 impl CommandInstall for TockloaderConnection {
-    async fn install_app(
-        &mut self, _tab: Tab
-    ) -> Result<(), TockloaderError> {
+    async fn install_app(&mut self, _tab: Tab) -> Result<(), TockloaderError> {
         todo!()
     }
 }

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

@@ -45,19 +45,11 @@ 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/probers/mod.rs

@@ -1 +1 @@
-pub mod io;
+pub mod io;

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

@@ -12,14 +12,7 @@ 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(
@@ -41,7 +34,6 @@ 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();
@@ -56,28 +48,6 @@ 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?;
         }
@@ -97,20 +67,12 @@ 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/command_impl/serial/io.rs

@@ -1 +1 @@
-pub mod io;
+pub mod io;

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

@@ -52,11 +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;
-<<<<<<< HEAD
     fn get_settings(&self) -> &BoardSettings;
-=======
-    fn get_settings(&self) -> BoardSettings;
->>>>>>> 6df3b8d (feat:io rework)
 }
 
 pub struct ProbeRSConnection {
@@ -66,11 +62,7 @@ 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 {
@@ -109,14 +101,8 @@ impl Connection for ProbeRSConnection {
     fn is_open(&self) -> bool {
         self.session.is_some()
     }
-
-<<<<<<< HEAD
     fn get_settings(&self) -> &BoardSettings {
         &self.settings
-=======
-    fn get_settings(&self) -> BoardSettings {
-        self.settings.clone()
->>>>>>> 6df3b8d (feat:io rework)
     }
 }
 
@@ -127,11 +113,7 @@ 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 {
@@ -182,13 +164,8 @@ 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)
     }
 }
 
@@ -235,11 +212,7 @@ 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(),

tockloader-lib/src/connection.rs

@@ -48,7 +48,7 @@ impl KnownBoard for MicrobitV2 {
         BoardSettings {
             arch: Some("cortex-m4".to_string()),
             start_address: 0x00040000,
-            page_size: 512,
+            page_size: 4096,
         }
     }
 }