diff --git a/src/lib.rs b/src/lib.rs index f9c2d28..c5c636f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -122,14 +122,14 @@ impl<'b, 'a: 'b, ChipSelectError, ChipSelect: OutputPin } } - pub fn with_initialisation<'c, SpiError, Spi: FullDuplex>( + pub fn with_initialisation<'c, Spi: FullDuplex>( chip_select: &'a mut ChipSelect, spi: &'c mut Spi, wol: OnWakeOnLan, ping: OnPingRequest, mode: ConnectionType, arp: ArpResponses, - ) -> Result> { + ) -> Result> { let mut w5500 = Self::new(chip_select); { let mut w5500_active = w5500.activate(spi)?; @@ -151,10 +151,10 @@ impl<'b, 'a: 'b, ChipSelectError, ChipSelect: OutputPin } } - pub fn activate<'c, SpiError, Spi: FullDuplex>( + pub fn activate<'c, Spi: FullDuplex>( &'b mut self, spi: &'c mut Spi, - ) -> Result, TransferError> + ) -> Result, TransferError> { Ok(ActiveW5500(self, spi)) } @@ -443,18 +443,13 @@ pub trait Udp { ) -> Result<(), TransferError>; } -impl< - SpiError, - ChipSelectError, - ChipSelect: OutputPin, - Spi: FullDuplex, - > Udp +impl> Udp for (&mut ActiveW5500<'_, '_, '_, ChipSelect, Spi>, &UdpSocket) { fn receive( &mut self, destination: &mut [u8], - ) -> Result, TransferError> { + ) -> Result, TransferError> { let (w5500, UdpSocket(socket)) = self; if w5500.read_u8(socket.at(SocketRegister::InterruptMask))? & 0x04 == 0 { @@ -510,7 +505,7 @@ impl< host: &IpAddress, host_port: u16, data: &[u8], - ) -> Result<(), TransferError> { + ) -> Result<(), TransferError> { let (w5500, UdpSocket(socket)) = self; {