Merge pull request #68 from nekernel-org/dev

NeKernel: v0.0.6e1

3 files changed, 16 insertions, 16 deletions

diff --git a/dev/kernel/src/Storage/AHCIDeviceInterface.cc b/dev/kernel/src/Storage/AHCIDeviceInterface.cc
index 39570665..6dcfed69 100644
--- a/dev/kernel/src/Storage/AHCIDeviceInterface.cc
+++ b/dev/kernel/src/Storage/AHCIDeviceInterface.cc
@@ -13,9 +13,9 @@ using namespace Kernel;
 /// @param In  Drive input
 /// @param Cleanup Drive cleanup.
 AHCIDeviceInterface::AHCIDeviceInterface(void (*out)(DeviceInterface*     self,
-                                                     MountpointInterface* outpacket),
+                                                     IMountpoint* outpacket),
                                          void (*in)(DeviceInterface*     self,
-                                                    MountpointInterface* inpacket))
+                                                    IMountpoint* inpacket))
     : DeviceInterface(out, in) {}
 
 /// @brief Class desctructor
@@ -30,7 +30,7 @@ const Char* AHCIDeviceInterface::Name() const {
 /// @brief Output operator.
 /// @param mnt the disk mountpoint.
 /// @return the class itself after operation.
-AHCIDeviceInterface& AHCIDeviceInterface::operator<<(MountpointInterface* mnt) {
+AHCIDeviceInterface& AHCIDeviceInterface::operator<<(IMountpoint* mnt) {
   if (!mnt) return *this;
 
   for (SizeT driveCount = 0; driveCount < kDriveMaxCount; ++driveCount) {
@@ -45,13 +45,13 @@ AHCIDeviceInterface& AHCIDeviceInterface::operator<<(MountpointInterface* mnt) {
     }
   }
 
-  return (AHCIDeviceInterface&) DeviceInterface<MountpointInterface*>::operator<<(mnt);
+  return (AHCIDeviceInterface&) DeviceInterface<IMountpoint*>::operator<<(mnt);
 }
 
 /// @brief Input operator.
 /// @param mnt the disk mountpoint.
 /// @return the class itself after operation.
-AHCIDeviceInterface& AHCIDeviceInterface::operator>>(MountpointInterface* mnt) {
+AHCIDeviceInterface& AHCIDeviceInterface::operator>>(IMountpoint* mnt) {
   if (!mnt) return *this;
 
   for (SizeT driveCount = 0; driveCount < kDriveMaxCount; ++driveCount) {
@@ -67,7 +67,7 @@ AHCIDeviceInterface& AHCIDeviceInterface::operator>>(MountpointInterface* mnt) {
     }
   }
 
-  return (AHCIDeviceInterface&) DeviceInterface<MountpointInterface*>::operator>>(mnt);
+  return (AHCIDeviceInterface&) DeviceInterface<IMountpoint*>::operator>>(mnt);
 }
 
 const UInt16& AHCIDeviceInterface::GetPortsImplemented() {
@@ -84,6 +84,6 @@ const UInt32& AHCIDeviceInterface::GetIndex() {
 }
 
 Void AHCIDeviceInterface::SetIndex(const UInt32& drv) {
-  MUST_PASS(MountpointInterface::kDriveIndexInvalid != drv);
+  MUST_PASS(IMountpoint::kDriveIndexInvalid < drv);
   this->fDriveIndex = drv;
 }
\ No newline at end of file
diff --git a/dev/kernel/src/Storage/ATADeviceInterface.cc b/dev/kernel/src/Storage/ATADeviceInterface.cc
index 609837af..70d6e9ae 100644
--- a/dev/kernel/src/Storage/ATADeviceInterface.cc
+++ b/dev/kernel/src/Storage/ATADeviceInterface.cc
@@ -13,8 +13,8 @@ using namespace Kernel;
 /// @param In  Drive input
 /// @param Cleanup Drive cleanup.
 ATADeviceInterface::ATADeviceInterface(void (*Out)(DeviceInterface*,
-                                                   MountpointInterface* outpacket),
-                                       void (*In)(DeviceInterface*, MountpointInterface* inpacket))
+                                                   IMountpoint* outpacket),
+                                       void (*In)(DeviceInterface*, IMountpoint* inpacket))
     : DeviceInterface(Out, In) {}
 
 /// @brief Class desctructor
@@ -29,7 +29,7 @@ const Char* ATADeviceInterface::Name() const {
 /// @brief Output operator.
 /// @param Data the disk mountpoint.
 /// @return the class itself after operation.
-ATADeviceInterface& ATADeviceInterface::operator<<(MountpointInterface* Data) {
+ATADeviceInterface& ATADeviceInterface::operator<<(IMountpoint* Data) {
   if (!Data) return *this;
 
   for (SizeT driveCount = 0; driveCount < kDriveMaxCount; ++driveCount) {
@@ -44,13 +44,13 @@ ATADeviceInterface& ATADeviceInterface::operator<<(MountpointInterface* Data) {
     }
   }
 
-  return (ATADeviceInterface&) DeviceInterface<MountpointInterface*>::operator<<(Data);
+  return (ATADeviceInterface&) DeviceInterface<IMountpoint*>::operator<<(Data);
 }
 
 /// @brief Input operator.
 /// @param Data the disk mountpoint.
 /// @return the class itself after operation.
-ATADeviceInterface& ATADeviceInterface::operator>>(MountpointInterface* Data) {
+ATADeviceInterface& ATADeviceInterface::operator>>(IMountpoint* Data) {
   if (!Data) return *this;
 
   for (SizeT driveCount = 0; driveCount < kDriveMaxCount; ++driveCount) {
@@ -66,7 +66,7 @@ ATADeviceInterface& ATADeviceInterface::operator>>(MountpointInterface* Data) {
     }
   }
 
-  return (ATADeviceInterface&) DeviceInterface<MountpointInterface*>::operator>>(Data);
+  return (ATADeviceInterface&) DeviceInterface<IMountpoint*>::operator>>(Data);
 }
 
 const UInt32& ATADeviceInterface::GetIndex() {
@@ -74,7 +74,7 @@ const UInt32& ATADeviceInterface::GetIndex() {
 }
 
 Void ATADeviceInterface::SetIndex(const UInt32& drv) {
-  MUST_PASS(MountpointInterface::kDriveIndexInvalid != drv);
+  MUST_PASS(IMountpoint::kDriveIndexInvalid < drv);
   this->fDriveIndex = drv;
 }
 
diff --git a/dev/kernel/src/Storage/NVMEDeviceInterface.cc b/dev/kernel/src/Storage/NVMEDeviceInterface.cc
index 077595cf..0b8043b7 100644
--- a/dev/kernel/src/Storage/NVMEDeviceInterface.cc
+++ b/dev/kernel/src/Storage/NVMEDeviceInterface.cc
@@ -8,8 +8,8 @@
 
 namespace Kernel {
 NVMEDeviceInterface::NVMEDeviceInterface(
-    void (*out)(DeviceInterface*, MountpointInterface* outpacket),
-    void (*in)(DeviceInterface*, MountpointInterface* inpacket), void (*cleanup)(void))
+    void (*out)(DeviceInterface*, IMountpoint* outpacket),
+    void (*in)(DeviceInterface*, IMountpoint* inpacket), void (*cleanup)(void))
     : DeviceInterface(out, in), fCleanup(cleanup) {}
 
 NVMEDeviceInterface::~NVMEDeviceInterface() {