From f669f730daa4f4dbbb4f53a4f77d56a797c8e2f6 Mon Sep 17 00:00:00 2001
From: Mateusz Faderewski <sc@mateuszfaderewski.pl>
Date: Sun, 30 Jun 2024 12:15:45 +0200
Subject: [PATCH] small cleanup

---
 sw/deployer/src/sc64/ftdi.rs | 17 +++++++----------
 sw/deployer/src/sc64/link.rs |  2 +-
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/sw/deployer/src/sc64/ftdi.rs b/sw/deployer/src/sc64/ftdi.rs
index 4adbe4b..5f76014 100644
--- a/sw/deployer/src/sc64/ftdi.rs
+++ b/sw/deployer/src/sc64/ftdi.rs
@@ -325,8 +325,7 @@ impl Wrapper {
     }
 
     fn write_data(&mut self, buffer: &[u8], written: &mut usize) -> std::io::Result<()> {
-        *written = 0;
-        let mut transferred: i32 = 0;
+        let mut transferred = 0;
         let result = unsafe {
             // NOTE: Nasty hack to overcome libftdi1 API limitation.
             //       Write can partially succeed, but the default ftdi_write_data
@@ -340,14 +339,14 @@ impl Wrapper {
                 100,
             )
         };
-        *written += transferred as usize;
+        *written = transferred as usize;
         if result < 0 {
             return Err(self.libusb_convert_result(result));
         }
         Ok(())
     }
 
-    fn try_unclog_pipe(&mut self) -> std::io::Result<()> {
+    fn unclog_pipe(&mut self) -> std::io::Result<()> {
         let mut buffer = vec![0u8; self.read_chunksize];
         let read = match self.read_data(&mut buffer) {
             Ok(read) => read,
@@ -368,7 +367,7 @@ impl Wrapper {
             self.write_buffer.drain(..written);
             if let Err(error) = result {
                 match error.kind() {
-                    std::io::ErrorKind::TimedOut => self.try_unclog_pipe()?,
+                    std::io::ErrorKind::TimedOut => self.unclog_pipe()?,
                     _ => return Err(error),
                 }
             }
@@ -385,16 +384,14 @@ impl Wrapper {
         } else if self.unclog_buffer.is_empty() {
             self.read_data(buffer)
         } else {
-            let mut read = 0;
-            for item in buffer.iter_mut() {
+            for (index, item) in buffer.iter_mut().enumerate() {
                 if let Some(byte) = self.unclog_buffer.pop_front() {
                     *item = byte;
-                    read += 1;
                 } else {
-                    break;
+                    return Ok(index);
                 }
             }
-            Ok(read)
+            Ok(buffer.len())
         }
     }
 
diff --git a/sw/deployer/src/sc64/link.rs b/sw/deployer/src/sc64/link.rs
index 76c1d55..47e5c28 100644
--- a/sw/deployer/src/sc64/link.rs
+++ b/sw/deployer/src/sc64/link.rs
@@ -419,8 +419,8 @@ fn new_tcp_backend(address: &str) -> Result<TcpBackend, Error> {
     let stream = TcpStream::connect(address).map_err(|error| {
         Error::new(format!("Couldn't connect to [{address}]: {error}").as_str())
     })?;
-    stream.set_write_timeout(Some(WRITE_TIMEOUT))?;
     stream.set_read_timeout(Some(POLL_TIMEOUT))?;
+    stream.set_write_timeout(Some(WRITE_TIMEOUT))?;
     let reader = BufReader::new(stream.try_clone()?);
     let writer = BufWriter::new(stream.try_clone()?);
     Ok(TcpBackend {