From 09dd11ddf800898c00ecb04a65fb5cd10fb481fa Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Wed, 8 May 2024 12:32:41 +0200 Subject: MHR-23: :boom: changes, reworked project tree. Signed-off-by: Amlal El Mahrouss --- Private/StorageKit/AHCI.hpp | 33 -------------------------------- Private/StorageKit/ATA.hpp | 39 -------------------------------------- Private/StorageKit/NVME.hpp | 43 ------------------------------------------ Private/StorageKit/PRDT.hpp | 36 ----------------------------------- Private/StorageKit/SCSI.hxx | 11 ----------- Private/StorageKit/Storage.hpp | 16 ---------------- 6 files changed, 178 deletions(-) delete mode 100644 Private/StorageKit/AHCI.hpp delete mode 100644 Private/StorageKit/ATA.hpp delete mode 100644 Private/StorageKit/NVME.hpp delete mode 100644 Private/StorageKit/PRDT.hpp delete mode 100644 Private/StorageKit/SCSI.hxx delete mode 100644 Private/StorageKit/Storage.hpp (limited to 'Private/StorageKit') diff --git a/Private/StorageKit/AHCI.hpp b/Private/StorageKit/AHCI.hpp deleted file mode 100644 index a792691b..00000000 --- a/Private/StorageKit/AHCI.hpp +++ /dev/null @@ -1,33 +0,0 @@ -/* ------------------------------------------- - - Copyright Mahrouss Logic - -------------------------------------------- */ - -#pragma once - -#include -#include -#include - -namespace NewOS -{ - class AHCIDeviceInterface : public DeviceInterface - { - public: - explicit AHCIDeviceInterface(void (*Out)(MountpointInterface* outpacket), - void (*In)(MountpointInterface* inpacket), - void (*Cleanup)(void)); - - virtual ~AHCIDeviceInterface(); - - public: - AHCIDeviceInterface& operator=(const AHCIDeviceInterface&) = default; - AHCIDeviceInterface(const AHCIDeviceInterface&) = default; - - const char* Name() const override; - - private: - void (*fCleanup)(void); - }; -} // namespace NewOS \ No newline at end of file diff --git a/Private/StorageKit/ATA.hpp b/Private/StorageKit/ATA.hpp deleted file mode 100644 index 98e9fbc6..00000000 --- a/Private/StorageKit/ATA.hpp +++ /dev/null @@ -1,39 +0,0 @@ -/* ------------------------------------------- - - Copyright Mahrouss Logic - -------------------------------------------- */ - -#pragma once - -#include -#include -#include -#include - -namespace NewOS -{ - /// @brief ATA device interface type. - class ATADeviceInterface : public DeviceInterface - { - public: - explicit ATADeviceInterface(void (*Out)(MountpointInterface* outpacket), - void (*In)(MountpointInterface* inpacket), - void (*Cleanup)(void)); - - virtual ~ATADeviceInterface(); - - public: - ATADeviceInterface& operator<<(MountpointInterface* Data) override; - ATADeviceInterface& operator>>(MountpointInterface* Data) override; - - public: - ATADeviceInterface& operator=(const ATADeviceInterface&) = default; - ATADeviceInterface(const ATADeviceInterface&) = default; - - const char* Name() const override; - - private: - void (*fCleanup)(void); - }; -} // namespace NewOS \ No newline at end of file diff --git a/Private/StorageKit/NVME.hpp b/Private/StorageKit/NVME.hpp deleted file mode 100644 index 7b570cf2..00000000 --- a/Private/StorageKit/NVME.hpp +++ /dev/null @@ -1,43 +0,0 @@ -/* ------------------------------------------- - - Copyright Mahrouss Logic - -------------------------------------------- */ - -#pragma once - -#include -#include -#include - -namespace NewOS -{ - class NVMEDeviceInterface : public DeviceInterface - { - public: - explicit NVMEDeviceInterface(void (*Out)(MountpointInterface* outpacket), - void (*In)(MountpointInterface* inpacket), - void (*Cleanup)(void)) - : DeviceInterface(Out, In), fCleanup(Cleanup) - { - } - - virtual ~NVMEDeviceInterface() - { - if (fCleanup) - fCleanup(); - } - - public: - NVMEDeviceInterface& operator=(const NVMEDeviceInterface&) = default; - NVMEDeviceInterface(const NVMEDeviceInterface&) = default; - - const char* Name() const override; - - public: - OwnPtr operator()(UInt32 dmaLow, UInt32 dmaHigh, SizeT sz); - - private: - void (*fCleanup)(void); - }; -} // namespace NewOS diff --git a/Private/StorageKit/PRDT.hpp b/Private/StorageKit/PRDT.hpp deleted file mode 100644 index a1dcbc4c..00000000 --- a/Private/StorageKit/PRDT.hpp +++ /dev/null @@ -1,36 +0,0 @@ -/* ------------------------------------------- - - Copyright Mahrouss Logic - -------------------------------------------- */ - -#pragma once - -#include -#include -#include - -#define kPrdtTransferSize (sizeof(NewOS::UShort)) - -namespace NewOS -{ - /// @brief Tranfer information about PRD. - enum kPRDTTransfer - { - kPRDTTransferInProgress, - kPRDTTransferIsDone, - kPRDTTransferCount, - }; - - /// @brief Physical Region Descriptor Table. - struct PRDT - { - UInt32 fPhysAddress; - UInt32 fSectorCount; - UInt8 fEndBit; - }; - - void construct_prdt(Ref& prd); - - EXTERN_C Int32 kPRDTTransferStatus; -} // namespace NewOS diff --git a/Private/StorageKit/SCSI.hxx b/Private/StorageKit/SCSI.hxx deleted file mode 100644 index 54d58cf0..00000000 --- a/Private/StorageKit/SCSI.hxx +++ /dev/null @@ -1,11 +0,0 @@ -/* ------------------------------------------- - - Copyright Mahrouss Logic - -------------------------------------------- */ - -#pragma once - -#include - -extern const scsi_packet_type kCDRomPacketTemplate; diff --git a/Private/StorageKit/Storage.hpp b/Private/StorageKit/Storage.hpp deleted file mode 100644 index 37159b50..00000000 --- a/Private/StorageKit/Storage.hpp +++ /dev/null @@ -1,16 +0,0 @@ -/* ------------------------------------------- - - Copyright Mahrouss Logic - -------------------------------------------- */ - -#pragma once - -#include -#include -#include -#include - -#define kDriveSectorSizeHDD (512) -#define kDriveSectorSizeSSD (4096) -#define kDriveSectorSizeCDROM (2048) -- cgit v1.2.3