diff options
| -rw-r--r-- | CODEOWNERS | 5 | ||||
| -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 | ||||
| -rw-r--r-- | dev/ZKAKit/src/Storage/NVMEDeviceInterface.cc | 8 | ||||
| -rw-r--r-- | zka-dev.files | 2 |
5 files changed, 14 insertions, 17 deletions
@@ -1,5 +1,4 @@ -# ZBA and ZKA are owned by Amlal.
+# ZBA, SCI and ZKA are owned by Amlal.
/dev/ZKAKit/ @Amlal-ElMahrouss
/dev/ZBAKit/ @Amlal-ElMahrouss
-
-# SCI is led by none.
+/dev/SCIKit/ @Amlal-ElMahrouss
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 diff --git a/dev/ZKAKit/src/Storage/NVMEDeviceInterface.cc b/dev/ZKAKit/src/Storage/NVMEDeviceInterface.cc index 5e5f9160..89ce4fb2 100644 --- a/dev/ZKAKit/src/Storage/NVMEDeviceInterface.cc +++ b/dev/ZKAKit/src/Storage/NVMEDeviceInterface.cc @@ -8,10 +8,10 @@ namespace Kernel { - NVMEDeviceInterface::NVMEDeviceInterface(void (*Out)(MountpointInterface* outpacket), - void (*In)(MountpointInterface* inpacket), - void (*Cleanup)(void)) - : DeviceInterface(Out, In), fCleanup(Cleanup) + NVMEDeviceInterface::NVMEDeviceInterface(void (*out)(MountpointInterface* outpacket), + void (*in)(MountpointInterface* inpacket), + void (*cleanup)(void)) + : DeviceInterface(out, in), fCleanup(cleanup) { } diff --git a/zka-dev.files b/zka-dev.files index 7d43859f..adbcd33e 100644 --- a/zka-dev.files +++ b/zka-dev.files @@ -260,7 +260,7 @@ dev/ZKAKit/StorageKit/ATA.h dev/ZKAKit/StorageKit/NVME.h dev/ZKAKit/StorageKit/PRDT.h dev/ZKAKit/StorageKit/SCSI.h -dev/ZKAKit/StorageKit/Storage.h +dev/ZKAKit/StorageKit/StorageKit.h dev/ZKAKit/amd64-efi.make dev/ZKAKit/arm64-efi.make dev/ZKAKit/doc/Explicit Partition Map.pdf |