Merge pull request #68 from nekernel-org/dev

NeKernel: v0.0.6e1

3 files changed, 15 insertions, 15 deletions

diff --git a/dev/kernel/StorageKit/AHCI.h b/dev/kernel/StorageKit/AHCI.h
index 3b9dac67..d4f7cc55 100644
--- a/dev/kernel/StorageKit/AHCI.h
+++ b/dev/kernel/StorageKit/AHCI.h
@@ -14,10 +14,10 @@ namespace Kernel {
 /// @brief AHCIDeviceInterface class
 /// @details This class is used to send and receive data from the AHCI device.
 /// @note The class is derived from the DeviceInterface class.
-class AHCIDeviceInterface NE_DEVICE<MountpointInterface*> {
+class AHCIDeviceInterface NE_DEVICE<IMountpoint*> {
  public:
-  explicit AHCIDeviceInterface(void (*out)(DeviceInterface* self, MountpointInterface* out),
-                               void (*in)(DeviceInterface* self, MountpointInterface* in));
+  explicit AHCIDeviceInterface(void (*out)(DeviceInterface* self, IMountpoint* out),
+                               void (*in)(DeviceInterface* self, IMountpoint* in));
 
   virtual ~AHCIDeviceInterface() override;
 
@@ -36,8 +36,8 @@ class AHCIDeviceInterface NE_DEVICE<MountpointInterface*> {
   Void SetIndex(const UInt32& drv);
 
  public:
-  AHCIDeviceInterface& operator<<(MountpointInterface* Data) override;
-  AHCIDeviceInterface& operator>>(MountpointInterface* Data) override;
+  AHCIDeviceInterface& operator<<(IMountpoint* Data) override;
+  AHCIDeviceInterface& operator>>(IMountpoint* Data) override;
 
  private:
   UInt16 fPortsImplemented{0U};
@@ -45,5 +45,5 @@ class AHCIDeviceInterface NE_DEVICE<MountpointInterface*> {
 };
 
 UInt16                       sk_init_ahci_device(BOOL atapi);
-ErrorOr<AHCIDeviceInterface> sk_acquire_ahci_device(Int32 drv_index);
+ErrorOr<AHCIDeviceInterface> sk_acquire_ahci_device(UInt32 drv_index);
 }  // namespace Kernel
diff --git a/dev/kernel/StorageKit/ATA.h b/dev/kernel/StorageKit/ATA.h
index d4c894a3..49ab3e4e 100644
--- a/dev/kernel/StorageKit/ATA.h
+++ b/dev/kernel/StorageKit/ATA.h
@@ -13,16 +13,16 @@
 
 namespace Kernel {
 /// @brief ATA device interface class.
-class ATADeviceInterface : public DeviceInterface<MountpointInterface*> {
+class ATADeviceInterface : public DeviceInterface<IMountpoint*> {
  public:
-  explicit ATADeviceInterface(void (*Out)(DeviceInterface*, MountpointInterface* outpacket),
-                              void (*In)(DeviceInterface*, MountpointInterface* inpacket));
+  explicit ATADeviceInterface(void (*Out)(DeviceInterface*, IMountpoint* outpacket),
+                              void (*In)(DeviceInterface*, IMountpoint* inpacket));
 
   virtual ~ATADeviceInterface();
 
  public:
-  ATADeviceInterface& operator<<(MountpointInterface* Data) override;
-  ATADeviceInterface& operator>>(MountpointInterface* Data) override;
+  ATADeviceInterface& operator<<(IMountpoint* Data) override;
+  ATADeviceInterface& operator>>(IMountpoint* Data) override;
 
  public:
   ATADeviceInterface& operator=(const ATADeviceInterface&) = default;
diff --git a/dev/kernel/StorageKit/NVME.h b/dev/kernel/StorageKit/NVME.h
index 1b2b6358..9852c5eb 100644
--- a/dev/kernel/StorageKit/NVME.h
+++ b/dev/kernel/StorageKit/NVME.h
@@ -10,10 +10,10 @@
 #include <KernelKit/DriveMgr.h>
 
 namespace Kernel {
-class NVMEDeviceInterface final NE_DEVICE<MountpointInterface*> {
+class NVMEDeviceInterface final NE_DEVICE<IMountpoint*> {
  public:
-  explicit NVMEDeviceInterface(Void (*out)(DeviceInterface*, MountpointInterface* out_packet),
-                               Void (*in)(DeviceInterface*, MountpointInterface* in_packet),
+  explicit NVMEDeviceInterface(Void (*out)(DeviceInterface*, IMountpoint* out_packet),
+                               Void (*in)(DeviceInterface*, IMountpoint* in_packet),
                                Void (*cleanup)(Void));
 
   ~NVMEDeviceInterface() override;
@@ -24,7 +24,7 @@ class NVMEDeviceInterface final NE_DEVICE<MountpointInterface*> {
   const Char* Name() const override;
 
  public:
-  OwnPtr<MountpointInterface*> operator()(UInt32 dma_low, UInt32 dma_high, SizeT dma_sz);
+  OwnPtr<IMountpoint*> operator()(UInt32 dma_low, UInt32 dma_high, SizeT dma_sz);
 
  private:
   Void (*fCleanup)(Void) = {nullptr};