Wait until there's enough space in tx buffer, remove busy wait for completed send

2 files changed, 4 insertions, 32 deletions

diff --git a/src/device.rs b/src/device.rs
index 3875fde0e..8158bc98e 100644
--- a/src/device.rs
+++ b/src/device.rs
@@ -123,31 +123,14 @@ impl<SPI: SpiDevice> W5500<SPI> {
 
     /// Write an ethernet frame to the device. Returns number of bytes written
     pub async fn write_frame(&mut self, frame: &[u8]) -> Result<usize, SPI::Error> {
-        let max_size = socket::get_tx_free_size(&mut self.bus).await? as usize;
-
-        let write_data = if frame.len() < max_size {
-            frame
-        } else {
-            &frame[..max_size]
-        };
-
+        while socket::get_tx_free_size(&mut self.bus).await? < frame.len() as u16 {}
         let write_ptr = socket::get_tx_write_ptr(&mut self.bus).await?;
         self.bus
-            .write_frame(RegisterBlock::TxBuf, write_ptr, write_data)
+            .write_frame(RegisterBlock::TxBuf, write_ptr, frame)
             .await?;
-        socket::set_tx_write_ptr(
-            &mut self.bus,
-            write_ptr.wrapping_add(write_data.len() as u16),
-        )
-        .await?;
-
-        socket::reset_interrupt(&mut self.bus, socket::Interrupt::SendOk).await?;
+        socket::set_tx_write_ptr(&mut self.bus, write_ptr.wrapping_add(frame.len() as u16)).await?;
         socket::command(&mut self.bus, socket::Command::Send).await?;
-        // Wait for TX to complete
-        while !socket::is_interrupt(&mut self.bus, socket::Interrupt::SendOk).await? {}
-        socket::reset_interrupt(&mut self.bus, socket::Interrupt::SendOk).await?;
-
-        Ok(write_data.len())
+        Ok(frame.len())
     }
 
     pub async fn is_link_up(&mut self) -> bool {
diff --git a/src/socket.rs b/src/socket.rs
index 0d3d1aeb2..3f64d04d1 100644
--- a/src/socket.rs
+++ b/src/socket.rs
@@ -22,7 +22,6 @@ pub enum Command {
 pub const INTR: u16 = 0x02;
 #[repr(u8)]
 pub enum Interrupt {
-    SendOk = 0b010000_u8,
     Receive = 0b00100_u8,
 }
 
@@ -34,16 +33,6 @@ pub async fn reset_interrupt<SPI: SpiDevice>(
     bus.write_frame(RegisterBlock::Socket0, INTR, &data).await
 }
 
-pub async fn is_interrupt<SPI: SpiDevice>(
-    bus: &mut SpiInterface<SPI>,
-    code: Interrupt,
-) -> Result<bool, SPI::Error> {
-    let mut data = [0u8];
-    bus.read_frame(RegisterBlock::Socket0, INTR, &mut data)
-        .await?;
-    Ok(data[0] & code as u8 != 0)
-}
-
 pub async fn get_tx_write_ptr<SPI: SpiDevice>(
     bus: &mut SpiInterface<SPI>,
 ) -> Result<u16, SPI::Error> {