diff --git a/repos/os/src/server/nic_dump/component.cc b/repos/os/src/server/nic_dump/component.cc index 9222301bb..90900c3db 100644 --- a/repos/os/src/server/nic_dump/component.cc +++ b/repos/os/src/server/nic_dump/component.cc @@ -60,7 +60,7 @@ Net::Session_component::Session_component(Allocator &alloc, size_t const rx_buf_size, Xml_node config, Timer::Connection &timer, - unsigned &curr_time, + Duration &curr_time, Env &env) : Session_component_base(alloc, amount, env.ram(), tx_buf_size, rx_buf_size), @@ -109,7 +109,7 @@ Net::Root::Root(Env &env, Allocator &alloc, Xml_node config, Timer::Connection &timer, - unsigned &curr_time) + Duration &curr_time) : Root_component(&env.ep().rpc_ep(), &alloc), diff --git a/repos/os/src/server/nic_dump/component.h b/repos/os/src/server/nic_dump/component.h index 8354d48a3..971b28cec 100644 --- a/repos/os/src/server/nic_dump/component.h +++ b/repos/os/src/server/nic_dump/component.h @@ -96,7 +96,7 @@ class Net::Session_component : public Session_component_base, Genode::size_t const rx_buf_size, Genode::Xml_node config, Timer::Connection &timer, - unsigned &curr_time, + Genode::Duration &curr_time, Genode::Env &env); @@ -106,7 +106,8 @@ class Net::Session_component : public Session_component_base, Mac_address mac_address() { return _uplink.mac_address(); } bool link_state() { return _uplink.link_state(); } - void link_state_sigh(Genode::Signal_context_capability sigh) { _link_state_sigh = sigh; } + void link_state_sigh(Genode::Signal_context_capability sigh) { + _link_state_sigh = sigh; } }; @@ -116,9 +117,9 @@ class Net::Root : public Genode::Root_component _remote; Interface_label _label; Timer::Connection &_timer; - unsigned &_curr_time; + Genode::Duration &_curr_time; bool _log_time; void _send(Ethernet_frame ð, Genode::size_t const eth_size); @@ -78,7 +78,7 @@ class Net::Interface Interface(Genode::Entrypoint &ep, Interface_label label, Timer::Connection &timer, - unsigned &curr_time, + Genode::Duration &curr_time, bool log_time, Genode::Allocator &alloc); diff --git a/repos/os/src/server/nic_dump/main.cc b/repos/os/src/server/nic_dump/main.cc index 5f2e24530..ceb3ce31c 100644 --- a/repos/os/src/server/nic_dump/main.cc +++ b/repos/os/src/server/nic_dump/main.cc @@ -28,11 +28,11 @@ class Main { private: - Genode::Attached_rom_dataspace _config; - Timer::Connection _timer; - unsigned _curr_time { 0 }; - Genode::Heap _heap; - Net::Root _root; + Attached_rom_dataspace _config; + Timer::Connection _timer; + Duration _curr_time { Microseconds(0UL) }; + Heap _heap; + Net::Root _root; public: diff --git a/repos/os/src/server/nic_dump/uplink.cc b/repos/os/src/server/nic_dump/uplink.cc index 82f124c88..1dde6f62a 100644 --- a/repos/os/src/server/nic_dump/uplink.cc +++ b/repos/os/src/server/nic_dump/uplink.cc @@ -25,7 +25,7 @@ using namespace Genode; Net::Uplink::Uplink(Env &env, Xml_node config, Timer::Connection &timer, - unsigned &curr_time, + Duration &curr_time, Allocator &alloc) : Nic::Packet_allocator(&alloc), diff --git a/repos/os/src/server/nic_dump/uplink.h b/repos/os/src/server/nic_dump/uplink.h index b81339e8f..097d8061c 100644 --- a/repos/os/src/server/nic_dump/uplink.h +++ b/repos/os/src/server/nic_dump/uplink.h @@ -47,7 +47,7 @@ class Net::Uplink : public Nic::Packet_allocator, Uplink(Genode::Env &env, Genode::Xml_node config, Timer::Connection &timer, - unsigned &curr_time, + Genode::Duration &curr_time, Genode::Allocator &alloc); };