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

Take OutputPin by ownership instead of ref mut github#13

Browse source
This commit is contained in:
Michael Watzko 2020-06-10 16:30:02 +02:00
commit d02bbf7e5c
1 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/lib.rs
View file

@ -122,15 +122,13 @@ pub struct UdpSocket(Socket);
/// The first level of instantiating communication with the W5500. It can not communicate by itself, but calling /// The first level of instantiating communication with the W5500. It can not communicate by itself, but calling
/// `activate` will return an `ActiveW5500` which can. /// `activate` will return an `ActiveW5500` which can.
pub struct W5500<'a, ChipSelect: OutputPin> { pub struct W5500<ChipSelect: OutputPin> {
chip_select: &'a mut ChipSelect, chip_select: ChipSelect,
sockets: u8, // each bit represents whether the corresponding socket is available for take sockets: u8, // each bit represents whether the corresponding socket is available for take
} }
impl<'b, 'a: 'b, ChipSelectError, ChipSelect: OutputPin<Error = ChipSelectError>> impl<ChipSelectError, ChipSelect: OutputPin<Error = ChipSelectError>> W5500<ChipSelect> {
W5500<'a, ChipSelect> fn new(chip_select: ChipSelect) -> Self {
{
fn new(chip_select: &'a mut ChipSelect) -> Self {
W5500 { W5500 {
chip_select, chip_select,
sockets: 0xFF, sockets: 0xFF,
@ -139,8 +137,8 @@ impl<'b, 'a: 'b, ChipSelectError, ChipSelect: OutputPin<Error = ChipSelectError>
/// Primary method for instantiating. Briefly activates the W5500, and sets it up with the specified configuration /// Primary method for instantiating. Briefly activates the W5500, and sets it up with the specified configuration
pub fn with_initialisation<'c, Spi: FullDuplex<u8>>( pub fn with_initialisation<'c, Spi: FullDuplex<u8>>(
chip_select: &'a mut ChipSelect, chip_select: ChipSelect,
spi: &'c mut Spi, spi: &mut Spi,
wol: OnWakeOnLan, wol: OnWakeOnLan,
ping: OnPingRequest, ping: OnPingRequest,
mode: ConnectionType, mode: ConnectionType,
@ -169,19 +167,19 @@ impl<'b, 'a: 'b, ChipSelectError, ChipSelect: OutputPin<Error = ChipSelectError>
} }
/// Creates a new `ActiveW5500` with the provided `FullDuplex` implementation /// Creates a new `ActiveW5500` with the provided `FullDuplex` implementation
pub fn activate<'c, Spi: FullDuplex<u8>>( pub fn activate<'a, 'b, Spi: FullDuplex<u8>>(
&'b mut self, &'a mut self,
spi: &'c mut Spi, spi: &'b mut Spi,
) -> Result<ActiveW5500<'b, 'a, 'c, ChipSelect, Spi>, TransferError<Spi::Error, ChipSelectError>> ) -> Result<ActiveW5500<'a, 'b, ChipSelect, Spi>, TransferError<Spi::Error, ChipSelectError>>
{ {
Ok(ActiveW5500(self, spi)) Ok(ActiveW5500(self, spi))
} }
} }
/// Struct that can communicate with the W5500 chip, configuring it and reading/writing to the registers on a low level /// Struct that can communicate with the W5500 chip, configuring it and reading/writing to the registers on a low level
pub struct ActiveW5500<'a, 'b: 'a, 'c, ChipSelect: OutputPin, Spi: FullDuplex<u8>>( pub struct ActiveW5500<'a, 'b, ChipSelect: OutputPin, Spi: FullDuplex<u8>>(
&'a mut W5500<'b, ChipSelect>, &'a mut W5500<ChipSelect>,
&'c mut Spi, &'b mut Spi,
); );
impl< impl<
@ -189,7 +187,7 @@ impl<
ChipSelect: OutputPin<Error = ChipSelectError>, ChipSelect: OutputPin<Error = ChipSelectError>,
SpiError, SpiError,
Spi: FullDuplex<u8, Error = SpiError>, Spi: FullDuplex<u8, Error = SpiError>,
> ActiveW5500<'_, '_, '_, ChipSelect, Spi> > ActiveW5500<'_, '_, ChipSelect, Spi>
{ {
/// Returns the requested socket if it is not already used /// Returns the requested socket if it is not already used
pub fn take_socket(&mut self, socket: Socket) -> Option<UninitializedSocket> { pub fn take_socket(&mut self, socket: Socket) -> Option<UninitializedSocket> {
@ -441,7 +439,7 @@ pub trait IntoUdpSocket<SpiError> {
impl<ChipSelect: OutputPin, Spi: FullDuplex<u8>> IntoUdpSocket<UninitializedSocket> impl<ChipSelect: OutputPin, Spi: FullDuplex<u8>> IntoUdpSocket<UninitializedSocket>
for ( for (
&mut ActiveW5500<'_, '_, '_, ChipSelect, Spi>, &mut ActiveW5500<'_, '_, ChipSelect, Spi>,
UninitializedSocket, UninitializedSocket,
) )
{ {
@ -484,7 +482,7 @@ pub trait Udp {
} }
impl<ChipSelect: OutputPin, Spi: FullDuplex<u8>> Udp 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>; type Error = TransferError<Spi::Error, ChipSelect::Error>;