kai
/
pounder_test
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

i2c/eeprom: lint

This commit is contained in:
Robert Jördens 2019-11-24 14:55:20 +01:00
parent d2f8b60c27
commit bda0ca26fb
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/eeprom.rs
View File

@ -3,7 +3,7 @@ use super::i2c;
const I2C_ADDR: u8 = 0xa0; const I2C_ADDR: u8 = 0xa0;
pub fn read_eui48<'a>(i2c: &pac::I2C2) -> Result<[u8; 6], i2c::Error> { pub fn read_eui48(i2c: &pac::I2C2) -> Result<[u8; 6], i2c::Error> {
let mut buffer = [0u8; 6]; let mut buffer = [0u8; 6];
i2c::write_read(i2c, I2C_ADDR, &[0xFAu8], &mut buffer)?; i2c::write_read(i2c, I2C_ADDR, &[0xFAu8], &mut buffer)?;
Ok(buffer) Ok(buffer)

8
src/i2c.rs
View File

@ -101,7 +101,7 @@ fn poll_for_start_ack(
} }
} }
return Err(Error::Timeout); Err(Error::Timeout)
} }
@ -111,10 +111,10 @@ pub fn write_read(
bytes: &[u8], bytes: &[u8],
buffer: &mut [u8], buffer: &mut [u8],
) -> Result<(), Error> { ) -> Result<(), Error> {
assert!(bytes.len() < 256 && bytes.len() > 0); assert!(bytes.len() < 256 && !bytes.is_empty());
assert!(buffer.len() < 256 && buffer.len() > 0); assert!(buffer.len() < 256 && !buffer.is_empty());
poll_for_start_ack(i2c, addr|0, false, bytes.len(), false, true)?; poll_for_start_ack(i2c, addr, false, bytes.len(), false, true)?;
for byte in bytes { for byte in bytes {
// Wait until we are allowed to send data (START has been ACKed or last // Wait until we are allowed to send data (START has been ACKed or last