Fix examples

Author: korken89

.github/workflows/build.yml

@@ -136,13 +136,6 @@ jobs:
           use-cross: false
           command: build
           args: --target=${{ matrix.target }} --example ip-f107 --features stm32f107,smoltcp-phy,log,smoltcp/socket-tcp,smoltcp/socket-icmp,smoltcp/log,smoltcp/verbose 
-      
-      - name: cargo build f1
-        uses: actions-rs/cargo@v1
-        with:
-          use-cross: false
-          command: build
-          args: --target=${{ matrix.target }} --features ${{ matrix.feaures }} 
 
   # Refs: https://github.com/rust-lang/crater/blob/9ab6f9697c901c4a44025cf0a39b73ad5b37d198/.github/workflows/bors.yml#L125-L149
   #

examples/arp-smoltcp.rs

@@ -28,14 +28,7 @@ use stm32_eth::{
     smi,
     stm32::{interrupt, CorePeripherals, Peripherals, SYST},
 };
-
-use cortex_m_semihosting::hprintln;
-
-use smoltcp::wire::{
-    ArpOperation, ArpPacket, ArpRepr, EthernetAddress, EthernetFrame, EthernetProtocol,
-    EthernetRepr, Ipv4Address,
-};
-use stm32_eth::{Eth, EthPins, RingEntry, TxError};
+use stm32_eth::{EthPins, RingEntry, TxError};
 
 const PHY_REG_BSR: u8 = 0x01;
 const PHY_REG_BSR_UP: u16 = 1 << 2;
@@ -72,8 +65,10 @@ fn main() -> ! {
         rx_d1: gpioc.pc5,
     };
 
-    let mut mdio = gpioa.pa2.into_alternate().set_speed(Speed::VeryHigh);
-    let mut mdc = gpioc.pc1.into_alternate().set_speed(Speed::VeryHigh);
+    let mut mdio = gpioa.pa2.into_alternate();
+    mdio.set_speed(Speed::VeryHigh);
+    let mut mdc = gpioc.pc1.into_alternate();
+    mdc.set_speed(Speed::VeryHigh);
 
     // ETH_PHY_RESET(RST#) PB2 Chip Reset (active-low)
     let _eth_reset = gpiob.pb2.into_push_pull_output().set_high();

examples/arp.rs

@@ -63,8 +63,10 @@ fn main() -> ! {
         rx_d1: gpioc.pc5,
     };
 
-    let mut mdio = gpioa.pa2.into_alternate().set_speed(Speed::VeryHigh);
-    let mut mdc = gpioc.pc1.into_alternate().set_speed(Speed::VeryHigh);
+    let mut mdio = gpioa.pa2.into_alternate();
+    mdio.set_speed(Speed::VeryHigh);
+    let mut mdc = gpioc.pc1.into_alternate();
+    mdc.set_speed(Speed::VeryHigh);
 
     // ETH_PHY_RESET(RST#) PB2 Chip Reset (active-low)
     let _eth_reset = gpiob.pb2.into_push_pull_output().set_high();

examples/ip-f107.rs

@@ -27,7 +27,7 @@ use smoltcp::socket::{TcpSocket, TcpSocketBuffer};
 use smoltcp::time::Instant;
 use smoltcp::wire::{EthernetAddress, IpAddress, IpCidr, Ipv4Address};
 
-use stm32_eth::{Eth, EthPins, RingEntry};
+use stm32_eth::{EthPins, RingEntry};
 
 static mut LOGGER: HioLogger = HioLogger {};
 
@@ -105,16 +105,17 @@ fn main() -> ! {
 
     let mut rx_ring: [RingEntry<_>; 8] = Default::default();
     let mut tx_ring: [RingEntry<_>; 2] = Default::default();
-    let mut eth = Eth::new(
+    let (mut eth_dma, _eth_mac) = stm32_eth::new(
         p.ETHERNET_MAC,
+        p.ETHERNET_MMC,
         p.ETHERNET_DMA,
         &mut rx_ring[..],
         &mut tx_ring[..],
         clocks,
         eth_pins,
     )
     .unwrap();
-    eth.enable_interrupt();
+    eth_dma.enable_interrupt();
 
     let local_addr = Ipv4Address::new(10, 0, 0, 1);
     let ip_addr = IpCidr::new(IpAddress::from(local_addr), 24);
@@ -124,7 +125,7 @@ fn main() -> ! {
     let ethernet_addr = EthernetAddress(SRC_MAC);
 
     let mut sockets: [_; 1] = Default::default();
-    let mut iface = InterfaceBuilder::new(&mut eth, &mut sockets[..])
+    let mut iface = InterfaceBuilder::new(&mut eth_dma, &mut sockets[..])
         .hardware_addr(ethernet_addr.into())
         .ip_addrs(&mut ip_addrs[..])
         .neighbor_cache(neighbor_cache)