@@ -21,24 +21,24 @@ practice.
2121extern crate spidev;
2222use std :: io;
2323use std :: io :: prelude :: * ;
24- use spidev :: {Spidev , SpidevOptions , SpidevTransfer , SPI_MODE_0 };
24+ use spidev :: {Spidev , SpidevOptions , SpidevTransfer , SpiModeFlags };
2525
2626fn create_spi () -> io :: Result <Spidev > {
27- let mut spi = try ! ( Spidev :: open (" /dev/spidev0.0" )) ;
27+ let mut spi = Spidev :: open (" /dev/spidev0.0" )? ;
2828 let options = SpidevOptions :: new ()
2929 . bits_per_word (8 )
3030 . max_speed_hz (20_000 )
31- . mode (SPI_MODE_0 )
31+ . mode (SpiModeFlags :: SPI_MODE_0 )
3232 . build ();
33- try ! ( spi . configure (& options )) ;
33+ spi . configure (& options )? ;
3434 Ok (spi )
3535}
3636
3737/// perform half duplex operations using Read and Write traits
3838fn half_duplex (spi : & mut Spidev ) -> io :: Result <()> {
3939 let mut rx_buf = [0_u8 ; 10 ];
40- try ! ( spi . write (& [0x01 , 0x02 , 0x03 ])) ;
41- try ! ( spi . read (& mut rx_buf )) ;
40+ spi . write (& [0x01 , 0x02 , 0x03 ])? ;
41+ spi . read (& mut rx_buf )? ;
4242 println! (" {:?}" , rx_buf );
4343 Ok (())
4444}
@@ -51,7 +51,7 @@ fn full_duplex(spi: &mut Spidev) -> io::Result<()> {
5151 let mut rx_buf = [0 ; 3 ];
5252 {
5353 let mut transfer = SpidevTransfer :: read_write (& tx_buf , & mut rx_buf );
54- try ! ( spi . transfer (& mut transfer )) ;
54+ spi . transfer (& mut transfer )? ;
5555 }
5656 println! (" {:?}" , rx_buf );
5757 Ok (())
0 commit comments