tuxmain/w5100-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace generic errors of Udp into a associative type

Browse source
This commit is contained in:
Michael Watzko 2019-08-01 16:28:25 +02:00
commit 0185724e6e
1 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/lib.rs
View file

@ -425,26 +425,31 @@ impl<ChipSelect: OutputPin, Spi: FullDuplex<u8>> IntoUdpSocket<UninitializedSock
} }
} }
pub trait Udp<SpiError, ChipSelectError> { pub trait Udp {
type Error;
fn receive( fn receive(
&mut self, &mut self,
target_buffer: &mut [u8], target_buffer: &mut [u8],
) -> Result<Option<(IpAddress, u16, usize)>, TransferError<SpiError, ChipSelectError>>; ) -> Result<Option<(IpAddress, u16, usize)>, Self::Error>;
fn blocking_send( fn blocking_send(
&mut self, &mut self,
host: &IpAddress, host: &IpAddress,
host_port: u16, host_port: u16,
data: &[u8], data: &[u8],
) -> Result<(), TransferError<SpiError, ChipSelectError>>; ) -> Result<(), Self::Error>;
} }
impl<ChipSelect: OutputPin, Spi: FullDuplex<u8>> Udp<Spi::Error, ChipSelect::Error> impl<ChipSelect: OutputPin, Spi: FullDuplex<u8>> Udp
for (&mut ActiveW5500<'_, '_, '_, ChipSelect, Spi>, &UdpSocket) for (&mut ActiveW5500<'_, '_, '_, ChipSelect, Spi>, &UdpSocket)
{ {
type Error = TransferError<Spi::Error, ChipSelect::Error>;
fn receive( fn receive(
&mut self, &mut self,
destination: &mut [u8], destination: &mut [u8],
) -> Result<Option<(IpAddress, u16, usize)>, TransferError<Spi::Error, ChipSelect::Error>> { ) -> Result<Option<(IpAddress, u16, usize)>, Self::Error> {
let (w5500, UdpSocket(socket)) = self; let (w5500, UdpSocket(socket)) = self;
if w5500.read_u8(socket.at(SocketRegister::InterruptMask))? & 0x04 == 0 { if w5500.read_u8(socket.at(SocketRegister::InterruptMask))? & 0x04 == 0 {
@ -500,7 +505,7 @@ impl<ChipSelect: OutputPin, Spi: FullDuplex<u8>> Udp<Spi::Error, ChipSelect::Err
host: &IpAddress, host: &IpAddress,
host_port: u16, host_port: u16,
data: &[u8], data: &[u8],
) -> Result<(), TransferError<Spi::Error, ChipSelect::Error>> { ) -> Result<(), Self::Error> {
let (w5500, UdpSocket(socket)) = self; let (w5500, UdpSocket(socket)) = self;
{ {