Fix examples

Author: thalesfragoso

Cargo.toml

@@ -43,13 +43,16 @@ smoltcp-verbose = ["smoltcp/verbose"]
 cortex-m = "0.5"
 cortex-m-rt = "0.6"
 panic-itm = "0.4"
+cortex-m-semihosting = "0.3.5"
+stm32f4xx-hal = {version = "0.8.3", features = ["rt"] }
 
 [[example]]
 name = "pktgen"
+required-features = ["stm32f429"]
 
 [[example]]
 name = "ip"
-required-features = ["smoltcp-phy", "stm32f429"]
+required-features = ["stm32f429", "smoltcp-phy", "smoltcp-log", "smoltcp-verbose"]
 
 [profile.release]
 debug = 2

examples/ip.rs

@@ -22,7 +22,7 @@ use smoltcp::socket::{SocketSet, TcpSocket, TcpSocketBuffer};
 use smoltcp::time::Instant;
 use smoltcp::wire::{EthernetAddress, IpAddress, IpCidr, Ipv4Address};
 
-use stm32_eth::{Eth, RingEntry};
+use stm32_eth::{Eth, EthPins, RingEntry};
 
 static mut LOGGER: HioLogger = HioLogger {};
 
@@ -62,15 +62,24 @@ fn main() -> ! {
     setup_systick(&mut cp.SYST);
 
     writeln!(stdout, "Enabling ethernet...").unwrap();
-    stm32_eth::setup(&p.RCC, &p.SYSCFG);
+    stm32_eth::setup();
     let gpioa = p.GPIOA.split();
     let gpiob = p.GPIOB.split();
     let gpioc = p.GPIOC.split();
     let gpiog = p.GPIOG.split();
-    stm32_eth::setup_pins(
-        gpioa.pa1, gpioa.pa2, gpioa.pa7, gpiob.pb13, gpioc.pc1, gpioc.pc4, gpioc.pc5, gpiog.pg11,
-        gpiog.pg13,
-    );
+
+    let eth_pins = EthPins {
+        ref_clk: gpioa.pa1,
+        md_io: gpioa.pa2,
+        md_clk: gpioc.pc1,
+        crs: gpioa.pa7,
+        tx_en: gpiog.pg11,
+        tx_d0: gpiog.pg13,
+        tx_d1: gpiob.pb13,
+        rx_d0: gpioc.pc4,
+        rx_d1: gpioc.pc5,
+    };
+    eth_pins.setup();
 
     let mut rx_ring: [RingEntry<_>; 8] = Default::default();
     let mut tx_ring: [RingEntry<_>; 2] = Default::default();
@@ -80,7 +89,7 @@ fn main() -> ! {
         &mut rx_ring[..],
         &mut tx_ring[..],
     );
-    eth.enable_interrupt(&mut cp.NVIC);
+    eth.enable_interrupt();
 
     let local_addr = Ipv4Address::new(10, 0, 0, 1);
     let ip_addr = IpCidr::new(IpAddress::from(local_addr), 24);

examples/pktgen.rs

@@ -17,7 +17,7 @@ use stm32f4xx_hal::{
 use core::fmt::Write;
 use cortex_m_semihosting::hio;
 
-use stm32_eth::{Eth, RingEntry, TxError};
+use stm32_eth::{Eth, EthPins, RingEntry, TxError};
 
 const SRC_MAC: [u8; 6] = [0x00, 0x00, 0xDE, 0xAD, 0xBE, 0xEF];
 const DST_MAC: [u8; 6] = [0x00, 0x00, 0xBE, 0xEF, 0xDE, 0xAD];
@@ -36,15 +36,24 @@ fn main() -> ! {
     setup_systick(&mut cp.SYST);
 
     writeln!(stdout, "Enabling ethernet...").unwrap();
-    stm32_eth::setup(&p.RCC, &p.SYSCFG);
+    stm32_eth::setup();
     let gpioa = p.GPIOA.split();
     let gpiob = p.GPIOB.split();
     let gpioc = p.GPIOC.split();
     let gpiog = p.GPIOG.split();
-    stm32_eth::setup_pins(
-        gpioa.pa1, gpioa.pa2, gpioa.pa7, gpiob.pb13, gpioc.pc1, gpioc.pc4, gpioc.pc5, gpiog.pg11,
-        gpiog.pg13,
-    );
+
+    let eth_pins = EthPins {
+        ref_clk: gpioa.pa1,
+        md_io: gpioa.pa2,
+        md_clk: gpioc.pc1,
+        crs: gpioa.pa7,
+        tx_en: gpiog.pg11,
+        tx_d0: gpiog.pg13,
+        tx_d1: gpiob.pb13,
+        rx_d0: gpioc.pc4,
+        rx_d1: gpioc.pc5,
+    };
+    eth_pins.setup();
 
     let mut rx_ring: [RingEntry<_>; 16] = Default::default();
     let mut tx_ring: [RingEntry<_>; 8] = Default::default();
@@ -54,7 +63,7 @@ fn main() -> ! {
         &mut rx_ring[..],
         &mut tx_ring[..],
     );
-    eth.enable_interrupt(&mut cp.NVIC);
+    eth.enable_interrupt();
 
     // Main loop
     let mut last_stats_time = 0usize;

src/setup.rs

@@ -86,7 +86,7 @@ pub trait AlternateVeryHighSpeed {
 pub struct EthPins<REFCLK, IO, CLK, CRS, TXEN, TXD0, TXD1, RXD0, RXD1> {
     pub ref_clk: REFCLK,
     pub md_io: IO,
-    pub m_clk: CLK,
+    pub md_clk: CLK,
     pub crs: CRS,
     pub tx_en: TXEN,
     pub tx_d0: TXD0,
@@ -119,7 +119,7 @@ where
     pub fn setup(self) {
         self.ref_clk.into_af11_very_high_speed();
         self.md_io.into_af11_very_high_speed();
-        self.m_clk.into_af11_very_high_speed();
+        self.md_clk.into_af11_very_high_speed();
         self.crs.into_af11_very_high_speed();
         self.tx_en.into_af11_very_high_speed();
         self.tx_d0.into_af11_very_high_speed();