diff options
Diffstat (limited to 'dev/Boot/BootKit')
| -rw-r--r-- | dev/Boot/BootKit/BootKit.h | 4 | ||||
| -rw-r--r-- | dev/Boot/BootKit/Device.h | 2 | ||||
| -rw-r--r-- | dev/Boot/BootKit/HW/ATA.h | 2 | ||||
| -rw-r--r-- | dev/Boot/BootKit/HW/SATA.h | 2 | ||||
| -rw-r--r-- | dev/Boot/BootKit/Rsrc/zka_disk.rsrc | 4 | ||||
| -rw-r--r-- | dev/Boot/BootKit/Rsrc/zka_has_disk.rsrc | 4 | ||||
| -rw-r--r-- | dev/Boot/BootKit/Rsrc/zka_no_disk.rsrc | 4 |
7 files changed, 11 insertions, 11 deletions
diff --git a/dev/Boot/BootKit/BootKit.h b/dev/Boot/BootKit/BootKit.h index 5a537448..81f0796a 100644 --- a/dev/Boot/BootKit/BootKit.h +++ b/dev/Boot/BootKit/BootKit.h @@ -218,7 +218,7 @@ namespace Boot ~BDiskFormatFactory() = default; - ZKA_COPY_DELETE(BDiskFormatFactory); + NE_COPY_DELETE(BDiskFormatFactory); /// @brief Format disk using partition name and blob_list. /// @param Partition part_name the target partition name. @@ -332,7 +332,7 @@ namespace Boot { fb_init(); - FBDrawBitMapInRegion(zka_no_disk, ZKA_NO_DISK_WIDTH, ZKA_NO_DISK_HEIGHT, (kHandoverHeader->f_GOP.f_Width - ZKA_NO_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - ZKA_NO_DISK_HEIGHT) / 2); + FBDrawBitMapInRegion(zka_no_disk, NE_NO_DISK_WIDTH, NE_NO_DISK_HEIGHT, (kHandoverHeader->f_GOP.f_Width - NE_NO_DISK_WIDTH) / 2, (kHandoverHeader->f_GOP.f_Height - NE_NO_DISK_HEIGHT) / 2); EFI::ThrowError(L"Drive-Too-Tiny", L"Can't format a NeFS partition here."); return false; } diff --git a/dev/Boot/BootKit/Device.h b/dev/Boot/BootKit/Device.h index bbb0ce89..753d9d35 100644 --- a/dev/Boot/BootKit/Device.h +++ b/dev/Boot/BootKit/Device.h @@ -18,7 +18,7 @@ public: explicit Device() = default; virtual ~Device() = default; - ZKA_MOVE_DEFAULT(Device); + NE_MOVE_DEFAULT(Device); struct Trait { diff --git a/dev/Boot/BootKit/HW/ATA.h b/dev/Boot/BootKit/HW/ATA.h index c58bbd61..397f96b4 100644 --- a/dev/Boot/BootKit/HW/ATA.h +++ b/dev/Boot/BootKit/HW/ATA.h @@ -23,7 +23,7 @@ public: explicit BootDeviceATA() noexcept; ~BootDeviceATA() = default; - ZKA_COPY_DELETE(BootDeviceATA); + NE_COPY_DELETE(BootDeviceATA); enum { diff --git a/dev/Boot/BootKit/HW/SATA.h b/dev/Boot/BootKit/HW/SATA.h index a7ece124..1f1d70a2 100644 --- a/dev/Boot/BootKit/HW/SATA.h +++ b/dev/Boot/BootKit/HW/SATA.h @@ -15,7 +15,7 @@ public: explicit BootDeviceSATA() noexcept; ~BootDeviceSATA() = default; - ZKA_COPY_DEFAULT(BootDeviceSATA); + NE_COPY_DEFAULT(BootDeviceSATA); struct SATATrait final { diff --git a/dev/Boot/BootKit/Rsrc/zka_disk.rsrc b/dev/Boot/BootKit/Rsrc/zka_disk.rsrc index ce980b7b..61fd48dd 100644 --- a/dev/Boot/BootKit/Rsrc/zka_disk.rsrc +++ b/dev/Boot/BootKit/Rsrc/zka_disk.rsrc @@ -1,5 +1,5 @@ -#define ZKA_DISK_HEIGHT 110
-#define ZKA_DISK_WIDTH 110
+#define NE_DISK_HEIGHT 110
+#define NE_DISK_WIDTH 110
// array size is 36300
static const unsigned int zka_disk[] = {
diff --git a/dev/Boot/BootKit/Rsrc/zka_has_disk.rsrc b/dev/Boot/BootKit/Rsrc/zka_has_disk.rsrc index bdc0bb99..4ede8a65 100644 --- a/dev/Boot/BootKit/Rsrc/zka_has_disk.rsrc +++ b/dev/Boot/BootKit/Rsrc/zka_has_disk.rsrc @@ -1,5 +1,5 @@ -#define ZKA_HAS_DISK_HEIGHT 110
-#define ZKA_HAS_DISK_WIDTH 110
+#define NE_HAS_DISK_HEIGHT 110
+#define NE_HAS_DISK_WIDTH 110
// array size is 36300
static const unsigned int zka_has_disk[] = {
diff --git a/dev/Boot/BootKit/Rsrc/zka_no_disk.rsrc b/dev/Boot/BootKit/Rsrc/zka_no_disk.rsrc index 31689e63..f89abad0 100644 --- a/dev/Boot/BootKit/Rsrc/zka_no_disk.rsrc +++ b/dev/Boot/BootKit/Rsrc/zka_no_disk.rsrc @@ -1,5 +1,5 @@ -#define ZKA_NO_DISK_HEIGHT 110 -#define ZKA_NO_DISK_WIDTH 110 +#define NE_NO_DISK_HEIGHT 110 +#define NE_NO_DISK_WIDTH 110 // array size is 36300 static const unsigned int zka_no_disk[] = { |