From d0d0d48780ff54a3b1ea4b5763c65df609f401d6 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 28 May 2025 20:40:51 +0200 Subject: [PATCH] continue with descriptors --- zynq7000-hal/src/eth/mod.rs | 16 +++++++++------- zynq7000-hal/src/eth/rx_descr.rs | 2 +- zynq7000-hal/src/eth/tx_descr.rs | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/zynq7000-hal/src/eth/mod.rs b/zynq7000-hal/src/eth/mod.rs index 1635fda..200ba2d 100644 --- a/zynq7000-hal/src/eth/mod.rs +++ b/zynq7000-hal/src/eth/mod.rs @@ -1,6 +1,6 @@ use arbitrary_int::u3; pub use zynq7000::eth::MdcClkDiv; -use zynq7000::eth::{GEM_0_BASE_ADDR, GEM_1_BASE_ADDR, MmioEthernet, SpeedMode}; +use zynq7000::eth::{MmioEthernet, SpeedMode, GEM_0_BASE_ADDR, GEM_1_BASE_ADDR}; pub use ll::{ClkConfig, EthernetLowLevel}; @@ -14,11 +14,11 @@ use crate::gpio::mio::{ Mio16, Mio17, Mio18, Mio19, Mio20, Mio21, Mio22, Mio23, Mio24, Mio25, Mio26, Mio27, }; use crate::gpio::{ - IoPeriphPin, mio::{ Mio28, Mio29, Mio30, Mio31, Mio32, Mio33, Mio34, Mio35, Mio36, Mio37, Mio38, Mio39, Mio52, Mio53, MioPinMarker, MuxConf, Pin, }, + IoPeriphPin, }; pub const MUX_CONF_PHY: MuxConf = MuxConf::new_with_l0(); @@ -390,9 +390,11 @@ impl Ethernet { } } -#[bitbybit::bitenum(u1, exhaustive = true)] -#[derive(Debug, PartialEq, Eq)] -pub(crate) enum Ownership { - Hardware = 0, - Software = 1, +mod shared { + #[bitbybit::bitenum(u1, exhaustive = true)] + #[derive(Debug, PartialEq, Eq)] + pub enum Ownership { + Hardware = 0, + Software = 1, + } } diff --git a/zynq7000-hal/src/eth/rx_descr.rs b/zynq7000-hal/src/eth/rx_descr.rs index 793660e..f706c89 100644 --- a/zynq7000-hal/src/eth/rx_descr.rs +++ b/zynq7000-hal/src/eth/rx_descr.rs @@ -1,5 +1,5 @@ //! RX buffer descriptor module. -pub use super::Ownership; +pub use super::shared::Ownership; use arbitrary_int::{u2, u3, u13, u30}; /// RX buffer descriptor. diff --git a/zynq7000-hal/src/eth/tx_descr.rs b/zynq7000-hal/src/eth/tx_descr.rs index e02b312..dd54689 100644 --- a/zynq7000-hal/src/eth/tx_descr.rs +++ b/zynq7000-hal/src/eth/tx_descr.rs @@ -1,6 +1,6 @@ use arbitrary_int::u14; -pub use super::Ownership; +pub use super::shared::Ownership; /// RX buffer descriptor. ///