eth: prepare tx

src/eth/mod.rs

@@ -334,23 +334,23 @@ impl<RX, TX> Eth<RX, TX> {
         new_self
     }
 
-    // pub fn start_tx<'tx>(self, tx_buffers: [&'tx [u8]; tx::DESCS]) -> Eth<RX, tx::DescList<'tx>> {
+    pub fn start_tx<'tx>(self, tx_list: &'tx mut [tx::DescEntry], tx_buffers: &'tx mut [[u8; MTU]]) -> Eth<RX, tx::DescList<'tx>> {
-    //     let new_self = Eth {
+        let new_self = Eth {
-    //         regs: self.regs,
+            regs: self.regs,
-    //         rx: self.rx,
+            rx: self.rx,
-    //         tx: tx::DescList::new(tx_buffers),
+            tx: tx::DescList::new(tx_list, tx_buffers),
-    //     };
+        };
-    //     let list_addr = &new_self.tx as *const _ as u32;
+        let list_addr = &new_self.tx.list_addr();
-    //     assert!(list_addr & 0b11 == 0);
+        assert!(list_addr & 0b11 == 0);
-    //     new_self.regs.tx_qbar.write(
+        new_self.regs.tx_qbar.write(
-    //         regs::TxQbar::zeroed()
+            regs::TxQbar::zeroed()
-    //             .tx_q_baseaddr(list_addr >> 2)
+                .tx_q_baseaddr(list_addr >> 2)
-    //     );
+        );
-    //     new_self.regs.net_ctrl.modify(|_, w|
+        new_self.regs.net_ctrl.modify(|_, w|
-    //         w.tx_en(true)
+            w.tx_en(true)
-    //     );
+        );
-    //     new_self
+        new_self
-    // }
+    }
 
     fn wait_phy_idle(&self) {
         while !self.regs.net_status.read().phy_mgmt_idle() {}
@@ -404,6 +404,12 @@ impl<'rx, TX> Eth<rx::DescList<'rx>, TX> {
     }
 }
 
+impl<'tx, RX> Eth<RX, tx::DescList<'tx>> {
+    pub fn send<'s: 'p, 'p>(&'s mut self, length: usize) -> Option<tx::PktRef<'p>> {
+        self.tx.send(&mut self.regs, length)
+    }
+}
+
 impl<RX, TX> phy::PhyAccess for Eth<RX, TX> {
     fn read_phy(&mut self, addr: u8, reg: u8) -> u16 {
         self.wait_phy_idle();

src/eth/tx.rs

@@ -1,8 +1,9 @@
-use core::mem::uninitialized;
+use core::ops::{Deref, DerefMut};
 use crate::{register, register_bit, register_bits, register_bits_typed, regs::*};
+use super::{MTU, regs};
 
 /// Descriptor entry
-struct DescEntry {
+pub struct DescEntry {
     word0: DescWord0,
     word1: DescWord1,
 }
@@ -28,26 +29,86 @@ pub const DESCS: usize = 8;
 
 #[repr(C)]
 pub struct DescList<'a> {
-    list: [DescEntry; DESCS],
+    list: &'a mut [DescEntry],
-    buffers: [&'a [u8]; DESCS],
+    buffers: &'a mut [[u8; MTU]],
+    next: usize,
 }
 
 impl<'a> DescList<'a> {
-    pub fn new(buffers: [&'a [u8]; DESCS]) -> Self {
+    pub fn new(list: &'a mut [DescEntry], buffers: &'a mut [[u8; MTU]]) -> Self {
-        let mut list: [DescEntry; DESCS] = unsafe { uninitialized() };
+        let last = list.len().min(buffers.len()) - 1;
-        for i in 0..DESCS {
+        for (i, (entry, buffer)) in list.iter_mut().zip(buffers.iter_mut()).enumerate() {
-            let buffer_addr = &buffers[i][0] as *const _ as u32;
+            let is_last = i == last;
-            list[i].word0.write(
+            let buffer_addr = &mut buffer[0] as *mut _ as u32;
+            assert!(buffer_addr & 0b11 == 0);
+            entry.word0.write(
                 DescWord0::zeroed()
                     .address(buffer_addr)
             );
-            list[i].word1.write(
+            entry.word1.write(
                 DescWord1::zeroed()
                     .used(true)
-                    .wrap(i == DESCS - 1)
+                    .wrap(is_last)
             );
         }
 
-        DescList { list, buffers }
+        DescList {
+            list,
+            buffers,
+            next: 0,
+        }
+    }
+
+    pub fn list_addr(&self) -> u32 {
+        &self.list[0] as *const _ as u32
+    }
+
+    pub fn send<'s: 'p, 'p>(&'s mut self, regs: &'p mut regs::RegisterBlock, length: usize) -> Option<PktRef<'p>> {
+        let list_len = self.list.len();
+        let entry = &mut self.list[self.next];
+        if entry.word1.read().used() {
+            entry.word1.modify(|_, w| w.length(length as u16));
+            let buffer = &mut self.buffers[self.next][0..length];
+
+            self.next += 1;
+            if self.next >= list_len {
+                self.next = 0;
+            }
+
+            Some(PktRef { entry, buffer, regs })
+        } else {
+            // Still in use by HW (sending too fast, ring exceeded)
+            None
+        }
+    }
+}
+
+/// Releases a buffer back to the HW upon Drop, and start the TX
+/// engine
+pub struct PktRef<'a> {
+    entry: &'a mut DescEntry,
+    buffer: &'a mut [u8],
+    regs: &'a mut regs::RegisterBlock,
+}
+
+impl<'a> Drop for PktRef<'a> {
+    fn drop(&mut self) {
+        self.entry.word1.modify(|_, w| w.used(false));
+        self.regs.net_ctrl.modify(|_, w|
+            w.tx_en(true)
+        );
+    }
+}
+
+impl<'a> Deref for PktRef<'a> {
+    type Target = [u8];
+    fn deref(&self) -> &Self::Target {
+        self.buffer
+    }
+}
+
+impl<'a> DerefMut for PktRef<'a> {
+    fn deref_mut(&mut self) -> &mut <Self as Deref>::Target {
+        self.buffer
     }
 }

src/main.rs

@@ -95,6 +95,9 @@ fn main() {
     let mut rx_descs: [eth::rx::DescEntry; 8] = unsafe { uninitialized() };
     let mut rx_buffers = [[0u8; 1536]; 8];
     let mut eth = eth.start_rx(&mut rx_descs, &mut rx_buffers);
+    let mut tx_descs: [eth::tx::DescEntry; 8] = unsafe { uninitialized() };
+    let mut tx_buffers = [[0u8; 1536]; 8];
+    let mut eth = eth.start_tx(&mut tx_descs, &mut tx_buffers);
 
     loop {
         match eth.recv_next() {
@@ -110,6 +113,18 @@ fn main() {
                 println!("eth rx error: {:?}", e);
             }
         }
+
+        match eth.send(512) {
+            Some(mut pkt) => {
+                let mut x = 0;
+                for b in pkt.iter_mut() {
+                    *b = x;
+                    x += 1;
+                }
+                println!("eth tx {} bytes", pkt.len());
+            }
+            None => println!("eth tx shortage"),
+        }
     }
     panic!("End");
 }