diff options
| author | Amlal El Mahrouss <amlal.elmahrouss@icloud.com> | 2024-08-23 18:20:04 +0200 |
|---|---|---|
| committer | Amlal El Mahrouss <amlal.elmahrouss@icloud.com> | 2024-08-23 18:20:04 +0200 |
| commit | bac8c9a8306e1582ef24ba68a412a29674c97775 (patch) | |
| tree | 956155581fdb44fb6c82673a5f71a00cc6f4c89c /dev/ZBA | |
| parent | 73e0c81b5c8325db7aaec773fcc657f3ef50b0b8 (diff) | |
[IMP/WIP] AHCI disk driver for kernel DLL.
Signed-off-by: Amlal El Mahrouss <amlal.elmahrouss@icloud.com>
Diffstat (limited to 'dev/ZBA')
| -rw-r--r-- | dev/ZBA/BootKit/BootKit.hxx | 2 | ||||
| -rw-r--r-- | dev/ZBA/BootKit/Device.hxx | 2 | ||||
| -rw-r--r-- | dev/ZBA/BootKit/HW/ATA.hxx | 2 | ||||
| -rw-r--r-- | dev/ZBA/BootKit/HW/SATA.hxx | 2 | ||||
| -rw-r--r-- | dev/ZBA/BootKit/Vendor/Qr.hxx | 2 | ||||
| -rw-r--r-- | dev/ZBA/Modules/BootScr/compile_flags.txt | 2 | ||||
| -rw-r--r-- | dev/ZBA/Modules/NetBoot/compile_flags.txt | 2 | ||||
| -rw-r--r-- | dev/ZBA/Sources/HEL/AMD64/compile_flags.txt | 2 | ||||
| -rw-r--r-- | dev/ZBA/Sources/compile_flags.txt | 2 | ||||
| -rw-r--r-- | dev/ZBA/amd64-efi.make | 6 |
10 files changed, 12 insertions, 12 deletions
diff --git a/dev/ZBA/BootKit/BootKit.hxx b/dev/ZBA/BootKit/BootKit.hxx index 166eec5d..59b222c9 100644 --- a/dev/ZBA/BootKit/BootKit.hxx +++ b/dev/ZBA/BootKit/BootKit.hxx @@ -206,7 +206,7 @@ public: ~BDiskFormatFactory() = default; - NEWOS_COPY_DELETE(BDiskFormatFactory); + ZKA_COPY_DELETE(BDiskFormatFactory); /// @brief Format disk. /// @param Partition Name diff --git a/dev/ZBA/BootKit/Device.hxx b/dev/ZBA/BootKit/Device.hxx index 21955b79..dd11c78d 100644 --- a/dev/ZBA/BootKit/Device.hxx +++ b/dev/ZBA/BootKit/Device.hxx @@ -17,7 +17,7 @@ public: explicit Device() = default; virtual ~Device() = default; - NEWOS_MOVE_DEFAULT(Device); + ZKA_MOVE_DEFAULT(Device); struct Trait { diff --git a/dev/ZBA/BootKit/HW/ATA.hxx b/dev/ZBA/BootKit/HW/ATA.hxx index 2c6416f8..14ee7964 100644 --- a/dev/ZBA/BootKit/HW/ATA.hxx +++ b/dev/ZBA/BootKit/HW/ATA.hxx @@ -23,7 +23,7 @@ public: explicit BootDeviceATA() noexcept; ~BootDeviceATA() = default; - NEWOS_COPY_DEFAULT(BootDeviceATA); + ZKA_COPY_DEFAULT(BootDeviceATA); enum { diff --git a/dev/ZBA/BootKit/HW/SATA.hxx b/dev/ZBA/BootKit/HW/SATA.hxx index 4704ece4..63e40fa1 100644 --- a/dev/ZBA/BootKit/HW/SATA.hxx +++ b/dev/ZBA/BootKit/HW/SATA.hxx @@ -15,7 +15,7 @@ public: explicit BootDeviceSATA() noexcept; ~BootDeviceSATA() = default; - NEWOS_COPY_DEFAULT(BootDeviceSATA); + ZKA_COPY_DEFAULT(BootDeviceSATA); struct SATATrait final { diff --git a/dev/ZBA/BootKit/Vendor/Qr.hxx b/dev/ZBA/BootKit/Vendor/Qr.hxx index e7d82547..a2af4367 100644 --- a/dev/ZBA/BootKit/Vendor/Qr.hxx +++ b/dev/ZBA/BootKit/Vendor/Qr.hxx @@ -963,7 +963,7 @@ namespace qr explicit QrDelegate() = default; ~QrDelegate() = default; - NEWOS_COPY_DEFAULT(QrDelegate); + ZKA_COPY_DEFAULT(QrDelegate); /// @brief Draw method delegate. template <int V> diff --git a/dev/ZBA/Modules/BootScr/compile_flags.txt b/dev/ZBA/Modules/BootScr/compile_flags.txt index 18bc8512..6ab76da0 100644 --- a/dev/ZBA/Modules/BootScr/compile_flags.txt +++ b/dev/ZBA/Modules/BootScr/compile_flags.txt @@ -5,4 +5,4 @@ -D__ZKA_AMD64__ -std=c++20 -D__x86_64__ --D__NEWOS_OTA__ +-D__ZKA_OTA__ diff --git a/dev/ZBA/Modules/NetBoot/compile_flags.txt b/dev/ZBA/Modules/NetBoot/compile_flags.txt index 18bc8512..6ab76da0 100644 --- a/dev/ZBA/Modules/NetBoot/compile_flags.txt +++ b/dev/ZBA/Modules/NetBoot/compile_flags.txt @@ -5,4 +5,4 @@ -D__ZKA_AMD64__ -std=c++20 -D__x86_64__ --D__NEWOS_OTA__ +-D__ZKA_OTA__ diff --git a/dev/ZBA/Sources/HEL/AMD64/compile_flags.txt b/dev/ZBA/Sources/HEL/AMD64/compile_flags.txt index cc79d229..5b5d895a 100644 --- a/dev/ZBA/Sources/HEL/AMD64/compile_flags.txt +++ b/dev/ZBA/Sources/HEL/AMD64/compile_flags.txt @@ -4,4 +4,4 @@ -D__ZKA_AMD64__ -std=c++20 -D__x86_64__ --D__NEWOS_OTA__ +-D__ZKA_OTA__ diff --git a/dev/ZBA/Sources/compile_flags.txt b/dev/ZBA/Sources/compile_flags.txt index 18bc8512..6ab76da0 100644 --- a/dev/ZBA/Sources/compile_flags.txt +++ b/dev/ZBA/Sources/compile_flags.txt @@ -5,4 +5,4 @@ -D__ZKA_AMD64__ -std=c++20 -D__x86_64__ --D__NEWOS_OTA__ +-D__ZKA_OTA__ diff --git a/dev/ZBA/amd64-efi.make b/dev/ZBA/amd64-efi.make index aaaa1222..ef54c12c 100644 --- a/dev/ZBA/amd64-efi.make +++ b/dev/ZBA/amd64-efi.make @@ -21,7 +21,7 @@ EMU=qemu-system-x86_64 endif ifeq ($(NEWS_MODEL), ) -NEWOS_MODEL=-DkMachineModel="\"ZKA SSD\"" +ZKA_MODEL=-DkMachineModel="\"ZKA SSD\"" endif BIOS=OVMF.fd @@ -32,7 +32,7 @@ IMG_3=epm-master-2.img EMU_FLAGS=-net none -smp 4 -m 8G -M q35 \ -bios $(BIOS) -device piix3-ide,id=ide \ -drive id=disk,file=$(IMG),format=raw,if=none \ - -device ide-hd,drive=disk,bus=ide.0 -drive \ + -device ide-hd,drive=disk,bus=ide.0 -hdd $(IMG_2) -drive \ file=fat:rw:Sources/Root/,index=2,format=raw -d int LD_FLAGS=-e Main --subsystem=10 @@ -79,7 +79,7 @@ endif .PHONY: compile-amd64 compile-amd64: $(RESCMD) - $(CC_GNU) $(NEWOS_MODEL) $(STANDALONE_MACRO) $(FLAG_GNU) $(DEBUG) \ + $(CC_GNU) $(ZKA_MODEL) $(STANDALONE_MACRO) $(FLAG_GNU) $(DEBUG) \ $(wildcard Sources/HEL/AMD64/*.cxx) \ $(wildcard Sources/HEL/AMD64/*.S) \ $(wildcard Sources/*.cxx) |
