diff options
Diffstat (limited to 'dev/ZKAKit/StorageKit')
| -rw-r--r-- | dev/ZKAKit/StorageKit/NVME.h | 16 | ||||
| -rw-r--r-- | dev/ZKAKit/StorageKit/StorageKit.h (renamed from dev/ZKAKit/StorageKit/Storage.h) | 0 |
2 files changed, 7 insertions, 9 deletions
diff --git a/dev/ZKAKit/StorageKit/NVME.h b/dev/ZKAKit/StorageKit/NVME.h index b2af9734..3cab60c3 100644 --- a/dev/ZKAKit/StorageKit/NVME.h +++ b/dev/ZKAKit/StorageKit/NVME.h @@ -8,29 +8,27 @@ #include <KernelKit/DeviceMgr.h> #include <KernelKit/DriveMgr.h> -#include <NewKit/OwnPtr.h> namespace Kernel { - class NVMEDeviceInterface final : public DeviceInterface<MountpointInterface*> + class NVMEDeviceInterface final ZKA_DEVICE<MountpointInterface*> { public: - explicit NVMEDeviceInterface(void (*Out)(MountpointInterface* outpacket), - void (*In)(MountpointInterface* inpacket), - void (*Cleanup)(void)); + explicit NVMEDeviceInterface(Void (*out)(MountpointInterface* out_packet), + Void (*in)(MountpointInterface* in_packet), + Void (*cleanup)(Void)); ~NVMEDeviceInterface() override; public: - NVMEDeviceInterface& operator=(const NVMEDeviceInterface&) = default; - NVMEDeviceInterface(const NVMEDeviceInterface&) = default; + ZKA_COPY_DEFAULT(NVMEDeviceInterface); const Char* Name() const override; public: - OwnPtr<MountpointInterface*> operator()(UInt32 dmaLow, UInt32 dmaHigh, SizeT sz); + OwnPtr<MountpointInterface*> operator()(UInt32 dma_low, UInt32 dma_high, SizeT dma_sz); private: - void (*fCleanup)(void) = {nullptr}; + Void (*fCleanup)(Void) = {nullptr}; }; } // namespace Kernel diff --git a/dev/ZKAKit/StorageKit/Storage.h b/dev/ZKAKit/StorageKit/StorageKit.h index 4b8b2411..4b8b2411 100644 --- a/dev/ZKAKit/StorageKit/Storage.h +++ b/dev/ZKAKit/StorageKit/StorageKit.h |