Update Cargo.toml and README

Author: thalesfragoso

Cargo.toml

@@ -4,7 +4,7 @@ name = "stm32-eth"
 description = "Embedded Rust Ethernet driver for the STM32 MCU series"
 license = "Apache-2.0"
 authors = ["Astro <[email protected]>"]
-version = "0.1.2"
+version = "0.2.0"
 keywords = ["ethernet", "eth", "stm32", "stm32f4"]
 repository = "https://github.com/stm32-rs/stm32-eth"
 documentation = "https://docs.rs/stm32-eth/"
@@ -40,7 +40,7 @@ smoltcp-log = ["log", "smoltcp/log"]
 smoltcp-verbose = ["smoltcp/verbose"]
 
 [dev-dependencies]
-cortex-m = "0.5"
+cortex-m = "0.6.2"
 cortex-m-rt = "0.6"
 panic-itm = "0.4"
 cortex-m-semihosting = "0.3.5"

README.md

@@ -13,8 +13,8 @@ Please send pull requests.
 
 Add to the `[dependencies]` section in your `Cargo.toml`:
 ```rust
-stm32f4xx-hal = { version = "*", features = ["stm32f429"] }
-stm32-eth = { version = "0.1.1", features = ["nucleo-f429zi"] }
+stm32f4xx-hal = { version = "0.8.3", features = ["stm32f429"] }
+stm32-eth = { version = "0.2.0", features = ["stm32f429"] }
 ```
 
 In `src/main.rs` add:
@@ -28,33 +28,45 @@ use stm32_eth::{Eth, RingEntry};
 fn main() {
     let p = Peripherals::take().unwrap();
 
-    // Setup pins and initialize clocks.
-    stm32_eth::setup(&p.RCC, &p.SYSCFG);
+    let rcc = p.RCC.constrain();
+    // HCLK must be between 25MHz and 168MHz to use the ethernet peripheral
+    let clocks = rcc.cfgr.sysclk(32.mhz()).hclk(32.mhz()).freeze();
+
     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
-    );
-    // Allocate the ring buffers
-    let mut rx_ring: [RingEntry<_>; 8] = Default::default();
-    let mut tx_ring: [RingEntry<_>; 2] = Default::default();
-    // Instantiate driver
-    let mut eth = Eth::new(
-        p.ETHERNET_MAC, p.ETHERNET_DMA,
-        &mut rx_ring[..], &mut tx_ring[..]
-    );
-    // If you have a handler, enable interrupts
-    eth.enable_interrupt(&mut cp.NVIC);
 
+    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,
+    };
+
+    let mut rx_ring: [RingEntry<_>; 16] = Default::default();
+    let mut tx_ring: [RingEntry<_>; 8] = Default::default();
+    let mut eth = Eth::new(
+        p.ETHERNET_MAC,
+        p.ETHERNET_DMA,
+        &mut rx_ring[..],
+        &mut tx_ring[..],
+        PhyAddress::_0,
+        clocks,
+        eth_pins,
+    )
+    .unwrap();
+    eth.enable_interrupt();
 
     if let Ok(pkt) = eth.recv_next() {
         // handle received pkt
     }
 
-
     eth.send(size, |buf| {
         // write up to `size` bytes into buf before it is being sent
     }).expect("send");