Skip to content

Commit 900536c

Browse files
committed
Fix compilation of examples
1 parent 7f79c40 commit 900536c

File tree

2 files changed

+8
-25
lines changed

2 files changed

+8
-25
lines changed

examples/ip.rs

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,7 @@ use smoltcp::wire::{EthernetAddress, IpCidr, Ipv4Address, Ipv4Cidr};
2222

2323
pub mod common;
2424

25-
use stm32_eth::{
26-
dma::{RxRingEntry, TxRingEntry},
27-
Parts,
28-
};
25+
use stm32_eth::Parts;
2926

3027
const IP_ADDRESS: Ipv4Address = Ipv4Address::new(10, 0, 0, 1);
3128
const SRC_MAC: [u8; 6] = [0x00, 0x00, 0xDE, 0xAD, 0xBE, 0xEF];
@@ -46,21 +43,14 @@ fn main() -> ! {
4643

4744
let (eth_pins, _mdio, _mdc, _) = common::setup_pins(gpio);
4845

49-
let mut rx_ring: [RxRingEntry; 2] = Default::default();
50-
let mut tx_ring: [TxRingEntry; 2] = Default::default();
46+
let (tx_ring, rx_ring) = common::setup_rings();
47+
5148
let Parts {
5249
mut dma,
5350
mac: _,
5451
#[cfg(feature = "ptp")]
5552
ptp: _,
56-
} = stm32_eth::new(
57-
ethernet,
58-
&mut rx_ring[..],
59-
&mut tx_ring[..],
60-
clocks,
61-
eth_pins,
62-
)
63-
.unwrap();
53+
} = stm32_eth::new(ethernet, rx_ring, tx_ring, clocks, eth_pins).unwrap();
6454
dma.enable_interrupt();
6555

6656
let ethernet_addr = EthernetAddress(SRC_MAC);

examples/pktgen.rs

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ use stm32_eth::{
1818
Parts,
1919
};
2020

21-
use stm32_eth::dma::{RxRingEntry, TxError, TxRingEntry};
21+
use stm32_eth::dma::TxError;
2222

2323
pub mod common;
2424

@@ -42,21 +42,14 @@ fn main() -> ! {
4242
defmt::info!("Enabling ethernet...");
4343
let (eth_pins, mdio, mdc, _) = common::setup_pins(gpio);
4444

45-
let mut rx_ring: [RxRingEntry; 2] = Default::default();
46-
let mut tx_ring: [TxRingEntry; 2] = Default::default();
45+
let (tx_ring, rx_ring) = common::setup_rings();
46+
4747
let Parts {
4848
mut dma,
4949
mac,
5050
#[cfg(feature = "ptp")]
5151
ptp: _,
52-
} = stm32_eth::new(
53-
ethernet,
54-
&mut rx_ring[..],
55-
&mut tx_ring[..],
56-
clocks,
57-
eth_pins,
58-
)
59-
.unwrap();
52+
} = stm32_eth::new(ethernet, rx_ring, tx_ring, clocks, eth_pins).unwrap();
6053
dma.enable_interrupt();
6154

6255
// Main loop

0 commit comments

Comments
 (0)