Merge branch 'Amllx-trunk-patch-989e' into 'trunk'

Kernel: merge new network code into trunk.

See merge request mahrouss-logic/micro-kernel!11

1 files changed, 9 insertions, 3 deletions

diff --git a/Private/NetworkKit/NetworkDevice.hpp b/Private/NetworkKit/NetworkDevice.hpp
index 94f17bb9..1550afd1 100644
--- a/Private/NetworkKit/NetworkDevice.hpp
+++ b/Private/NetworkKit/NetworkDevice.hpp
@@ -12,12 +12,16 @@
 
 namespace HCore {
 struct NetworkDeviceCommand;
+class NetworkDevice;
 
+/**
+* \brief Network device interface, establishes a connection to the NIC.
+*/
 class NetworkDevice final : public DeviceInterface<NetworkDeviceCommand> {
  public:
   NetworkDevice(void (*out)(NetworkDeviceCommand),
                 void (*in)(NetworkDeviceCommand),
-                void (*on_cleanup)(void) = nullptr);
+                void (*onCleanup)(void) = nullptr);
 
   ~NetworkDevice() override;
 
@@ -26,13 +30,13 @@ class NetworkDevice final : public DeviceInterface<NetworkDeviceCommand> {
   NetworkDevice(const NetworkDevice &) = default;
 
  public:
-  const char *Name() const override { return ("NetworkDevice"); }
+  const char *Name() const override { return "NetworkDevice"; }
 
  private:
   void (*fCleanup)(void);
 };
 
-struct NetworkDeviceCommand {
+struct PACKED NetworkDeviceCommand final {
   UInt32 Command;
   UInt32 VLan;
   UInt32 DmaLow;
@@ -44,4 +48,6 @@ using UDPNetworkDevice = NetworkDevice;
 using PPPNetworkDevice = NetworkDevice;
 }  // namespace HCore
 
+#include <NetworkKit/NetworkDevice.inl>
+
 #endif  // !_INC_NETWORKDEVICE_HPP__