From dcb45d74661e4e951a3d07e76c603c0923791617 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Sat, 25 Apr 2020 12:59:57 +0800
Subject: [PATCH] use global timer

---
 runtime/src/comms.rs | 7 +++----
 runtime/src/main.rs  | 4 +++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/runtime/src/comms.rs b/runtime/src/comms.rs
index 6709293e..23b2ea9c 100644
--- a/runtime/src/comms.rs
+++ b/runtime/src/comms.rs
@@ -16,6 +16,7 @@ use libboard_zynq::{
         iface::{NeighborCache, EthernetInterfaceBuilder, Routes},
         time::Instant,
     },
+    timer::GlobalTimer,
 };
 use libsupport_zynq::alloc::{vec, vec::Vec};
 use libasync::{smoltcp::{Sockets, TcpStream}, task};
@@ -152,7 +153,7 @@ async fn handle_connection(stream: &TcpStream, control: Rc<RefCell<kernel::Contr
 const HWADDR: [u8; 6] = [0, 0x23, 0xab, 0xad, 0x1d, 0xea];
 const IPADDR: IpAddress = IpAddress::Ipv4(Ipv4Address([192, 168, 1, 52]));
 
-pub fn main() {
+pub fn main(timer: GlobalTimer) {
     let eth = zynq::eth::Eth::default(HWADDR.clone());
     const RX_LEN: usize = 8;
     let mut rx_descs = (0..RX_LEN)
@@ -205,9 +206,7 @@ pub fn main() {
 
     moninj::start();
 
-    let mut time = 0u32;
     Sockets::run(&mut iface, || {
-        time += 1;
-        Instant::from_millis(time)
+        Instant::from_millis(timer.get_time().0 as i32)
     });
 }
diff --git a/runtime/src/main.rs b/runtime/src/main.rs
index 5ec801b1..acda8782 100644
--- a/runtime/src/main.rs
+++ b/runtime/src/main.rs
@@ -9,6 +9,7 @@ use log::info;
 
 use libboard_zynq::{
     self as zynq, clocks::Clocks, clocks::source::{ClockSource, ArmPll, IoPll},
+    timer::GlobalTimer,
 };
 use libsupport_zynq::{logger, ram};
 
@@ -35,6 +36,7 @@ fn identifier_read(buf: &mut [u8]) -> &str {
 
 #[no_mangle]
 pub fn main_core0() {
+    let timer = GlobalTimer::start();
     let _ = logger::init();
     log::set_max_level(log::LevelFilter::Debug);
     info!("NAR3 starting...");
@@ -50,5 +52,5 @@ pub fn main_core0() {
 
     info!("Detected gateware: {}", identifier_read(&mut [0; 64]));
 
-    comms::main();
+    comms::main(timer);
 }