Format, clean

.github/dependabot.yml

@@ -1,13 +0,0 @@
-# To get started with Dependabot version updates, you'll need to specify which
-# package ecosystems to update and where the package manifests are located.
-# Please see the documentation for all configuration options:
-# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
-
-version: 2
-updates:
-- package-ecosystem: cargo
-  directory: "/"
-  schedule:
-    interval: daily
-    time: "07:00"
-  open-pull-requests-limit: 10

.github/workflows/rust.yml

@@ -1,70 +0,0 @@
-name: Rust
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  check:
-    name: Check
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-      - uses: actions-rs/cargo@v1
-        with:
-          command: check
-          args: --all-features
-
-  test:
-    name: Test Suite
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-      - uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --all-features
-
-  fmt:
-    name: Rustfmt
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-      - run: rustup component add rustfmt
-      - uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check
-
-  clippy:
-    name: Clippy
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-      - run: rustup component add clippy
-      - uses: actions-rs/cargo@v1
-        with:
-          command: clippy
-          args: -- -D warnings

.gitignore

@@ -1,4 +1,2 @@
-*.iml
 /target
-**/*.rs.bk
 Cargo.lock

Cargo.toml

@@ -13,7 +13,7 @@ keywords = ["embedded", "w5100", "embedded-hal-driver"]
 categories = ["embedded", "hardware-support", "no-std", "network-programming"]
 license = "AGPL-3.0-only"
 readme = "README.md"
-edition = "2018"
+edition = "2021"
 
 [features]
 

README.md

@@ -1,87 +1,12 @@
 # W5100 Driver
 
+Rust driver for the WIZnet W5100 Ethernet controler using SPI.
+
 **Fork status**:
 * Work-in-progress fork of the crate [w5500](https://github.com/kellerkindt/w5500) for W5100. The two chips are different versions of the same design, very similar but not fully compatible. The older revision of the Arduino Ethernet Shield uses W5100, hence the need for this fork.
 * What works: receive and send UDP packets.
 * Tested on Arduino Uno with Arduino Ethernet Shield.
 
-This crate is a driver for the WIZnet W5500 chip.  The W5500 chip is a hardwired TCP/IP embedded Ethernet controller
-that enables embedded systems using SPI (Serial Peripheral Interface) to access the LAN. It is one of the
-more popular ethernet modules on Arduino platforms.
-
-
-[![Build Status](https://github.com/kellerkindt/w5500/workflows/Rust/badge.svg)](https://github.com/kellerkindt/w5500/actions?query=workflow%3ARust)
-[![License](https://img.shields.io/badge/license-MIT%2FApache--2.0-blue.svg)](https://github.com/kellerkindt/w5500)
-[![Crates.io](https://img.shields.io/crates/v/w5500.svg)](https://crates.io/crates/w5500)
-[![Documentation](https://docs.rs/w5500/badge.svg)](https://docs.rs/w5500)
-[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/kellerkindt/w5500/issues/new)
-
-
-## Embedded-HAL
-
-The [`embedded-hal`](https://docs.rs/embedded-hal/latest/embedded_hal/index.html) is a standard set
-of traits meant to permit communication between MCU implementations and hardware drivers like this
-one.  Any microcontroller that implements the
-[`spi::SpiDevice`](https://docs.rs/embedded-hal/latest/embedded_hal/spi/trait.SpiDevice.html) or
-[`spi::SpiBus`](https://docs.rs/embedded-hal/latest/embedded_hal/spi/trait.SpiBus.html) can use this
-driver.
-
-# Example Usage
-
-Below is a basic example of sending UDP packets to a remote host.  An important thing to confirm is the configuration
-of the SPI implementation.  It must be set up to work as the W5500 chip requires.  That configuration is as follows:
-
-* Data Order: Most significant bit first
-* Clock Polarity: Idle low
-* Clock Phase: Sample leading edge
-* Clock speed: 33MHz maximum
-
-```rust,no_run
-use core::net::{IpAddr, Ipv4Addr, SocketAddr};
-#
-# struct Mock;
-#
-# impl embedded_hal::spi::ErrorType for Mock {
-#     type Error = core::convert::Infallible;
-# }
-#
-# impl embedded_hal::spi::SpiDevice for Mock {
-#     fn transaction(&mut self, operations: &mut [embedded_hal::spi::Operation<'_, u8>]) -> Result<(), Self::Error> {
-#         Ok(())
-#     }
-# }
-use embedded_nal::UdpClientStack;
-
-let mut spi = Mock;
-
-let mut device = w5500::UninitializedDevice::new(w5500::bus::FourWire::new(spi))
-    .initialize_manual(
-        w5500::MacAddress::new(0, 1, 2, 3, 4, 5),
-        Ipv4Addr::new(192, 168, 86, 79),
-        w5500::Mode::default()
-    ).unwrap();
-
-// Allocate a UDP socket to send data with
-let mut socket = device.socket().unwrap();
-
-// Connect the socket to the IP address and port we want to send to.
-device.connect(&mut socket,
-    SocketAddr::new(IpAddr::V4(Ipv4Addr::new(192, 168, 86, 38)), 8000),
-).unwrap();
-
-// Send the data
-nb::block!(device.send(&mut socket, &[104, 101, 108, 108, 111, 10]));
-
-// Optionally close the socket
-device.close(socket);
-```
-## Todo
-
-In no particular order, things to do to improve this driver.
-
-* Add support for TCP server implementations
-* Add support for DHCP
-
 ## License
 
 [Support me via LiberaPay](https://liberapay.com/tuxmain/donate)

rustfmt.toml

@@ -0,0 +1,9 @@
+hard_tabs = true
+newline_style = "Unix"
+imports_granularity = "Crate"
+
+unstable_features = true
+format_code_in_doc_comments = true
+format_macro_bodies = true
+format_macro_matchers = true
+format_strings = true

src/bus/four_wire.rs

@@ -33,7 +33,7 @@ impl<SPI: SpiDevice> Bus for FourWire<SPI> {
 		for (i, byte) in data.iter_mut().enumerate() {
 			self.spi.transaction(&mut [
 				Operation::Write(&[OPMODE_READ]),
-                Operation::Write(&(address+i as u16).to_be_bytes()),
+				Operation::Write(&(address + i as u16).to_be_bytes()),
 				Operation::TransferInPlace(core::array::from_mut(byte)),
 			])?;
 		}
@@ -45,7 +45,7 @@ impl<SPI: SpiDevice> Bus for FourWire<SPI> {
 		for (i, byte) in data.iter().enumerate() {
 			self.spi.transaction(&mut [
 				Operation::Write(&[OPMODE_WRITE]),
-                Operation::Write(&(address+i as u16).to_be_bytes()),
+				Operation::Write(&(address + i as u16).to_be_bytes()),
 				Operation::Write(&[*byte]),
 			])?;
 		}

src/cursor.rs

@@ -1,6 +1,4 @@
-use crate::bus::Bus;
+use crate::{bus::Bus, register::socketn::Command, socket::Socket};
-use crate::register::socketn::Command;
-use crate::socket::Socket;
 
 pub(crate) struct RxCursor<'a, SpiBus>
 where
@@ -39,8 +37,7 @@ where
 		}
 
 		let count = self.available().min(buf.len() as u16);
-        self.bus
+		self.bus.read_frame(self.ptr, &mut buf[..count as _])?;
-            .read_frame(self.ptr, &mut buf[..count as _])?;
 		Ok(self.skip(count))
 	}
 
@@ -109,8 +106,7 @@ where
 		}
 
 		let count = buf.len() as u16;
-        self.bus
+		self.bus.write_frame(self.ptr, &buf[..count as _])?;
-            .write_frame(self.ptr, &buf[..count as _])?;
 		self.ptr = self.ptr.wrapping_add(count);
 		self.size -= count;
 		Ok(count)

src/device.rs

@@ -1,12 +1,12 @@
 use bit_field::BitField;
 
-use crate::bus::{Bus, FourWire};
-use crate::host::Host;
-use crate::net::Ipv4Addr;
-use crate::socket::Socket;
-use crate::uninitialized_device::UninitializedDevice;
 use crate::{
+	bus::{Bus, FourWire},
+	host::Host,
+	net::Ipv4Addr,
 	register::{self, common::RetryTime},
+	socket::Socket,
+	uninitialized_device::UninitializedDevice,
 	MacAddress, Mode,
 };
 
@@ -132,8 +132,10 @@ impl<SpiBus: Bus, StateImpl: State> Device<SpiBus, StateImpl> {
 
 	pub fn subnet_mask(&mut self) -> Result<Ipv4Addr, SpiBus::Error> {
 		let mut octets = [0u8; 4];
-        self.bus
+		self.bus.read_frame(
-            .read_frame(register::COMMON + register::common::SUBNET_MASK, &mut octets)?;
+			register::COMMON + register::common::SUBNET_MASK,
+			&mut octets,
+		)?;
 		Ok(Ipv4Addr::from(octets))
 	}
 
@@ -162,36 +164,28 @@ impl<SpiBus: Bus, StateImpl: State> Device<SpiBus, StateImpl> {
 	#[inline]
 	pub fn set_mode(&mut self, mode_options: Mode) -> Result<(), SpiBus::Error> {
 		self.bus.write_frame(
-            register::COMMON +
+			register::COMMON + register::common::MODE,
-            register::common::MODE,
 			&mode_options.to_register(),
 		)
 	}
 
 	#[inline]
 	pub fn set_rx_memory_size(&mut self, val: u8) -> Result<(), SpiBus::Error> {
-        self.bus.write_frame(
+		self.bus
-            register::COMMON +
+			.write_frame(register::COMMON + register::common::RX_MEMORY_SIZE, &[val])
-            register::common::RX_MEMORY_SIZE,
-            &[val],
-        )
 	}
 
 	#[inline]
 	pub fn set_tx_memory_size(&mut self, val: u8) -> Result<(), SpiBus::Error> {
-        self.bus.write_frame(
+		self.bus
-            register::COMMON +
+			.write_frame(register::COMMON + register::common::TX_MEMORY_SIZE, &[val])
-            register::common::TX_MEMORY_SIZE,
-            &[val],
-        )
 	}
 
 	#[inline]
 	pub fn get_rx_memory_size(&mut self) -> Result<u8, SpiBus::Error> {
 		let mut val = [0];
 		self.bus.read_frame(
-            register::COMMON +
+			register::COMMON + register::common::RX_MEMORY_SIZE,
-            register::common::RX_MEMORY_SIZE,
 			&mut val,
 		)?;
 		Ok(val[0])
@@ -201,8 +195,7 @@ impl<SpiBus: Bus, StateImpl: State> Device<SpiBus, StateImpl> {
 	pub fn get_tx_memory_size(&mut self) -> Result<u8, SpiBus::Error> {
 		let mut val = [0];
 		self.bus.read_frame(
-            register::COMMON +
+			register::COMMON + register::common::TX_MEMORY_SIZE,
-            register::common::TX_MEMORY_SIZE,
 			&mut val,
 		)?;
 		Ok(val[0])
@@ -227,8 +220,7 @@ impl<SpiBus: Bus, StateImpl: State> Device<SpiBus, StateImpl> {
 	#[inline]
 	pub fn set_retry_timeout(&mut self, retry_time_value: RetryTime) -> Result<(), SpiBus::Error> {
 		self.bus.write_frame(
-            register::COMMON +
+			register::COMMON + register::common::RETRY_TIME,
-            register::common::RETRY_TIME,
 			&retry_time_value.to_register(),
 		)?;
 
@@ -244,8 +236,7 @@ impl<SpiBus: Bus, StateImpl: State> Device<SpiBus, StateImpl> {
 	pub fn current_retry_timeout(&mut self) -> Result<RetryTime, SpiBus::Error> {
 		let mut retry_time_register: [u8; 2] = [0, 0];
 		self.bus.read_frame(
-            register::COMMON+
+			register::COMMON + register::common::RETRY_TIME,
-            register::common::RETRY_TIME,
 			&mut retry_time_register,
 		)?;
 
@@ -270,8 +261,7 @@ impl<SpiBus: Bus, StateImpl: State> Device<SpiBus, StateImpl> {
 	/// `RCR = 0x0007`
 	pub fn set_retry_count(&mut self, retry_count: u8) -> Result<(), SpiBus::Error> {
 		self.bus.write_frame(
-            register::COMMON+
+			register::COMMON + register::common::RETRY_COUNT,
-            register::common::RETRY_COUNT,
 			&[retry_count],
 		)?;
 
@@ -288,8 +278,7 @@ impl<SpiBus: Bus, StateImpl: State> Device<SpiBus, StateImpl> {
 	pub fn current_retry_count(&mut self) -> Result<u8, SpiBus::Error> {
 		let mut retry_count_register: [u8; 1] = [0];
 		self.bus.read_frame(
-            register::COMMON+
+			register::COMMON + register::common::RETRY_COUNT,
-            register::common::RETRY_COUNT,
 			&mut retry_count_register,
 		)?;
 

src/host/dhcp.rs

@@ -1,6 +1,4 @@
-use crate::bus::Bus;
+use crate::{bus::Bus, host::Host, MacAddress};
-use crate::host::Host;
-use crate::MacAddress;
 
 #[derive(Debug)]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]

src/host/manual.rs

@@ -1,8 +1,10 @@
 use core::net::Ipv4Addr;
 
-use crate::bus::Bus;
+use crate::{
-use crate::host::{Host, HostConfig};
+	bus::Bus,
-use crate::MacAddress;
+	host::{Host, HostConfig},
+	MacAddress,
+};
 
 #[derive(Debug)]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]

src/host/mod.rs

@@ -3,11 +3,8 @@ use core::net::Ipv4Addr;
 mod dhcp;
 mod manual;
 
-pub use self::dhcp::Dhcp;
+pub use self::{dhcp::Dhcp, manual::Manual};
-pub use self::manual::Manual;
+use crate::{bus::Bus, register, MacAddress};
-use crate::bus::Bus;
-use crate::register;
-use crate::MacAddress;
 
 #[derive(Debug)]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]

src/raw_device.rs

@@ -32,11 +32,8 @@ impl<SpiBus: Bus> RawDevice<SpiBus> {
 
 	/// Enable one or more interrupts
 	pub fn enable_interrupts(&mut self) -> Result<(), SpiBus::Error> {
-        self.bus.write_frame(
+		self.bus
-            register::COMMON +
+			.write_frame(register::COMMON + register::common::INTERRUPT_MASK, &[1])?;
-            register::common::INTERRUPT_MASK,
-            &[1],
-        )?;
 		Ok(())
 	}
 
@@ -54,13 +51,9 @@ impl<SpiBus: Bus> RawDevice<SpiBus> {
 	}
 
 	/// Disable all interrupts
-    ///
 	pub fn disable_interrupts(&mut self) -> Result<(), SpiBus::Error> {
-        self.bus.write_frame(
+		self.bus
-            register::COMMON +
+			.write_frame(register::COMMON + register::common::INTERRUPT_MASK, &[0])?;
-            register::common::INTERRUPT_MASK,
-            &[0],
-        )?;
 		Ok(())
 	}
 

src/register.rs

@@ -186,7 +186,6 @@ pub mod socketn {
 	/// > and passive-close.
 	/// > When Disconnect-process is successfully completed, or
 	/// > when timeout occurs, these change to SOCK_CLOSED.
-    ///
 	#[derive(TryFromPrimitive, Debug, Copy, Clone, PartialEq, Eq)]
 	#[repr(u8)]
 	pub enum Status {

src/socket.rs

@@ -1,8 +1,9 @@
-use core::convert::TryFrom;
+use core::{convert::TryFrom, net::Ipv4Addr};
-use core::net::Ipv4Addr;
 
-use crate::bus::Bus;
+use crate::{
-use crate::register::{self, socketn};
+	bus::Bus,
+	register::{self, socketn},
+};
 
 #[derive(Debug)]
 #[cfg_attr(feature = "defmt", derive(defmt::Format))]
@@ -13,9 +14,7 @@ pub struct Socket {
 impl Socket {
 	/// 4 sockets available on the w5100
 	pub fn new(index: u8) -> Self {
-        Socket {
+		Socket { index }
-            index,
-        }
 	}
 
 	pub fn register(&self) -> u16 {
@@ -32,12 +31,9 @@ impl Socket {
 		Ok(())
 	}
 
-    pub fn get_mode<SpiBus: Bus>(
+	pub fn get_mode<SpiBus: Bus>(&self, bus: &mut SpiBus) -> Result<u8, SpiBus::Error> {
-        &self,
-        bus: &mut SpiBus,
-    ) -> Result<u8, SpiBus::Error> {
 		let mut mode = [0];
-        bus.write_frame(self.register() + socketn::MODE, &mut mode)?;
+		bus.write_frame(self.register() + socketn::MODE, &mode)?;
 		Ok(mode[0])
 	}
 
@@ -78,10 +74,7 @@ impl Socket {
 		Ok(())
 	}
 
-    pub fn get_source_port<SpiBus: Bus>(
+	pub fn get_source_port<SpiBus: Bus>(&self, bus: &mut SpiBus) -> Result<u16, SpiBus::Error> {
-        &self,
-        bus: &mut SpiBus,
-    ) -> Result<u16, SpiBus::Error> {
 		let mut data = [0; 2];
 		bus.read_frame(self.register() + socketn::SOURCE_PORT, &mut data)?;
 		Ok(u16::from_be_bytes(data))
@@ -158,23 +151,23 @@ impl Socket {
 		Ok(())
 	}
 
-    pub fn enable_interrupts<SpiBus: Bus>(
+	pub fn enable_interrupts<SpiBus: Bus>(&self, bus: &mut SpiBus) -> Result<(), SpiBus::Error> {
-        &self,
-        bus: &mut SpiBus,
-    ) -> Result<(), SpiBus::Error> {
 		let mut data = [0];
-        bus.read_frame(register::COMMON + register::common::INTERRUPT_MASK, &mut data)?;
+		bus.read_frame(
+			register::COMMON + register::common::INTERRUPT_MASK,
+			&mut data,
+		)?;
 		data[0] |= 1 << self.index;
 		bus.write_frame(register::COMMON + register::common::INTERRUPT_MASK, &data)?;
 		Ok(())
 	}
 
-    pub fn disable_interrupts<SpiBus: Bus>(
+	pub fn disable_interrupts<SpiBus: Bus>(&self, bus: &mut SpiBus) -> Result<(), SpiBus::Error> {
-        &self,
-        bus: &mut SpiBus,
-    ) -> Result<(), SpiBus::Error> {
 		let mut data = [0];
-        bus.read_frame(register::COMMON + register::common::INTERRUPT_MASK, &mut data)?;
+		bus.read_frame(
+			register::COMMON + register::common::INTERRUPT_MASK,
+			&mut data,
+		)?;
 		data[0] &= !(1 << self.index);
 		bus.write_frame(register::COMMON + register::common::INTERRUPT_MASK, &data)?;
 		Ok(())

src/udp.rs

@@ -88,12 +88,10 @@ impl UdpSocket {
 			self.socket.reset_interrupt(bus, socketn::Interrupt::All)?;
 			self.socket.set_source_port(bus, self.port)?;
 			self.socket.set_mode(bus, socketn::Protocol::Udp)?;
-            self.socket.enable_interrupts(
+			self.socket.enable_interrupts(bus)?;
-                bus
-            )?;
 			self.socket.command(bus, socketn::Command::Open)?;
 			if self.socket.get_status(bus)? == Status::Udp as u8 {
-                return Ok(())
+				return Ok(());
 			}
 		}
 	}
@@ -127,7 +125,6 @@ impl UdpSocket {
 		// We set this variable to true when:
 		/// - We have the same Socket address already set
 		/// - We don't have any previous destination set
-        ///
 		// either no previous destination is set or a new one
 		if self
 			.destination
@@ -245,12 +242,16 @@ impl UdpSocket {
 		if offset as usize + write_data.len() > 0x800 {
 			let upper_size = 0x800 - offset as usize;
 			bus.write_frame(start_addr, &write_data[0..upper_size])?;
-            bus.write_frame(0x4000 + 0x800 * self.socket.index as u16, &write_data[upper_size..])?;
+			bus.write_frame(
+				0x4000 + 0x800 * self.socket.index as u16,
+				&write_data[upper_size..],
+			)?;
 		} else {
 			bus.write_frame(start_addr, write_data)?;
 		}
 
-        self.socket.set_tx_write_pointer(bus, offset.wrapping_add(write_data.len() as u16))?;
+		self.socket
+			.set_tx_write_pointer(bus, offset.wrapping_add(write_data.len() as u16))?;
 
 		self.block_send_command(bus)?;
 		self.socket.reset_interrupt(bus, socketn::Interrupt::SendOk);
@@ -566,13 +567,23 @@ where
 	SpiBus: Bus,
 	StateImpl: State,
 {
-    pub fn get_port(&mut self, socket: &mut UdpSocket) -> Result<u16, UdpSocketError<SpiBus::Error>> {
+	pub fn get_port(
+		&mut self,
+		socket: &mut UdpSocket,
+	) -> Result<u16, UdpSocketError<SpiBus::Error>> {
 		Ok(socket.get_port_for_real(&mut self.bus)?)
 	}
-    pub fn get_receive_size(&mut self, socket: &mut UdpSocket) -> Result<u16, UdpSocketError<SpiBus::Error>> {
+	pub fn get_receive_size(
+		&mut self,
+		socket: &mut UdpSocket,
+	) -> Result<u16, UdpSocketError<SpiBus::Error>> {
 		Ok(socket.socket.get_receive_size(&mut self.bus)?)
 	}
-    pub fn has_interrupt(&mut self, socket: &mut UdpSocket, interrupt: socketn::Interrupt) -> Result<bool, UdpSocketError<SpiBus::Error>> {
+	pub fn has_interrupt(
+		&mut self,
+		socket: &mut UdpSocket,
+		interrupt: socketn::Interrupt,
+	) -> Result<bool, UdpSocketError<SpiBus::Error>> {
 		Ok(socket.socket.has_interrupt(&mut self.bus, interrupt)?)
 	}
 }

src/uninitialized_device.rs

@@ -2,11 +2,11 @@ use core::net::Ipv4Addr;
 
 use embedded_hal::spi::SpiDevice;
 
-use crate::bus::{Bus, FourWire};
-use crate::device::{Device, DeviceState};
-use crate::host::{Dhcp, Host, Manual};
-use crate::raw_device::RawDevice;
 use crate::{
+	bus::{Bus, FourWire},
+	device::{Device, DeviceState},
+	host::{Dhcp, Host, Manual},
+	raw_device::RawDevice,
 	register::{self, common::RetryTime},
 	MacAddress, Mode,
 };
@@ -93,7 +93,6 @@ impl<SpiBus: Bus> UninitializedDevice<SpiBus> {
 		mut host: HostImpl,
 		mode_options: Mode,
 	) -> Result<Device<SpiBus, DeviceState<HostImpl>>, InitializeError<SpiBus::Error>> {
-
 		// RESET
 		self.reset()?;
 
@@ -127,8 +126,7 @@ impl<SpiBus: Bus> UninitializedDevice<SpiBus> {
 	#[inline]
 	pub fn set_mode(&mut self, mode_options: Mode) -> Result<(), SpiBus::Error> {
 		self.bus.write_frame(
-            register::COMMON +
+			register::COMMON + register::common::MODE,
-            register::common::MODE,
 			&mode_options.to_register(),
 		)
 	}
@@ -150,8 +148,7 @@ impl<SpiBus: Bus> UninitializedDevice<SpiBus> {
 	#[inline]
 	pub fn set_retry_timeout(&mut self, retry_time_value: RetryTime) -> Result<(), SpiBus::Error> {
 		self.bus.write_frame(
-            register::COMMON +
+			register::COMMON + register::common::RETRY_TIME,
-            register::common::RETRY_TIME,
 			&retry_time_value.to_register(),
 		)?;
 
@@ -165,8 +162,7 @@ impl<SpiBus: Bus> UninitializedDevice<SpiBus> {
 	pub fn current_retry_timeout(&mut self) -> Result<RetryTime, SpiBus::Error> {
 		let mut retry_time_register: [u8; 2] = [0, 0];
 		self.bus.read_frame(
-            register::COMMON+
+			register::COMMON + register::common::RETRY_TIME,
-            register::common::RETRY_TIME,
 			&mut retry_time_register,
 		)?;
 
@@ -191,8 +187,7 @@ impl<SpiBus: Bus> UninitializedDevice<SpiBus> {
 	/// `RCR = 0x0007`
 	pub fn set_retry_count(&mut self, retry_count: u8) -> Result<(), SpiBus::Error> {
 		self.bus.write_frame(
-            register::COMMON+
+			register::COMMON + register::common::RETRY_COUNT,
-            register::common::RETRY_COUNT,
 			&[retry_count],
 		)?;
 
@@ -208,8 +203,7 @@ impl<SpiBus: Bus> UninitializedDevice<SpiBus> {
 	pub fn current_retry_count(&mut self) -> Result<u8, SpiBus::Error> {
 		let mut retry_count_register: [u8; 1] = [0];
 		self.bus.read_frame(
-            register::COMMON+
+			register::COMMON + register::common::RETRY_COUNT,
-            register::common::RETRY_COUNT,
 			&mut retry_count_register,
 		)?;