Delegates: Updated to even simpler delegate initialization some places

Author: AnnikaH

api/hw/serial.hpp

@@ -24,7 +24,7 @@
 #include <hw/ioport.hpp>
 #include <cstdio>
 
-namespace hw{
+namespace hw {
 
   class Serial {
   public:
@@ -33,16 +33,14 @@ namespace hw{
     using on_data_handler = delegate<void(char c)>;
     using on_string_handler = delegate<void(const std::string& s)>;
 
-    using irq_delg = delegate<void()>;
-
     template <uint16_t PORT>
     static Serial& port(){
       static Serial s{PORT};
       return s;
     }
 
     OS::print_func get_print_handler() {
-      return OS::print_func{this, &Serial::print_handler};
+      return {this, &Serial::print_handler};
     }
 
     void on_data(on_data_handler del);

api/kernel/vga.hpp

@@ -47,7 +47,7 @@ class ConsoleVGA {
   explicit ConsoleVGA() noexcept;
 
   OS::print_func get_print_handler() {
-    return OS::print_func{this, &ConsoleVGA::write};
+    return {this, &ConsoleVGA::write};
   }
 
   constexpr static uint8_t make_color(const vga_color fg, const vga_color bg) noexcept

api/net/ip4/arp.hpp

@@ -97,10 +97,10 @@ namespace net {
       // @TODO: Add HÅREK-mapping here
       switch (nm) {
       case HH_MAP:
-        arp_resolver_ = Arp_resolver{*this, &Arp::hh_map};
+        arp_resolver_ = {this, &Arp::hh_map};
         break;
       default:
-        arp_resolver_ = Arp_resolver{*this, &Arp::arp_resolve};
+        arp_resolver_ = {this, &Arp::arp_resolve};
       }
     }
 
@@ -145,7 +145,7 @@ namespace net {
     void arp_resolve(Packet_ptr);
     void hh_map(Packet_ptr);
 
-    Arp_resolver arp_resolver_ = Arp_resolver{*this, &Arp::arp_resolve};
+    Arp_resolver arp_resolver_ = {this, &Arp::arp_resolve};
 
     PacketQueue waiting_packets_;
 

api/net/tcp/connection.inc

@@ -44,15 +44,15 @@ inline Connection& Connection::_on_cleanup(CleanupCallback cb) {
 }
 
 inline void Connection::write(const void* buf, size_t n) {
-  write(buf, n, WriteCallback{this, &Connection::default_on_write}, true);
+  write(buf, n, {this, &Connection::default_on_write}, true);
 }
 
 inline void Connection::write(const void* buf, size_t n, WriteCallback callback) {
   write(buf, n, callback, true);
 }
 
 inline void Connection::write(buffer_t buffer, size_t n) {
-  write({buffer, n, true}, WriteCallback{this, &Connection::default_on_write});
+  write({buffer, n, true}, {this, &Connection::default_on_write});
 }
 
 inline void Connection::write(buffer_t buffer, size_t n, WriteCallback callback) {

api/net/tcp/read_request.hpp

@@ -32,7 +32,7 @@ struct ReadRequest {
 
   /*ReadRequest()
     : buffer(nullptr, 0),
-      callback(ReadCallback{this, &ReadRequest::default_read_callback})
+      callback({this, &ReadRequest::default_read_callback})
   {}*/
 
   ReadRequest(ReadBuffer buf, ReadCallback cb)
@@ -42,7 +42,7 @@ struct ReadRequest {
 
   ReadRequest(size_t n = 0)
     : buffer(buffer_t(new uint8_t[n], std::default_delete<uint8_t[]>()), n),
-      callback(ReadCallback{this, &ReadRequest::default_read_callback})
+      callback({this, &ReadRequest::default_read_callback})
   {}
 
   void clean_up() {

src/drivers/virtionet.cpp

@@ -302,8 +302,7 @@ std::shared_ptr<Packet>
 VirtioNet::recv_packet(uint8_t* data, uint16_t size)
 {
   auto* ptr = (Packet*) (data + sizeof(VirtioNet::virtio_net_hdr) - sizeof(Packet));
-  new (ptr) Packet(bufsize(), size,
-      delegate<void(void*)>{&bufstore(), &BufferStore::release});
+  new (ptr) Packet(bufsize(), size, {&bufstore(), &BufferStore::release});
 
   return std::shared_ptr<Packet> (ptr);
 }

src/drivers/virtionet.hpp

@@ -128,8 +128,7 @@ class VirtioNet : Virtio, public hw::Nic {
   { return 1500; }
 
   net::downstream get_physical_out() override {
-    using downstream = net::downstream;
-    return downstream{this, &VirtioNet::transmit};
+    return {this, &VirtioNet::transmit};
   }
 
   /** Linklayer input. Hooks into IP-stack bottom, w.DOWNSTREAM data.*/

src/hw/serial.cpp

@@ -53,16 +53,16 @@ void Serial::print_handler(const char* str, size_t len) {
 
 void Serial::on_data(on_data_handler del) {
   enable_interrupt();
-  on_data_=del;
+  on_data_ = del;
   INFO("Serial", "Subscribing to data on IRQ %i",irq_);
-  IRQ_manager::get().subscribe(irq_, irq_delg{this, &Serial::irq_handler_});
+  IRQ_manager::get().subscribe(irq_, {this, &Serial::irq_handler_});
   IRQ_manager::get().enable_irq(irq_);
 }
 
 void Serial::on_readline(on_string_handler del, char delim) {
   newline = delim;
   on_readline_ = del;
-  on_data(on_data_handler{this, &Serial::readline_handler_});
+  on_data({this, &Serial::readline_handler_});
   debug("<Serial::on_readline> Subscribing to data %i \n", irq_);
 }
 

src/net/inet4.cpp

@@ -28,8 +28,7 @@ Inet4::Inet4(hw::Nic& nic)
 
   /** Upstream wiring  */
   // Packets available
-  nic.on_transmit_queue_available(
-    transmit_avail_delg{*this, &Inet4::process_sendq});
+  nic.on_transmit_queue_available({this, &Inet4::process_sendq});
 
   // Phys -> Eth (Later, this will be passed through router)
   nic.set_linklayer_out(eth_bottom);

src/net/ip4/udp.cpp

@@ -30,8 +30,7 @@ namespace net {
     : stack_(inet)
   {
     network_layer_out_ = [] (net::Packet_ptr) {};
-    inet.on_transmit_queue_available(
-        transmit_avail_delg{this, &UDP::process_sendq});
+    inet.on_transmit_queue_available({this, &UDP::process_sendq});
   }
 
   void UDP::bottom(net::Packet_ptr pckt)