diff options
Diffstat (limited to 'dev')
| -rw-r--r-- | dev/Boot/BootKit/BitManip.h (renamed from dev/BootLoader/BootKit/BitManip.h) | 0 | ||||
| -rw-r--r-- | dev/Boot/BootKit/BootKit.h (renamed from dev/BootLoader/BootKit/BootKit.h) | 4 | ||||
| -rw-r--r-- | dev/Boot/BootKit/Device.h (renamed from dev/BootLoader/BootKit/Device.h) | 4 | ||||
| -rw-r--r-- | dev/Boot/BootKit/EPM.h (renamed from dev/BootLoader/BootKit/EPM.h) | 0 | ||||
| -rw-r--r-- | dev/Boot/BootKit/HW/ATA.h (renamed from dev/BootLoader/BootKit/HW/ATA.h) | 2 | ||||
| -rw-r--r-- | dev/Boot/BootKit/HW/SATA.h (renamed from dev/BootLoader/BootKit/HW/SATA.h) | 2 | ||||
| -rw-r--r-- | dev/Boot/BootKit/Platform.h (renamed from dev/BootLoader/BootKit/Platform.h) | 0 | ||||
| -rw-r--r-- | dev/Boot/BootKit/Protocol.h (renamed from dev/BootLoader/BootKit/Protocol.h) | 0 | ||||
| -rw-r--r-- | dev/Boot/BootKit/Rsrc/zka_disk.rsrc (renamed from dev/BootLoader/BootKit/Rsrc/zka_disk.rsrc) | 0 | ||||
| -rw-r--r-- | dev/Boot/BootKit/Rsrc/zka_has_disk.rsrc (renamed from dev/BootLoader/BootKit/Rsrc/zka_has_disk.rsrc) | 0 | ||||
| -rw-r--r-- | dev/Boot/BootKit/Rsrc/zka_no_disk.rsrc (renamed from dev/BootLoader/BootKit/Rsrc/zka_no_disk.rsrc) | 0 | ||||
| -rw-r--r-- | dev/Boot/BootKit/Support.h (renamed from dev/BootLoader/BootKit/Support.h) | 0 | ||||
| -rw-r--r-- | dev/Boot/BootKit/Thread.h (renamed from dev/BootLoader/BootKit/Thread.h) | 0 | ||||
| -rw-r--r-- | dev/Boot/DownloadOVMF.ps1 (renamed from dev/BootLoader/DownloadOVMF.ps1) | 0 | ||||
| -rw-r--r-- | dev/Boot/Modules/.keep (renamed from dev/BootLoader/Modules/.keep) | 0 | ||||
| -rw-r--r-- | dev/Boot/Modules/NetBoot/.hgkeep (renamed from dev/BootLoader/Modules/NetBoot/.hgkeep) | 0 | ||||
| -rw-r--r-- | dev/Boot/Modules/NetBoot/Boot.S (renamed from dev/BootLoader/Modules/NetBoot/Boot.S) | 0 | ||||
| -rw-r--r-- | dev/Boot/Modules/NetBoot/Module.cc (renamed from dev/BootLoader/Modules/NetBoot/Module.cc) | 0 | ||||
| -rw-r--r-- | dev/Boot/Modules/NetBoot/NetBoot.h (renamed from dev/BootLoader/Modules/NetBoot/NetBoot.h) | 0 | ||||
| -rw-r--r-- | dev/Boot/Modules/NetBoot/build.json (renamed from dev/BootLoader/Modules/NetBoot/build.json) | 0 | ||||
| -rw-r--r-- | dev/Boot/Modules/SysChk/.hgkeep (renamed from dev/BootLoader/Modules/SysChk/.hgkeep) | 0 | ||||
| -rw-r--r-- | dev/Boot/Modules/SysChk/Boot.S (renamed from dev/BootLoader/Modules/SysChk/Boot.S) | 0 | ||||
| -rw-r--r-- | dev/Boot/Modules/SysChk/Module.cc (renamed from dev/BootLoader/Modules/SysChk/Module.cc) | 6 | ||||
| -rw-r--r-- | dev/Boot/Modules/SysChk/build.json (renamed from dev/BootLoader/Modules/SysChk/build.json) | 0 | ||||
| -rw-r--r-- | dev/Boot/ReadMe.md (renamed from dev/BootLoader/ReadMe.md) | 0 | ||||
| -rw-r--r-- | dev/Boot/amd64-efi.make (renamed from dev/BootLoader/amd64-efi.make) | 6 | ||||
| -rw-r--r-- | dev/Boot/arm64-efi.make (renamed from dev/BootLoader/arm64-efi.make) | 0 | ||||
| -rw-r--r-- | dev/Boot/src/.gitkeep (renamed from dev/BootLoader/src/.gitkeep) | 0 | ||||
| -rw-r--r-- | dev/Boot/src/BootFileReader.cc (renamed from dev/BootLoader/src/BootFileReader.cc) | 2 | ||||
| -rw-r--r-- | dev/Boot/src/BootString.cc (renamed from dev/BootLoader/src/BootString.cc) | 0 | ||||
| -rw-r--r-- | dev/Boot/src/BootSupport.cc (renamed from dev/BootLoader/src/BootSupport.cc) | 0 | ||||
| -rw-r--r-- | dev/Boot/src/BootTextWriter.cc (renamed from dev/BootLoader/src/BootTextWriter.cc) | 0 | ||||
| -rw-r--r-- | dev/Boot/src/BootThread.cc (renamed from dev/BootLoader/src/BootThread.cc) | 2 | ||||
| -rw-r--r-- | dev/Boot/src/BootloaderRsrc.rsrc (renamed from dev/BootLoader/src/BootloaderRsrc.rsrc) | 0 | ||||
| -rw-r--r-- | dev/Boot/src/HEL/64X000/.gitkeep (renamed from dev/BootLoader/src/HEL/64X000/.gitkeep) | 0 | ||||
| -rw-r--r-- | dev/Boot/src/HEL/64X000/Boot64x0.S (renamed from dev/BootLoader/src/HEL/64X000/Boot64x0.S) | 0 | ||||
| -rw-r--r-- | dev/Boot/src/HEL/AMD64/.gitkeep (renamed from dev/BootLoader/src/HEL/AMD64/.gitkeep) | 0 | ||||
| -rw-r--r-- | dev/Boot/src/HEL/AMD64/BootAPI.S (renamed from dev/BootLoader/src/HEL/AMD64/BootAPI.S) | 0 | ||||
| -rw-r--r-- | dev/Boot/src/HEL/AMD64/BootATA.cc (renamed from dev/BootLoader/src/HEL/AMD64/BootATA.cc) | 0 | ||||
| -rw-r--r-- | dev/Boot/src/HEL/AMD64/BootMain.cc (renamed from dev/BootLoader/src/HEL/AMD64/BootMain.cc) | 6 | ||||
| -rw-r--r-- | dev/Boot/src/HEL/AMD64/BootPlatform.cc (renamed from dev/BootLoader/src/HEL/AMD64/BootPlatform.cc) | 0 | ||||
| -rw-r--r-- | dev/Boot/src/HEL/AMD64/BootSATA.cc (renamed from dev/BootLoader/src/HEL/AMD64/BootSATA.cc) | 0 | ||||
| -rw-r--r-- | dev/Boot/src/HEL/ARM64/.gitkeep (renamed from dev/BootLoader/src/HEL/ARM64/.gitkeep) | 0 | ||||
| -rw-r--r-- | dev/Boot/src/HEL/ARM64/BootAPI.S (renamed from dev/BootLoader/src/HEL/ARM64/BootAPI.S) | 0 | ||||
| -rw-r--r-- | dev/Boot/src/HEL/ARM64/BootMain.cc (renamed from dev/BootLoader/src/HEL/ARM64/BootMain.cc) | 0 | ||||
| -rw-r--r-- | dev/Boot/src/HEL/ARM64/BootPlatform.cc (renamed from dev/BootLoader/src/HEL/ARM64/BootPlatform.cc) | 0 | ||||
| -rw-r--r-- | dev/Boot/src/HEL/POWER/.gitkeep (renamed from dev/BootLoader/src/HEL/POWER/.gitkeep) | 0 | ||||
| -rw-r--r-- | dev/Boot/src/HEL/POWER/CoreBootStartup.S (renamed from dev/BootLoader/src/HEL/POWER/CoreBootStartup.S) | 0 | ||||
| -rw-r--r-- | dev/Boot/src/New+Delete.cc (renamed from dev/BootLoader/src/New+Delete.cc) | 0 | ||||
| -rw-r--r-- | dev/Boot/src/Root/EFI/STARTUP.NSH (renamed from dev/BootLoader/src/Root/EFI/STARTUP.NSH) | 0 | ||||
| -rw-r--r-- | dev/Boot/src/Root/zka/fntkrnl.ttf (renamed from dev/BootLoader/src/Root/zka/fntkrnl.ttf) | bin | 42752 -> 42752 bytes | |||
| -rw-r--r-- | dev/Hints/CompilerHint.h (renamed from dev/HintKit/CompilerHint.h) | 0 | ||||
| -rw-r--r-- | dev/Kernel/FSKit/NeFS.h | 4 | ||||
| -rw-r--r-- | dev/Kernel/FirmwareKit/EFI/API.h | 2 | ||||
| -rw-r--r-- | dev/Kernel/HALKit/AMD64/HalACPIFactoryInterface.cc | 2 | ||||
| -rw-r--r-- | dev/Kernel/HALKit/AMD64/HalAPICController.cc | 2 | ||||
| -rw-r--r-- | dev/Kernel/HALKit/AMD64/HalCoreScheduler.cc | 4 | ||||
| -rw-r--r-- | dev/Kernel/HALKit/AMD64/HalKernelMain.cc | 4 | ||||
| -rw-r--r-- | dev/Kernel/HALKit/AMD64/HalTimerAMD64.cc | 2 | ||||
| -rw-r--r-- | dev/Kernel/HALKit/AMD64/MBCI/HalMBCI.cc | 2 | ||||
| -rw-r--r-- | dev/Kernel/HALKit/AMD64/Storage/AHCI-DMA.cc | 4 | ||||
| -rw-r--r-- | dev/Kernel/HALKit/AMD64/Storage/ATA-DMA.cc | 2 | ||||
| -rw-r--r-- | dev/Kernel/HALKit/AMD64/Storage/ATA-PIO.cc | 2 | ||||
| -rw-r--r-- | dev/Kernel/HALKit/ARM64/APM/APM.cc | 2 | ||||
| -rw-r--r-- | dev/Kernel/HALKit/ARM64/HalACPIFactoryInterface.cc | 4 | ||||
| -rw-r--r-- | dev/Kernel/HALKit/ARM64/HalCoreMPScheduler.cc | 2 | ||||
| -rw-r--r-- | dev/Kernel/HALKit/ARM64/HalKernelMain.cc | 4 | ||||
| -rw-r--r-- | dev/Kernel/KernelKit/FileMgr.h | 2 | ||||
| -rw-r--r-- | dev/Kernel/KernelKit/Heap.h | 2 | ||||
| -rw-r--r-- | dev/Kernel/KernelKit/LoaderInterface.h | 2 | ||||
| -rw-r--r-- | dev/Kernel/NetworkKit/IPC.h | 3 | ||||
| -rw-r--r-- | dev/Kernel/NewKit/SwapMgr.h | 14 | ||||
| -rw-r--r-- | dev/Kernel/StorageKit/SCSI.h | 2 | ||||
| -rw-r--r-- | dev/Kernel/src/ACPIFactoryInterface.cc | 2 | ||||
| -rw-r--r-- | dev/Kernel/src/DriveMgr.cc | 6 | ||||
| -rw-r--r-- | dev/Kernel/src/FS/HPFS.cc | 6 | ||||
| -rw-r--r-- | dev/Kernel/src/FS/NeFS.cc | 6 | ||||
| -rw-r--r-- | dev/Kernel/src/KernelPanic.cc | 4 | ||||
| -rw-r--r-- | dev/LibSCI/CompilerHint.h (renamed from dev/SCIKit/CompilerHint.h) | 0 | ||||
| -rw-r--r-- | dev/LibSCI/GPU.h (renamed from dev/SCIKit/GPU.h) | 2 | ||||
| -rw-r--r-- | dev/LibSCI/LPC.h (renamed from dev/SCIKit/LPC.h) | 0 | ||||
| -rw-r--r-- | dev/LibSCI/Macros.h (renamed from dev/SCIKit/Macros.h) | 4 | ||||
| -rw-r--r-- | dev/LibSCI/SCI.h (renamed from dev/SCIKit/SCI.h) | 2 | ||||
| -rw-r--r-- | dev/LibSCI/SysCalls.h (renamed from dev/SCIKit/SysCalls.h) | 2 | ||||
| -rw-r--r-- | dev/LibSCI/doc/SCIKit.drawio (renamed from dev/SCIKit/doc/SCIKit.drawio) | 4 | ||||
| -rw-r--r-- | dev/LibSCI/sci.json (renamed from dev/SCIKit/sci.json) | 2 | ||||
| -rw-r--r-- | dev/LibSCI/src/GPU.cc (renamed from dev/SCIKit/src/GPU.cc) | 0 | ||||
| -rw-r--r-- | dev/LibSCI/src/LPC.cc (renamed from dev/SCIKit/src/LPC.cc) | 0 | ||||
| -rw-r--r-- | dev/LibSCI/src/LibSCI+IO.asm (renamed from dev/SCIKit/src/SCI+IO.asm) | 2 | ||||
| -rw-r--r-- | dev/LibSCI/src/Makefile (renamed from dev/SCIKit/src/Makefile) | 2 | ||||
| -rw-r--r-- | dev/LibSCI/src/SCI.cc (renamed from dev/SCIKit/src/SCI.cc) | 6 | ||||
| -rw-r--r-- | dev/Mod/ACPI/ACPI.h (renamed from dev/Modules/ACPI/ACPI.h) | 0 | ||||
| -rw-r--r-- | dev/Mod/ACPI/ACPIFactoryInterface.h (renamed from dev/Modules/ACPI/ACPIFactoryInterface.h) | 2 | ||||
| -rw-r--r-- | dev/Mod/AHCI/.gitkeep (renamed from dev/Modules/AHCI/.gitkeep) | 0 | ||||
| -rw-r--r-- | dev/Mod/AHCI/AHCI.h (renamed from dev/Modules/AHCI/AHCI.h) | 2 | ||||
| -rw-r--r-- | dev/Mod/APM/APM.h (renamed from dev/Modules/APM/APM.h) | 0 | ||||
| -rw-r--r-- | dev/Mod/ATA/ATA.h (renamed from dev/Modules/ATA/ATA.h) | 0 | ||||
| -rw-r--r-- | dev/Mod/Flash/Flash.h (renamed from dev/Modules/Flash/Flash.h) | 0 | ||||
| -rw-r--r-- | dev/Mod/GPRS/.keepme (renamed from dev/Modules/GPRS/.keepme) | 0 | ||||
| -rw-r--r-- | dev/Mod/GfxMgr/AccessibilityMgr.h (renamed from dev/Modules/GfxMgr/AccessibilityMgr.h) | 10 | ||||
| -rw-r--r-- | dev/Mod/GfxMgr/FBMgr.h (renamed from dev/Modules/GfxMgr/FBMgr.h) | 2 | ||||
| -rw-r--r-- | dev/Mod/GfxMgr/MathMgr.h (renamed from dev/Modules/GfxMgr/MathMgr.h) | 2 | ||||
| -rw-r--r-- | dev/Mod/GfxMgr/TextMgr.h (renamed from dev/Modules/GfxMgr/TextMgr.h) | 2 | ||||
| -rw-r--r-- | dev/Mod/HPET/.gitkeep (renamed from dev/Modules/HPET/.gitkeep) | 0 | ||||
| -rw-r--r-- | dev/Mod/HPET/Defines.h (renamed from dev/Modules/HPET/Defines.h) | 2 | ||||
| -rw-r--r-- | dev/Mod/IEEE802/.gitkeep (renamed from dev/Modules/IEEE802/.gitkeep) | 0 | ||||
| -rw-r--r-- | dev/Mod/LTE/LTE.h (renamed from dev/Modules/LTE/LTE.h) | 0 | ||||
| -rw-r--r-- | dev/Mod/MBCI/Interface.h (renamed from dev/Modules/MBCI/Interface.h) | 2 | ||||
| -rw-r--r-- | dev/Mod/MBCI/MBCI.h (renamed from dev/Modules/MBCI/MBCI.h) | 2 | ||||
| -rw-r--r-- | dev/Mod/NVME/NVME.h (renamed from dev/Modules/NVME/NVME.h) | 0 | ||||
| -rw-r--r-- | dev/Mod/OHCI/.gitkeep (renamed from dev/Modules/OHCI/.gitkeep) | 0 | ||||
| -rw-r--r-- | dev/Mod/ReadMe.md (renamed from dev/Modules/ReadMe.md) | 2 | ||||
| -rw-r--r-- | dev/Mod/SCSI/.gitkeep (renamed from dev/Modules/SCSI/.gitkeep) | 0 | ||||
| -rw-r--r-- | dev/Mod/SCSI/SCSI.h (renamed from dev/Modules/SCSI/SCSI.h) | 0 | ||||
| -rw-r--r-- | dev/Mod/WiFi/.gitkeep (renamed from dev/Modules/WiFi/.gitkeep) | 0 | ||||
| -rw-r--r-- | dev/Mod/XHCI/.gitkeep (renamed from dev/Modules/XHCI/.gitkeep) | 0 | ||||
| -rw-r--r-- | dev/Mod/XHCI/Defines.h (renamed from dev/Modules/XHCI/Defines.h) | 0 | ||||
| -rw-r--r-- | dev/Modules/GfxMgr/Rsrc/Controls.rsrc | 61 | ||||
| -rw-r--r-- | dev/Modules/GfxMgr/Rsrc/Cursor.rsrc | 64 | ||||
| -rw-r--r-- | dev/Usr/.keepme | 0 | ||||
| -rw-r--r-- | dev/Usr/External/.gitkeep | 0 | ||||
| -rw-r--r-- | dev/Usr/LibCompress/API.h (renamed from dev/CompressKit/API.h) | 4 | ||||
| -rw-r--r-- | dev/Usr/LibCompress/LCCompress.s (renamed from dev/CompressKit/CKCompress.s) | 0 | ||||
| -rw-r--r-- | dev/Usr/LibCompress/LCDecompress.s (renamed from dev/CompressKit/CKDecompress.s) | 0 | ||||
| -rw-r--r-- | dev/Usr/LibGUI/.keepme | 0 | ||||
| -rw-r--r-- | dev/Usr/LibSystem/.keepme | 0 |
126 files changed, 96 insertions, 212 deletions
diff --git a/dev/BootLoader/BootKit/BitManip.h b/dev/Boot/BootKit/BitManip.h index 3b5ea540..3b5ea540 100644 --- a/dev/BootLoader/BootKit/BitManip.h +++ b/dev/Boot/BootKit/BitManip.h diff --git a/dev/BootLoader/BootKit/BootKit.h b/dev/Boot/BootKit/BootKit.h index 2e0099f2..ab216249 100644 --- a/dev/BootLoader/BootKit/BootKit.h +++ b/dev/Boot/BootKit/BootKit.h @@ -14,7 +14,7 @@ #include <BootKit/HW/ATA.h> #include <FirmwareKit/EPM.h> #include <CompilerKit/Version.h> -#include <Modules/GfxMgr/FBMgr.h> +#include <Mod/GfxMgr/FBMgr.h> #include <BootKit/Rsrc/zka_disk.rsrc> #include <BootKit/Rsrc/zka_no_disk.rsrc> #include <BootKit/Rsrc/zka_has_disk.rsrc> @@ -29,7 +29,7 @@ /***********************************************************************************/ #include <NewKit/Defines.h> -#include <Modules/ATA/ATA.h> +#include <Mod/ATA/ATA.h> #include <FirmwareKit/EFI.h> diff --git a/dev/BootLoader/BootKit/Device.h b/dev/Boot/BootKit/Device.h index 03e913bd..df498e74 100644 --- a/dev/BootLoader/BootKit/Device.h +++ b/dev/Boot/BootKit/Device.h @@ -6,8 +6,8 @@ #pragma once -#include <Modules/ATA/ATA.h> -#include <Modules/AHCI/AHCI.h> +#include <Mod/ATA/ATA.h> +#include <Mod/AHCI/AHCI.h> using namespace Kernel; diff --git a/dev/BootLoader/BootKit/EPM.h b/dev/Boot/BootKit/EPM.h index 1956144e..1956144e 100644 --- a/dev/BootLoader/BootKit/EPM.h +++ b/dev/Boot/BootKit/EPM.h diff --git a/dev/BootLoader/BootKit/HW/ATA.h b/dev/Boot/BootKit/HW/ATA.h index 79a19886..e14e8303 100644 --- a/dev/BootLoader/BootKit/HW/ATA.h +++ b/dev/Boot/BootKit/HW/ATA.h @@ -6,7 +6,7 @@ #pragma once -#include <Modules/ATA/ATA.h> +#include <Mod/ATA/ATA.h> #include <BootKit/Device.h> using namespace Kernel; diff --git a/dev/BootLoader/BootKit/HW/SATA.h b/dev/Boot/BootKit/HW/SATA.h index 0b6dd92b..3a849d66 100644 --- a/dev/BootLoader/BootKit/HW/SATA.h +++ b/dev/Boot/BootKit/HW/SATA.h @@ -7,7 +7,7 @@ #pragma once #include <CompilerKit/CompilerKit.h> -#include <Modules/AHCI/AHCI.h> +#include <Mod/AHCI/AHCI.h> class BootDeviceSATA final { diff --git a/dev/BootLoader/BootKit/Platform.h b/dev/Boot/BootKit/Platform.h index c8bb5058..c8bb5058 100644 --- a/dev/BootLoader/BootKit/Platform.h +++ b/dev/Boot/BootKit/Platform.h diff --git a/dev/BootLoader/BootKit/Protocol.h b/dev/Boot/BootKit/Protocol.h index 618885fe..618885fe 100644 --- a/dev/BootLoader/BootKit/Protocol.h +++ b/dev/Boot/BootKit/Protocol.h diff --git a/dev/BootLoader/BootKit/Rsrc/zka_disk.rsrc b/dev/Boot/BootKit/Rsrc/zka_disk.rsrc index ce980b7b..ce980b7b 100644 --- a/dev/BootLoader/BootKit/Rsrc/zka_disk.rsrc +++ b/dev/Boot/BootKit/Rsrc/zka_disk.rsrc diff --git a/dev/BootLoader/BootKit/Rsrc/zka_has_disk.rsrc b/dev/Boot/BootKit/Rsrc/zka_has_disk.rsrc index bdc0bb99..bdc0bb99 100644 --- a/dev/BootLoader/BootKit/Rsrc/zka_has_disk.rsrc +++ b/dev/Boot/BootKit/Rsrc/zka_has_disk.rsrc diff --git a/dev/BootLoader/BootKit/Rsrc/zka_no_disk.rsrc b/dev/Boot/BootKit/Rsrc/zka_no_disk.rsrc index 31689e63..31689e63 100644 --- a/dev/BootLoader/BootKit/Rsrc/zka_no_disk.rsrc +++ b/dev/Boot/BootKit/Rsrc/zka_no_disk.rsrc diff --git a/dev/BootLoader/BootKit/Support.h b/dev/Boot/BootKit/Support.h index a57782e3..a57782e3 100644 --- a/dev/BootLoader/BootKit/Support.h +++ b/dev/Boot/BootKit/Support.h diff --git a/dev/BootLoader/BootKit/Thread.h b/dev/Boot/BootKit/Thread.h index 42991d17..42991d17 100644 --- a/dev/BootLoader/BootKit/Thread.h +++ b/dev/Boot/BootKit/Thread.h diff --git a/dev/BootLoader/DownloadOVMF.ps1 b/dev/Boot/DownloadOVMF.ps1 index 5a2c5f0e..5a2c5f0e 100644 --- a/dev/BootLoader/DownloadOVMF.ps1 +++ b/dev/Boot/DownloadOVMF.ps1 diff --git a/dev/BootLoader/Modules/.keep b/dev/Boot/Modules/.keep index e69de29b..e69de29b 100644 --- a/dev/BootLoader/Modules/.keep +++ b/dev/Boot/Modules/.keep diff --git a/dev/BootLoader/Modules/NetBoot/.hgkeep b/dev/Boot/Modules/NetBoot/.hgkeep index e69de29b..e69de29b 100644 --- a/dev/BootLoader/Modules/NetBoot/.hgkeep +++ b/dev/Boot/Modules/NetBoot/.hgkeep diff --git a/dev/BootLoader/Modules/NetBoot/Boot.S b/dev/Boot/Modules/NetBoot/Boot.S index 0527e509..0527e509 100644 --- a/dev/BootLoader/Modules/NetBoot/Boot.S +++ b/dev/Boot/Modules/NetBoot/Boot.S diff --git a/dev/BootLoader/Modules/NetBoot/Module.cc b/dev/Boot/Modules/NetBoot/Module.cc index 6277da70..6277da70 100644 --- a/dev/BootLoader/Modules/NetBoot/Module.cc +++ b/dev/Boot/Modules/NetBoot/Module.cc diff --git a/dev/BootLoader/Modules/NetBoot/NetBoot.h b/dev/Boot/Modules/NetBoot/NetBoot.h index cdfe17f9..cdfe17f9 100644 --- a/dev/BootLoader/Modules/NetBoot/NetBoot.h +++ b/dev/Boot/Modules/NetBoot/NetBoot.h diff --git a/dev/BootLoader/Modules/NetBoot/build.json b/dev/Boot/Modules/NetBoot/build.json index 9df27b3c..9df27b3c 100644 --- a/dev/BootLoader/Modules/NetBoot/build.json +++ b/dev/Boot/Modules/NetBoot/build.json diff --git a/dev/BootLoader/Modules/SysChk/.hgkeep b/dev/Boot/Modules/SysChk/.hgkeep index e69de29b..e69de29b 100644 --- a/dev/BootLoader/Modules/SysChk/.hgkeep +++ b/dev/Boot/Modules/SysChk/.hgkeep diff --git a/dev/BootLoader/Modules/SysChk/Boot.S b/dev/Boot/Modules/SysChk/Boot.S index 9fdf4428..9fdf4428 100644 --- a/dev/BootLoader/Modules/SysChk/Boot.S +++ b/dev/Boot/Modules/SysChk/Boot.S diff --git a/dev/BootLoader/Modules/SysChk/Module.cc b/dev/Boot/Modules/SysChk/Module.cc index 28b89859..a48e524c 100644 --- a/dev/BootLoader/Modules/SysChk/Module.cc +++ b/dev/Boot/Modules/SysChk/Module.cc @@ -8,8 +8,8 @@ */ #include <BootKit/BootKit.h> -#include <Modules/GfxMgr/FBMgr.h> -#include <Modules/GfxMgr/TextMgr.h> +#include <Mod/GfxMgr/FBMgr.h> +#include <Mod/GfxMgr/TextMgr.h> #include <FirmwareKit/EFI.h> #include <FirmwareKit/EFI/API.h> #include <FirmwareKit/Handover.h> @@ -19,7 +19,7 @@ #include <NewKit/Macros.h> #include <NewKit/Ref.h> #include <BootKit/Thread.h> -#include <Modules/GfxMgr/FBMgr.h> +#include <Mod/GfxMgr/FBMgr.h> EXTERN_C Int32 ModuleMain(Kernel::HEL::BootInfoHeader* Handover) { diff --git a/dev/BootLoader/Modules/SysChk/build.json b/dev/Boot/Modules/SysChk/build.json index cd21e269..cd21e269 100644 --- a/dev/BootLoader/Modules/SysChk/build.json +++ b/dev/Boot/Modules/SysChk/build.json diff --git a/dev/BootLoader/ReadMe.md b/dev/Boot/ReadMe.md index 91f8fa2e..91f8fa2e 100644 --- a/dev/BootLoader/ReadMe.md +++ b/dev/Boot/ReadMe.md diff --git a/dev/BootLoader/amd64-efi.make b/dev/Boot/amd64-efi.make index 9bffe5c7..3ffffee1 100644 --- a/dev/BootLoader/amd64-efi.make +++ b/dev/Boot/amd64-efi.make @@ -51,7 +51,7 @@ BOOTLOADER=zbaosldr.exe KERNEL=minoskrnl.exe SYSCHK=syschk.sys STARTUP=startup.sys -SCIKIT=SCIKit.dylib +SCIKIT=LibSCI.dylib .PHONY: invalid-recipe invalid-recipe: @@ -65,8 +65,8 @@ all: compile-amd64 $(COPY) src/$(BOOTLOADER) src/Root/EFI/BOOT/BOOTX64.EFI $(COPY) src/$(BOOTLOADER) src/Root/EFI/BOOT/ZBAOSLDR.EFI $(COPY) ../Kernel/$(KERNEL) src/Root/$(KERNEL) - $(COPY) ./Modules/SysChk/$(SYSCHK) src/Root/$(SYSCHK) - $(COPY) ../SCIKit/$(SCIKIT) src/Root/$(SCIKIT) + $(COPY) ./Mod/SysChk/$(SYSCHK) src/Root/$(SYSCHK) + $(COPY) ../LibSCI/$(SCIKIT) src/Root/$(SCIKIT) $(COPY) src/$(BOOTLOADER) src/Root/$(BOOTLOADER) ifneq ($(DEBUG_SUPPORT), ) diff --git a/dev/BootLoader/arm64-efi.make b/dev/Boot/arm64-efi.make index c8aed97c..c8aed97c 100644 --- a/dev/BootLoader/arm64-efi.make +++ b/dev/Boot/arm64-efi.make diff --git a/dev/BootLoader/src/.gitkeep b/dev/Boot/src/.gitkeep index e69de29b..e69de29b 100644 --- a/dev/BootLoader/src/.gitkeep +++ b/dev/Boot/src/.gitkeep diff --git a/dev/BootLoader/src/BootFileReader.cc b/dev/Boot/src/BootFileReader.cc index 3c085ac4..7fb5be0d 100644 --- a/dev/BootLoader/src/BootFileReader.cc +++ b/dev/Boot/src/BootFileReader.cc @@ -13,7 +13,7 @@ #include <BootKit/BootKit.h> #include <FirmwareKit/Handover.h> #include <FirmwareKit/EFI/API.h> -#include <Modules/GfxMgr/TextMgr.h> +#include <Mod/GfxMgr/TextMgr.h> /// @file BootFileReader /// @brief Bootloader File reader. diff --git a/dev/BootLoader/src/BootString.cc b/dev/Boot/src/BootString.cc index f511f2fc..f511f2fc 100644 --- a/dev/BootLoader/src/BootString.cc +++ b/dev/Boot/src/BootString.cc diff --git a/dev/BootLoader/src/BootSupport.cc b/dev/Boot/src/BootSupport.cc index bcd3b185..bcd3b185 100644 --- a/dev/BootLoader/src/BootSupport.cc +++ b/dev/Boot/src/BootSupport.cc diff --git a/dev/BootLoader/src/BootTextWriter.cc b/dev/Boot/src/BootTextWriter.cc index bbb9a961..bbb9a961 100644 --- a/dev/BootLoader/src/BootTextWriter.cc +++ b/dev/Boot/src/BootTextWriter.cc diff --git a/dev/BootLoader/src/BootThread.cc b/dev/Boot/src/BootThread.cc index ae494a15..9ec55af1 100644 --- a/dev/BootLoader/src/BootThread.cc +++ b/dev/Boot/src/BootThread.cc @@ -13,7 +13,7 @@ #include <KernelKit/PE.h> #include <KernelKit/MSDOS.h> #include <CFKit/Utils.h> -#include <Modules/GfxMgr/TextMgr.h> +#include <Mod/GfxMgr/TextMgr.h> /// @brief External boot services symbol. EXTERN EfiBootServices* BS; diff --git a/dev/BootLoader/src/BootloaderRsrc.rsrc b/dev/Boot/src/BootloaderRsrc.rsrc index 5cef7e7c..5cef7e7c 100644 --- a/dev/BootLoader/src/BootloaderRsrc.rsrc +++ b/dev/Boot/src/BootloaderRsrc.rsrc diff --git a/dev/BootLoader/src/HEL/64X000/.gitkeep b/dev/Boot/src/HEL/64X000/.gitkeep index e69de29b..e69de29b 100644 --- a/dev/BootLoader/src/HEL/64X000/.gitkeep +++ b/dev/Boot/src/HEL/64X000/.gitkeep diff --git a/dev/BootLoader/src/HEL/64X000/Boot64x0.S b/dev/Boot/src/HEL/64X000/Boot64x0.S index a9ca1a2d..a9ca1a2d 100644 --- a/dev/BootLoader/src/HEL/64X000/Boot64x0.S +++ b/dev/Boot/src/HEL/64X000/Boot64x0.S diff --git a/dev/BootLoader/src/HEL/AMD64/.gitkeep b/dev/Boot/src/HEL/AMD64/.gitkeep index e69de29b..e69de29b 100644 --- a/dev/BootLoader/src/HEL/AMD64/.gitkeep +++ b/dev/Boot/src/HEL/AMD64/.gitkeep diff --git a/dev/BootLoader/src/HEL/AMD64/BootAPI.S b/dev/Boot/src/HEL/AMD64/BootAPI.S index 963ef46a..963ef46a 100644 --- a/dev/BootLoader/src/HEL/AMD64/BootAPI.S +++ b/dev/Boot/src/HEL/AMD64/BootAPI.S diff --git a/dev/BootLoader/src/HEL/AMD64/BootATA.cc b/dev/Boot/src/HEL/AMD64/BootATA.cc index ff92bf48..ff92bf48 100644 --- a/dev/BootLoader/src/HEL/AMD64/BootATA.cc +++ b/dev/Boot/src/HEL/AMD64/BootATA.cc diff --git a/dev/BootLoader/src/HEL/AMD64/BootMain.cc b/dev/Boot/src/HEL/AMD64/BootMain.cc index 023976ae..51a49d0f 100644 --- a/dev/BootLoader/src/HEL/AMD64/BootMain.cc +++ b/dev/Boot/src/HEL/AMD64/BootMain.cc @@ -5,8 +5,8 @@ ------------------------------------------- */ #include <BootKit/BootKit.h> -#include <Modules/GfxMgr/FBMgr.h> -#include <Modules/GfxMgr/TextMgr.h> +#include <Mod/GfxMgr/FBMgr.h> +#include <Mod/GfxMgr/TextMgr.h> #include <FirmwareKit/EFI.h> #include <FirmwareKit/EFI/API.h> #include <FirmwareKit/Handover.h> @@ -16,7 +16,7 @@ #include <NewKit/Macros.h> #include <NewKit/Ref.h> #include <BootKit/Thread.h> -#include <Modules/GfxMgr/FBMgr.h> +#include <Mod/GfxMgr/FBMgr.h> // Makes the compiler shut up. #ifndef kMachineModel diff --git a/dev/BootLoader/src/HEL/AMD64/BootPlatform.cc b/dev/Boot/src/HEL/AMD64/BootPlatform.cc index 5fe7d41f..5fe7d41f 100644 --- a/dev/BootLoader/src/HEL/AMD64/BootPlatform.cc +++ b/dev/Boot/src/HEL/AMD64/BootPlatform.cc diff --git a/dev/BootLoader/src/HEL/AMD64/BootSATA.cc b/dev/Boot/src/HEL/AMD64/BootSATA.cc index 229ce7e3..229ce7e3 100644 --- a/dev/BootLoader/src/HEL/AMD64/BootSATA.cc +++ b/dev/Boot/src/HEL/AMD64/BootSATA.cc diff --git a/dev/BootLoader/src/HEL/ARM64/.gitkeep b/dev/Boot/src/HEL/ARM64/.gitkeep index e69de29b..e69de29b 100644 --- a/dev/BootLoader/src/HEL/ARM64/.gitkeep +++ b/dev/Boot/src/HEL/ARM64/.gitkeep diff --git a/dev/BootLoader/src/HEL/ARM64/BootAPI.S b/dev/Boot/src/HEL/ARM64/BootAPI.S index a60ad218..a60ad218 100644 --- a/dev/BootLoader/src/HEL/ARM64/BootAPI.S +++ b/dev/Boot/src/HEL/ARM64/BootAPI.S diff --git a/dev/BootLoader/src/HEL/ARM64/BootMain.cc b/dev/Boot/src/HEL/ARM64/BootMain.cc index fe35ea1b..fe35ea1b 100644 --- a/dev/BootLoader/src/HEL/ARM64/BootMain.cc +++ b/dev/Boot/src/HEL/ARM64/BootMain.cc diff --git a/dev/BootLoader/src/HEL/ARM64/BootPlatform.cc b/dev/Boot/src/HEL/ARM64/BootPlatform.cc index df16bd40..df16bd40 100644 --- a/dev/BootLoader/src/HEL/ARM64/BootPlatform.cc +++ b/dev/Boot/src/HEL/ARM64/BootPlatform.cc diff --git a/dev/BootLoader/src/HEL/POWER/.gitkeep b/dev/Boot/src/HEL/POWER/.gitkeep index e69de29b..e69de29b 100644 --- a/dev/BootLoader/src/HEL/POWER/.gitkeep +++ b/dev/Boot/src/HEL/POWER/.gitkeep diff --git a/dev/BootLoader/src/HEL/POWER/CoreBootStartup.S b/dev/Boot/src/HEL/POWER/CoreBootStartup.S index e4964c59..e4964c59 100644 --- a/dev/BootLoader/src/HEL/POWER/CoreBootStartup.S +++ b/dev/Boot/src/HEL/POWER/CoreBootStartup.S diff --git a/dev/BootLoader/src/New+Delete.cc b/dev/Boot/src/New+Delete.cc index 3abf0ef3..3abf0ef3 100644 --- a/dev/BootLoader/src/New+Delete.cc +++ b/dev/Boot/src/New+Delete.cc diff --git a/dev/BootLoader/src/Root/EFI/STARTUP.NSH b/dev/Boot/src/Root/EFI/STARTUP.NSH index d29ba8fd..d29ba8fd 100644 --- a/dev/BootLoader/src/Root/EFI/STARTUP.NSH +++ b/dev/Boot/src/Root/EFI/STARTUP.NSH diff --git a/dev/BootLoader/src/Root/zka/fntkrnl.ttf b/dev/Boot/src/Root/zka/fntkrnl.ttf Binary files differindex e9a6dbb0..e9a6dbb0 100644 --- a/dev/BootLoader/src/Root/zka/fntkrnl.ttf +++ b/dev/Boot/src/Root/zka/fntkrnl.ttf diff --git a/dev/HintKit/CompilerHint.h b/dev/Hints/CompilerHint.h index 851b143f..851b143f 100644 --- a/dev/HintKit/CompilerHint.h +++ b/dev/Hints/CompilerHint.h diff --git a/dev/Kernel/FSKit/NeFS.h b/dev/Kernel/FSKit/NeFS.h index 5c62f0c2..9a804927 100644 --- a/dev/Kernel/FSKit/NeFS.h +++ b/dev/Kernel/FSKit/NeFS.h @@ -17,7 +17,7 @@ default. #pragma once #include <CompilerKit/CompilerKit.h> -#include <HintKit/CompilerHint.h> +#include <Hints/CompilerHint.h> #include <KernelKit/DriveMgr.h> #include <NewKit/Defines.h> #include <NewKit/KString.h> @@ -376,7 +376,7 @@ namespace Kernel } private: - Char mStamp[255] = { "/System/FileSystemStamp.jrnl" }; + Char mStamp[255] = { "/Boot/Journal" kNeFSJournalExt }; }; diff --git a/dev/Kernel/FirmwareKit/EFI/API.h b/dev/Kernel/FirmwareKit/EFI/API.h index 218ca85a..24d21fd2 100644 --- a/dev/Kernel/FirmwareKit/EFI/API.h +++ b/dev/Kernel/FirmwareKit/EFI/API.h @@ -21,7 +21,7 @@ class BTextWriter; #define __BOOTKIT_NO_INCLUDE__ 1 #include <BootKit/BootKit.h> -#include <Modules/GfxMgr/FBMgr.h> +#include <Mod/GfxMgr/FBMgr.h> #endif // ifdef __ZBAOSLDR__ inline EfiSystemTable* ST = nullptr; diff --git a/dev/Kernel/HALKit/AMD64/HalACPIFactoryInterface.cc b/dev/Kernel/HALKit/AMD64/HalACPIFactoryInterface.cc index 1a1d50a3..521ad2f4 100644 --- a/dev/Kernel/HALKit/AMD64/HalACPIFactoryInterface.cc +++ b/dev/Kernel/HALKit/AMD64/HalACPIFactoryInterface.cc @@ -4,7 +4,7 @@ ------------------------------------------- */ -#include <Modules/ACPI/ACPIFactoryInterface.h> +#include <Mod/ACPI/ACPIFactoryInterface.h> #include <HALKit/AMD64/Processor.h> #include <NewKit/KString.h> #include <ArchKit/ArchKit.h> diff --git a/dev/Kernel/HALKit/AMD64/HalAPICController.cc b/dev/Kernel/HALKit/AMD64/HalAPICController.cc index cebbc41b..b20bd524 100644 --- a/dev/Kernel/HALKit/AMD64/HalAPICController.cc +++ b/dev/Kernel/HALKit/AMD64/HalAPICController.cc @@ -4,7 +4,7 @@ ------------------------------------------- */ -#include <Modules/ACPI/ACPIFactoryInterface.h> +#include <Mod/ACPI/ACPIFactoryInterface.h> #include <HALKit/AMD64/Processor.h> #define cIOAPICRegVal (4) diff --git a/dev/Kernel/HALKit/AMD64/HalCoreScheduler.cc b/dev/Kernel/HALKit/AMD64/HalCoreScheduler.cc index ac103d0d..3cdbd313 100644 --- a/dev/Kernel/HALKit/AMD64/HalCoreScheduler.cc +++ b/dev/Kernel/HALKit/AMD64/HalCoreScheduler.cc @@ -4,14 +4,14 @@ ------------------------------------------- */ -#include <Modules/ACPI/ACPIFactoryInterface.h> +#include <Mod/ACPI/ACPIFactoryInterface.h> #include <KernelKit/UserProcessScheduler.h> #include <HALKit/AMD64/Processor.h> #include <ArchKit/ArchKit.h> #include <KernelKit/Semaphore.h> #include <KernelKit/UserProcessScheduler.h> #include <KernelKit/Timer.h> -#include <Modules/GfxMgr/TextMgr.h> +#include <Mod/GfxMgr/TextMgr.h> #include <NewKit/KernelPanic.h> // Needed for SMP. diff --git a/dev/Kernel/HALKit/AMD64/HalKernelMain.cc b/dev/Kernel/HALKit/AMD64/HalKernelMain.cc index 690ece70..b78397fe 100644 --- a/dev/Kernel/HALKit/AMD64/HalKernelMain.cc +++ b/dev/Kernel/HALKit/AMD64/HalKernelMain.cc @@ -8,10 +8,10 @@ #include <KernelKit/UserProcessScheduler.h> #include <KernelKit/HardwareThreadScheduler.h> #include <KernelKit/CodeMgr.h> -#include <Modules/ACPI/ACPIFactoryInterface.h> +#include <Mod/ACPI/ACPIFactoryInterface.h> #include <NetworkKit/IPC.h> #include <CFKit/Property.h> -#include <Modules/GfxMgr/TextMgr.h> +#include <Mod/GfxMgr/TextMgr.h> EXTERN_C Kernel::VoidPtr kInterruptVectorTable[]; EXTERN_C Kernel::VoidPtr mp_user_switch_proc; diff --git a/dev/Kernel/HALKit/AMD64/HalTimerAMD64.cc b/dev/Kernel/HALKit/AMD64/HalTimerAMD64.cc index 9e42fe3f..82d491ad 100644 --- a/dev/Kernel/HALKit/AMD64/HalTimerAMD64.cc +++ b/dev/Kernel/HALKit/AMD64/HalTimerAMD64.cc @@ -11,7 +11,7 @@ ------------------------------------------- */
-#include <Modules/ACPI/ACPIFactoryInterface.h>
+#include <Mod/ACPI/ACPIFactoryInterface.h>
#include <ArchKit/ArchKit.h>
#include <KernelKit/Timer.h>
diff --git a/dev/Kernel/HALKit/AMD64/MBCI/HalMBCI.cc b/dev/Kernel/HALKit/AMD64/MBCI/HalMBCI.cc index b7948bcb..6680c40f 100644 --- a/dev/Kernel/HALKit/AMD64/MBCI/HalMBCI.cc +++ b/dev/Kernel/HALKit/AMD64/MBCI/HalMBCI.cc @@ -4,4 +4,4 @@ ------------------------------------------- */ -#include <Modules/MBCI/MBCI.h> +#include <Mod/MBCI/MBCI.h> diff --git a/dev/Kernel/HALKit/AMD64/Storage/AHCI-DMA.cc b/dev/Kernel/HALKit/AMD64/Storage/AHCI-DMA.cc index 7903af63..fd21bbca 100644 --- a/dev/Kernel/HALKit/AMD64/Storage/AHCI-DMA.cc +++ b/dev/Kernel/HALKit/AMD64/Storage/AHCI-DMA.cc @@ -18,8 +18,8 @@ #include <KernelKit/UserProcessScheduler.h> #include <KernelKit/LPC.h> -#include <Modules/ATA/ATA.h> -#include <Modules/AHCI/AHCI.h> +#include <Mod/ATA/ATA.h> +#include <Mod/AHCI/AHCI.h> #include <KernelKit/PCI/Iterator.h> #include <NewKit/Utils.h> #include <KernelKit/LockDelegate.h> diff --git a/dev/Kernel/HALKit/AMD64/Storage/ATA-DMA.cc b/dev/Kernel/HALKit/AMD64/Storage/ATA-DMA.cc index 6bb90156..ff51a398 100644 --- a/dev/Kernel/HALKit/AMD64/Storage/ATA-DMA.cc +++ b/dev/Kernel/HALKit/AMD64/Storage/ATA-DMA.cc @@ -17,7 +17,7 @@ #include <StorageKit/PRDT.h> -#include <Modules/ATA/ATA.h> +#include <Mod/ATA/ATA.h> #include <ArchKit/ArchKit.h> using namespace Kernel; diff --git a/dev/Kernel/HALKit/AMD64/Storage/ATA-PIO.cc b/dev/Kernel/HALKit/AMD64/Storage/ATA-PIO.cc index 835035fb..3a3ba8eb 100644 --- a/dev/Kernel/HALKit/AMD64/Storage/ATA-PIO.cc +++ b/dev/Kernel/HALKit/AMD64/Storage/ATA-PIO.cc @@ -15,7 +15,7 @@ * */ -#include <Modules/ATA/ATA.h> +#include <Mod/ATA/ATA.h> #include <ArchKit/ArchKit.h> #ifdef __ATA_PIO__ diff --git a/dev/Kernel/HALKit/ARM64/APM/APM.cc b/dev/Kernel/HALKit/ARM64/APM/APM.cc index 80cd4b8d..55cd26cc 100644 --- a/dev/Kernel/HALKit/ARM64/APM/APM.cc +++ b/dev/Kernel/HALKit/ARM64/APM/APM.cc @@ -4,7 +4,7 @@ ------------------------------------------- */ -#include <Modules/APM/APM.h> +#include <Mod/APM/APM.h> #include <KernelKit/LPC.h> using namespace Kernel; diff --git a/dev/Kernel/HALKit/ARM64/HalACPIFactoryInterface.cc b/dev/Kernel/HALKit/ARM64/HalACPIFactoryInterface.cc index f8c8ffd8..94b10c09 100644 --- a/dev/Kernel/HALKit/ARM64/HalACPIFactoryInterface.cc +++ b/dev/Kernel/HALKit/ARM64/HalACPIFactoryInterface.cc @@ -4,11 +4,11 @@ ------------------------------------------- */ -#include <Modules/ACPI/ACPIFactoryInterface.h> +#include <Mod/ACPI/ACPIFactoryInterface.h> #include <NewKit/KString.h> #include <ArchKit/ArchKit.h> #include <KernelKit/Heap.h> -#include <Modules/APM/APM.h> +#include <Mod/APM/APM.h> namespace Kernel { diff --git a/dev/Kernel/HALKit/ARM64/HalCoreMPScheduler.cc b/dev/Kernel/HALKit/ARM64/HalCoreMPScheduler.cc index 75f8283c..eab88384 100644 --- a/dev/Kernel/HALKit/ARM64/HalCoreMPScheduler.cc +++ b/dev/Kernel/HALKit/ARM64/HalCoreMPScheduler.cc @@ -4,7 +4,7 @@ ------------------------------------------- */ -#include <Modules/ACPI/ACPIFactoryInterface.h> +#include <Mod/ACPI/ACPIFactoryInterface.h> #include <KernelKit/UserProcessScheduler.h> using namespace Kernel; diff --git a/dev/Kernel/HALKit/ARM64/HalKernelMain.cc b/dev/Kernel/HALKit/ARM64/HalKernelMain.cc index 4a81fa64..03532270 100644 --- a/dev/Kernel/HALKit/ARM64/HalKernelMain.cc +++ b/dev/Kernel/HALKit/ARM64/HalKernelMain.cc @@ -5,7 +5,7 @@ ------------------------------------------- */ #include <ArchKit/ArchKit.h> -#include <Modules/GfxMgr/FBMgr.h> +#include <Mod/GfxMgr/FBMgr.h> #include <FirmwareKit/Handover.h> #include <KernelKit/FileMgr.h> #include <KernelKit/Heap.h> @@ -13,7 +13,7 @@ #include <KernelKit/UserProcessScheduler.h> #include <NewKit/Json.h> #include <KernelKit/CodeMgr.h> -#include <Modules/ACPI/ACPIFactoryInterface.h> +#include <Mod/ACPI/ACPIFactoryInterface.h> #include <NetworkKit/IPC.h> #include <CFKit/Property.h> diff --git a/dev/Kernel/KernelKit/FileMgr.h b/dev/Kernel/KernelKit/FileMgr.h index 10aef681..c448519e 100644 --- a/dev/Kernel/KernelKit/FileMgr.h +++ b/dev/Kernel/KernelKit/FileMgr.h @@ -29,7 +29,7 @@ #endif // __FSKIT_INCLUDES_HPFS__ #include <CompilerKit/CompilerKit.h> -#include <HintKit/CompilerHint.h> +#include <Hints/CompilerHint.h> #include <KernelKit/LPC.h> #include <KernelKit/DebugOutput.h> #include <NewKit/Stream.h> diff --git a/dev/Kernel/KernelKit/Heap.h b/dev/Kernel/KernelKit/Heap.h index 90ed6266..834b8f17 100644 --- a/dev/Kernel/KernelKit/Heap.h +++ b/dev/Kernel/KernelKit/Heap.h @@ -13,7 +13,7 @@ #include <NewKit/KernelPanic.h> #include <KernelKit/LPC.h> -#include <HintKit/CompilerHint.h> +#include <Hints/CompilerHint.h> namespace Kernel { diff --git a/dev/Kernel/KernelKit/LoaderInterface.h b/dev/Kernel/KernelKit/LoaderInterface.h index b9a624bb..37bb61d6 100644 --- a/dev/Kernel/KernelKit/LoaderInterface.h +++ b/dev/Kernel/KernelKit/LoaderInterface.h @@ -7,7 +7,7 @@ #pragma once #include <CompilerKit/CompilerKit.h> -#include <HintKit/CompilerHint.h> +#include <Hints/CompilerHint.h> #include <NewKit/Defines.h> #include <NewKit/ErrorOr.h> diff --git a/dev/Kernel/NetworkKit/IPC.h b/dev/Kernel/NetworkKit/IPC.h index 0e50c266..4bc293c4 100644 --- a/dev/Kernel/NetworkKit/IPC.h +++ b/dev/Kernel/NetworkKit/IPC.h @@ -12,8 +12,7 @@ #include <NewKit/Defines.h> #include <NewKit/KString.h> -#include <HintKit/CompilerHint.h> -#include <CompressKit/API.h> +#include <Hints/CompilerHint.h> /// @file IPC.h /// @brief IPC comm. protocol. diff --git a/dev/Kernel/NewKit/SwapMgr.h b/dev/Kernel/NewKit/SwapMgr.h index 822a1565..42df9ca6 100644 --- a/dev/Kernel/NewKit/SwapMgr.h +++ b/dev/Kernel/NewKit/SwapMgr.h @@ -12,10 +12,20 @@ #define kSwapMgrBlockMaxSize mib_cast(16) #define KSwapMgrBlockMagic "SWEP " +#define kSwapMgrPageFile "/System/pagefile.sys" + /// @file SwapMgr.h -/// @brief Virtual memory swap API. +/// @brief Virtual memory swap manager. namespace Kernel { - class UserSwapProcess; + class SwapMgrDisk; + + class SwapMgrDisk + { + static BOOL DumpToDisk(const Char* fork_name, SizeT fork_name_len = 0) + { + return YES; + } + } }
\ No newline at end of file diff --git a/dev/Kernel/StorageKit/SCSI.h b/dev/Kernel/StorageKit/SCSI.h index 0cbb780a..e56569c8 100644 --- a/dev/Kernel/StorageKit/SCSI.h +++ b/dev/Kernel/StorageKit/SCSI.h @@ -6,6 +6,6 @@ #pragma once -#include <Modules/SCSI/SCSI.h> +#include <Mod/SCSI/SCSI.h> extern const scsi_packet_type<12> kCDRomPacketTemplate; diff --git a/dev/Kernel/src/ACPIFactoryInterface.cc b/dev/Kernel/src/ACPIFactoryInterface.cc index 83890220..716f691b 100644 --- a/dev/Kernel/src/ACPIFactoryInterface.cc +++ b/dev/Kernel/src/ACPIFactoryInterface.cc @@ -4,7 +4,7 @@ ------------------------------------------- */ -#include <Modules/ACPI/ACPIFactoryInterface.h> +#include <Mod/ACPI/ACPIFactoryInterface.h> #include <NewKit/KString.h> #include <ArchKit/ArchKit.h> #include <KernelKit/Heap.h> diff --git a/dev/Kernel/src/DriveMgr.cc b/dev/Kernel/src/DriveMgr.cc index 036997cb..cb83bf37 100644 --- a/dev/Kernel/src/DriveMgr.cc +++ b/dev/Kernel/src/DriveMgr.cc @@ -8,9 +8,9 @@ #include <KernelKit/DriveMgr.h> #include <NewKit/Utils.h> #include <FirmwareKit/EPM.h> -#include <Modules/ATA/ATA.h> -#include <Modules/AHCI/AHCI.h> -#include <Modules/NVME/NVME.h> +#include <Mod/ATA/ATA.h> +#include <Mod/AHCI/AHCI.h> +#include <Mod/NVME/NVME.h> /***********************************************************************************/ /// @file DriveMgr.cc diff --git a/dev/Kernel/src/FS/HPFS.cc b/dev/Kernel/src/FS/HPFS.cc index 98c41f23..3093d6f6 100644 --- a/dev/Kernel/src/FS/HPFS.cc +++ b/dev/Kernel/src/FS/HPFS.cc @@ -6,9 +6,9 @@ #ifdef __FSKIT_INCLUDES_HPFS__ -#include <Modules/AHCI/AHCI.h> -#include <Modules/ATA/ATA.h> -#include <Modules/Flash/Flash.h> +#include <Mod/AHCI/AHCI.h> +#include <Mod/ATA/ATA.h> +#include <Mod/Flash/Flash.h> #include <FSKit/HPFS.h> #include <KernelKit/LPC.h> #include <NewKit/Crc32.h> diff --git a/dev/Kernel/src/FS/NeFS.cc b/dev/Kernel/src/FS/NeFS.cc index 650d42c3..5484efc7 100644 --- a/dev/Kernel/src/FS/NeFS.cc +++ b/dev/Kernel/src/FS/NeFS.cc @@ -9,9 +9,9 @@ #include <FSKit/NeFS.h> #include <FirmwareKit/EPM.h> -#include <Modules/AHCI/AHCI.h> -#include <Modules/ATA/ATA.h> -#include <Modules/Flash/Flash.h> +#include <Mod/AHCI/AHCI.h> +#include <Mod/ATA/ATA.h> +#include <Mod/Flash/Flash.h> #include <KernelKit/LPC.h> #include <NewKit/Crc32.h> #include <NewKit/KernelPanic.h> diff --git a/dev/Kernel/src/KernelPanic.cc b/dev/Kernel/src/KernelPanic.cc index 0fd2ec64..9b200336 100644 --- a/dev/Kernel/src/KernelPanic.cc +++ b/dev/Kernel/src/KernelPanic.cc @@ -11,8 +11,8 @@ #include <NewKit/KString.h> #include <FirmwareKit/Handover.h> #include <KernelKit/FileMgr.h> -#include <Modules/GfxMgr/FBMgr.h> -#include <Modules/GfxMgr/TextMgr.h> +#include <Mod/GfxMgr/FBMgr.h> +#include <Mod/GfxMgr/TextMgr.h> #define kWebsiteURL "https://el-mahrouss-logic.com/products/help/" diff --git a/dev/SCIKit/CompilerHint.h b/dev/LibSCI/CompilerHint.h index 3365bac2..3365bac2 100644 --- a/dev/SCIKit/CompilerHint.h +++ b/dev/LibSCI/CompilerHint.h diff --git a/dev/SCIKit/GPU.h b/dev/LibSCI/GPU.h index 8a1af4ca..976ad2e5 100644 --- a/dev/SCIKit/GPU.h +++ b/dev/LibSCI/GPU.h @@ -10,7 +10,7 @@ Purpose: GFX System Calls. #ifndef SCIKIT_GPU_H #define SCIKIT_GPU_H -#include <SCI.h> +#include <LibSCI.h> // ------------------------------------------------------------------------------------------ // // GPU API. diff --git a/dev/SCIKit/LPC.h b/dev/LibSCI/LPC.h index 717c32ec..717c32ec 100644 --- a/dev/SCIKit/LPC.h +++ b/dev/LibSCI/LPC.h diff --git a/dev/SCIKit/Macros.h b/dev/LibSCI/Macros.h index cbeb67eb..5443252c 100644 --- a/dev/SCIKit/Macros.h +++ b/dev/LibSCI/Macros.h @@ -3,14 +3,14 @@ Copyright (C) 2024, Theater Quality Inc, all rights reserved. File: Macros.h -Purpose: SCIKit Macros header. +Purpose: LibSCI Macros header. ------------------------------------------- */ #pragma once /***********************************************************************************/ -/// @file SCIKit/Macros.h +/// @file LibSCI/Macros.h /// @brief Macros and core types. /***********************************************************************************/ diff --git a/dev/SCIKit/SCI.h b/dev/LibSCI/SCI.h index 5b32a2fd..2eb6ed80 100644 --- a/dev/SCIKit/SCI.h +++ b/dev/LibSCI/SCI.h @@ -2,7 +2,7 @@ Copyright (C) 2024, Theater Quality Inc, all rights reserved.
-File: SCI.h
+File: LibSCI.h
Purpose: System Calls.
------------------------------------------- */
diff --git a/dev/SCIKit/SysCalls.h b/dev/LibSCI/SysCalls.h index 3624dcc6..10556000 100644 --- a/dev/SCIKit/SysCalls.h +++ b/dev/LibSCI/SysCalls.h @@ -3,7 +3,7 @@ Copyright (C) 2024, Theater Quality Inc, all rights reserved. File: Macros.h -Purpose: SCIKit Macros header. +Purpose: LibSCI Macros header. ------------------------------------------- */ diff --git a/dev/SCIKit/doc/SCIKit.drawio b/dev/LibSCI/doc/SCIKit.drawio index 9b58cc72..132eacc1 100644 --- a/dev/SCIKit/doc/SCIKit.drawio +++ b/dev/LibSCI/doc/SCIKit.drawio @@ -7,13 +7,13 @@ <mxCell id="eRehIIeIVOPW1y23kRkx-9" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="1" source="eRehIIeIVOPW1y23kRkx-2" target="eRehIIeIVOPW1y23kRkx-8" edge="1"> <mxGeometry relative="1" as="geometry"/> </mxCell> - <mxCell id="eRehIIeIVOPW1y23kRkx-2" value="SCI Header (Foundation.h)" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1"> + <mxCell id="eRehIIeIVOPW1y23kRkx-2" value="LibSCI Header (Foundation.h)" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1"> <mxGeometry x="200" y="450" width="226" height="60" as="geometry"/> </mxCell> <mxCell id="eRehIIeIVOPW1y23kRkx-4" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" parent="1" source="eRehIIeIVOPW1y23kRkx-3" target="eRehIIeIVOPW1y23kRkx-2" edge="1"> <mxGeometry relative="1" as="geometry"/> </mxCell> - <mxCell id="eRehIIeIVOPW1y23kRkx-3" value="SCI" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=15;" parent="1" vertex="1"> + <mxCell id="eRehIIeIVOPW1y23kRkx-3" value="LibSCI" style="shape=cylinder3;whiteSpace=wrap;html=1;boundedLbl=1;backgroundOutline=1;size=15;" parent="1" vertex="1"> <mxGeometry x="283" y="290" width="60" height="80" as="geometry"/> </mxCell> <mxCell id="eRehIIeIVOPW1y23kRkx-8" value="WindowMgr" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1"> diff --git a/dev/SCIKit/sci.json b/dev/LibSCI/sci.json index 44d00f87..34f4fb0a 100644 --- a/dev/SCIKit/sci.json +++ b/dev/LibSCI/sci.json @@ -3,7 +3,7 @@ "compiler_std": "c++20", "headers_path": ["../", "./"], "sources_path": ["src/*.cc", "src/*.o"], - "output_name": "SCIKit.dylib", + "output_name": "LibSCI.dylib", "compiler_flags": [ "-fPIC", "-ffreestanding", diff --git a/dev/SCIKit/src/GPU.cc b/dev/LibSCI/src/GPU.cc index 46e090e6..46e090e6 100644 --- a/dev/SCIKit/src/GPU.cc +++ b/dev/LibSCI/src/GPU.cc diff --git a/dev/SCIKit/src/LPC.cc b/dev/LibSCI/src/LPC.cc index 47f47ce6..47f47ce6 100644 --- a/dev/SCIKit/src/LPC.cc +++ b/dev/LibSCI/src/LPC.cc diff --git a/dev/SCIKit/src/SCI+IO.asm b/dev/LibSCI/src/LibSCI+IO.asm index 2f52796b..82ac82b7 100644 --- a/dev/SCIKit/src/SCI+IO.asm +++ b/dev/LibSCI/src/LibSCI+IO.asm @@ -1,7 +1,7 @@ ;; /* ;; * ======================================================== ;; * -;; * SCI +;; * LibSCI ;; * Copyright (C) 2024, Theater Quality Inc, all rights reserved., all rights reserved. ;; * ;; * ======================================================== diff --git a/dev/SCIKit/src/Makefile b/dev/LibSCI/src/Makefile index 83515aa3..d76fa5ac 100644 --- a/dev/SCIKit/src/Makefile +++ b/dev/LibSCI/src/Makefile @@ -13,4 +13,4 @@ error: .PHONY: sci_asm_io_x64 sci_asm_io_x64: - $(ASM) $(FLAGS) SCI+IO.asm -o SCI+IO.o + $(ASM) $(FLAGS) LibSCI+IO.asm -o LibSCI+IO.o diff --git a/dev/SCIKit/src/SCI.cc b/dev/LibSCI/src/SCI.cc index 3437498c..ec6cb937 100644 --- a/dev/SCIKit/src/SCI.cc +++ b/dev/LibSCI/src/SCI.cc @@ -4,10 +4,10 @@ ------------------------------------------- */
-#include <SCI.h>
+#include <LibSCI.h>
-/// @file SCI.cc
-/// @brief Source file for the memory functions of the SCI.
+/// @file LibSCI.cc
+/// @brief Source file for the memory functions of the LibSCI.
/// @brief Copy memory region.
IMPORT_C VoidPtr MmCopyMemory(_Input VoidPtr dest, _Input VoidPtr src, _Input SizeT len)
diff --git a/dev/Modules/ACPI/ACPI.h b/dev/Mod/ACPI/ACPI.h index d21c475e..d21c475e 100644 --- a/dev/Modules/ACPI/ACPI.h +++ b/dev/Mod/ACPI/ACPI.h diff --git a/dev/Modules/ACPI/ACPIFactoryInterface.h b/dev/Mod/ACPI/ACPIFactoryInterface.h index d6a71316..0a28bd95 100644 --- a/dev/Modules/ACPI/ACPIFactoryInterface.h +++ b/dev/Mod/ACPI/ACPIFactoryInterface.h @@ -8,7 +8,7 @@ #define __MOD_ACPI_H__ #include <KernelKit/DebugOutput.h> -#include <Modules/ACPI/ACPI.h> +#include <Mod/ACPI/ACPI.h> #include <NewKit/ErrorOr.h> #include <NewKit/Defines.h> #include <NewKit/Ref.h> diff --git a/dev/Modules/AHCI/.gitkeep b/dev/Mod/AHCI/.gitkeep index e69de29b..e69de29b 100644 --- a/dev/Modules/AHCI/.gitkeep +++ b/dev/Mod/AHCI/.gitkeep diff --git a/dev/Modules/AHCI/AHCI.h b/dev/Mod/AHCI/AHCI.h index 4670c5c7..9ca926e2 100644 --- a/dev/Modules/AHCI/AHCI.h +++ b/dev/Mod/AHCI/AHCI.h @@ -14,7 +14,7 @@ #pragma once #include <NewKit/Defines.h> -#include <Modules/ACPI/ACPI.h> +#include <Mod/ACPI/ACPI.h> /// @note Forward declarations of structs. diff --git a/dev/Modules/APM/APM.h b/dev/Mod/APM/APM.h index 6c631802..6c631802 100644 --- a/dev/Modules/APM/APM.h +++ b/dev/Mod/APM/APM.h diff --git a/dev/Modules/ATA/ATA.h b/dev/Mod/ATA/ATA.h index d79fdd52..d79fdd52 100644 --- a/dev/Modules/ATA/ATA.h +++ b/dev/Mod/ATA/ATA.h diff --git a/dev/Modules/Flash/Flash.h b/dev/Mod/Flash/Flash.h index 9f5d4117..9f5d4117 100644 --- a/dev/Modules/Flash/Flash.h +++ b/dev/Mod/Flash/Flash.h diff --git a/dev/Modules/GPRS/.keepme b/dev/Mod/GPRS/.keepme index e69de29b..e69de29b 100644 --- a/dev/Modules/GPRS/.keepme +++ b/dev/Mod/GPRS/.keepme diff --git a/dev/Modules/GfxMgr/AccessibilityMgr.h b/dev/Mod/GfxMgr/AccessibilityMgr.h index 7507f5c0..24039ade 100644 --- a/dev/Modules/GfxMgr/AccessibilityMgr.h +++ b/dev/Mod/GfxMgr/AccessibilityMgr.h @@ -4,13 +4,13 @@ ------------------------------------------- */ -#ifndef FB_ACCESSIBILITY_H -#define FB_ACCESSIBILITY_H +#ifndef GFX_MGR_ACCESSIBILITY_H +#define GFX_MGR_ACCESSIBILITY_H #include <NewKit/NewKit.h> #include <KernelKit/LPC.h> -#include <Modules/GfxMgr/FBMgr.h> -#include <Modules/GfxMgr/MathMgr.h> +#include <Mod/GfxMgr/FBMgr.h> +#include <Mod/GfxMgr/MathMgr.h> #include <ArchKit/ArchKit.h> namespace UI @@ -38,4 +38,4 @@ namespace UI }; } // namespace CG -#endif // !FB_ACCESSIBILITY_H_ +#endif // !GFX_MGR_ACCESSIBILITY_H_ diff --git a/dev/Modules/GfxMgr/FBMgr.h b/dev/Mod/GfxMgr/FBMgr.h index 0b685ee0..37fbaddc 100644 --- a/dev/Modules/GfxMgr/FBMgr.h +++ b/dev/Mod/GfxMgr/FBMgr.h @@ -140,7 +140,7 @@ } \ } -#include <Modules/GfxMgr/AccessibilityMgr.h> +#include <Mod/GfxMgr/AccessibilityMgr.h> namespace UI { diff --git a/dev/Modules/GfxMgr/MathMgr.h b/dev/Mod/GfxMgr/MathMgr.h index 13e653a5..bb078b42 100644 --- a/dev/Modules/GfxMgr/MathMgr.h +++ b/dev/Mod/GfxMgr/MathMgr.h @@ -11,7 +11,7 @@ namespace UI { -#ifdef ZKA_FB_USE_DOUBLE +#ifdef ZKA_GFX_MGR_USE_DOUBLE typedef double fb_real_t; #else typedef float fb_real_t; diff --git a/dev/Modules/GfxMgr/TextMgr.h b/dev/Mod/GfxMgr/TextMgr.h index 970fbb8e..569618a2 100644 --- a/dev/Modules/GfxMgr/TextMgr.h +++ b/dev/Mod/GfxMgr/TextMgr.h @@ -7,7 +7,7 @@ #pragma once
#include <NewKit/Defines.h>
-#include <Modules/GfxMgr/FBMgr.h>
+#include <Mod/GfxMgr/FBMgr.h>
#define FONT_SIZE_X 8
#define FONT_SIZE_Y 8
diff --git a/dev/Modules/HPET/.gitkeep b/dev/Mod/HPET/.gitkeep index e69de29b..e69de29b 100644 --- a/dev/Modules/HPET/.gitkeep +++ b/dev/Mod/HPET/.gitkeep diff --git a/dev/Modules/HPET/Defines.h b/dev/Mod/HPET/Defines.h index 813e6884..d186698a 100644 --- a/dev/Modules/HPET/Defines.h +++ b/dev/Mod/HPET/Defines.h @@ -12,7 +12,7 @@ #pragma once #include <NewKit/Defines.h> -#include <Modules/ACPI/ACPI.h> +#include <Mod/ACPI/ACPI.h> namespace Kernel { diff --git a/dev/Modules/IEEE802/.gitkeep b/dev/Mod/IEEE802/.gitkeep index e69de29b..e69de29b 100644 --- a/dev/Modules/IEEE802/.gitkeep +++ b/dev/Mod/IEEE802/.gitkeep diff --git a/dev/Modules/LTE/LTE.h b/dev/Mod/LTE/LTE.h index a5327df9..a5327df9 100644 --- a/dev/Modules/LTE/LTE.h +++ b/dev/Mod/LTE/LTE.h diff --git a/dev/Modules/MBCI/Interface.h b/dev/Mod/MBCI/Interface.h index 9186ba24..6a363f72 100644 --- a/dev/Modules/MBCI/Interface.h +++ b/dev/Mod/MBCI/Interface.h @@ -7,4 +7,4 @@ #pragma once #include <NewKit/Defines.h> -#include <Modules/MBCI/MBCI.h> +#include <Mod/MBCI/MBCI.h> diff --git a/dev/Modules/MBCI/MBCI.h b/dev/Mod/MBCI/MBCI.h index ac620972..df93f212 100644 --- a/dev/Modules/MBCI/MBCI.h +++ b/dev/Mod/MBCI/MBCI.h @@ -8,7 +8,7 @@ #define _INC_MODULE_MBCI_H_ #include <NewKit/Defines.h> -#include <Modules/ACPI/ACPI.h> +#include <Mod/ACPI/ACPI.h> /** - VCC (IN) (OUT for MCU) diff --git a/dev/Modules/NVME/NVME.h b/dev/Mod/NVME/NVME.h index 2d77a769..2d77a769 100644 --- a/dev/Modules/NVME/NVME.h +++ b/dev/Mod/NVME/NVME.h diff --git a/dev/Modules/OHCI/.gitkeep b/dev/Mod/OHCI/.gitkeep index e69de29b..e69de29b 100644 --- a/dev/Modules/OHCI/.gitkeep +++ b/dev/Mod/OHCI/.gitkeep diff --git a/dev/Modules/ReadMe.md b/dev/Mod/ReadMe.md index bdb7fb69..b9de61b5 100644 --- a/dev/Modules/ReadMe.md +++ b/dev/Mod/ReadMe.md @@ -1,4 +1,4 @@ -# Kernel Modules +# Kernel Mod ## Brief diff --git a/dev/Modules/SCSI/.gitkeep b/dev/Mod/SCSI/.gitkeep index e69de29b..e69de29b 100644 --- a/dev/Modules/SCSI/.gitkeep +++ b/dev/Mod/SCSI/.gitkeep diff --git a/dev/Modules/SCSI/SCSI.h b/dev/Mod/SCSI/SCSI.h index 917c963e..917c963e 100644 --- a/dev/Modules/SCSI/SCSI.h +++ b/dev/Mod/SCSI/SCSI.h diff --git a/dev/Modules/WiFi/.gitkeep b/dev/Mod/WiFi/.gitkeep index e69de29b..e69de29b 100644 --- a/dev/Modules/WiFi/.gitkeep +++ b/dev/Mod/WiFi/.gitkeep diff --git a/dev/Modules/XHCI/.gitkeep b/dev/Mod/XHCI/.gitkeep index e69de29b..e69de29b 100644 --- a/dev/Modules/XHCI/.gitkeep +++ b/dev/Mod/XHCI/.gitkeep diff --git a/dev/Modules/XHCI/Defines.h b/dev/Mod/XHCI/Defines.h index 6758cf33..6758cf33 100644 --- a/dev/Modules/XHCI/Defines.h +++ b/dev/Mod/XHCI/Defines.h diff --git a/dev/Modules/GfxMgr/Rsrc/Controls.rsrc b/dev/Modules/GfxMgr/Rsrc/Controls.rsrc deleted file mode 100644 index 1534656e..00000000 --- a/dev/Modules/GfxMgr/Rsrc/Controls.rsrc +++ /dev/null @@ -1,61 +0,0 @@ -#define FLAT_CONTROLS_HEIGHT 24 -#define FLAT_CONTROLS_WIDTH 44 - -// array size is 3168 -static inline const unsigned int zka_flat_controls[] = { - 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, - 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, - 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, - 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, - 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, - 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, - 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, - 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, - 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0x3e3e3e, 0xe0e0e0, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xe0e0e0, 0x3e3e3e, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, - 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xe0e0e0, 0x3e3e3e, 0xe0e0e0, 0xffffff, 0xffffff, 0xe0e0e0, 0x3e3e3e, 0xe0e0e0, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, - 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xe0e0e0, 0x3e3e3e, 0xe0e0e0, 0xe0e0e0, 0x3e3e3e, 0xe0e0e0, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, - 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xe0e0e0, 0x3e3e3e, 0x3e3e3e, 0xe0e0e0, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, - 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xe0e0e0, 0x3e3e3e, 0x3e3e3e, 0xe0e0e0, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, - 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xe0e0e0, 0x3e3e3e, 0xe0e0e0, 0xe0e0e0, 0x3e3e3e, 0xe0e0e0, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, - 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xe0e0e0, 0x3e3e3e, 0xe0e0e0, 0xffffff, 0xffffff, 0xe0e0e0, 0x3e3e3e, 0xe0e0e0, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, - 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0x3e3e3e, 0xe0e0e0, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xe0e0e0, 0x3e3e3e, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, - 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, - 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, - 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, - 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, - 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, - 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, - 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, - 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff, 0xffffff -}; - -#define FLAT_CONTROLS_CLOSE_HEIGHT 24 -#define FLAT_CONTROLS_CLOSE_WIDTH 44 - -// array size is 3168 -static inline const unsigned int zka_flat_controls_active[] = { - 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, - 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, - 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, - 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, - 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, - 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, - 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, - 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, - 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xfac7c7, 0xee3636, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xee3535, 0xfac7c7, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, - 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xee3535, 0xfac7c7, 0xee3636, 0xeb1616, 0xeb1616, 0xee3535, 0xfac7c7, 0xee3636, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, - 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xee3535, 0xfac7c7, 0xee3636, 0xee3535, 0xfac7c7, 0xee3636, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, - 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xee3535, 0xfac7c7, 0xfac7c7, 0xee3636, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, - 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xee3535, 0xfac7c7, 0xfac7c7, 0xee3636, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, - 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xee3535, 0xfac7c7, 0xee3636, 0xee3535, 0xfac7c7, 0xee3636, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, - 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xee3535, 0xfac7c7, 0xee3636, 0xeb1616, 0xeb1616, 0xee3535, 0xfac7c7, 0xee3636, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, - 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xfac7c7, 0xee3636, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xee3535, 0xfac7c7, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, - 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, - 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, - 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, - 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, - 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, - 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, - 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, - 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616, 0xeb1616 -}; diff --git a/dev/Modules/GfxMgr/Rsrc/Cursor.rsrc b/dev/Modules/GfxMgr/Rsrc/Cursor.rsrc deleted file mode 100644 index 2283cb32..00000000 --- a/dev/Modules/GfxMgr/Rsrc/Cursor.rsrc +++ /dev/null @@ -1,64 +0,0 @@ -#define cCurHeight (57) -#define cCurWidth (53) - -#define cCurLength (3021) - -static const unsigned int Cursor[cCurLength] = { - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x0e0e0e, 0x474747, 0x474747, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x0e0e0e, 0x969696, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xdedede, 0x363636, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x969696, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xececec, 0x0e0e0e, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x222222, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x878787, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x474747, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xc2c2c2, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x363636, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x0e0e0e, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0xebebeb, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x474747, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0xa5a5a5, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x979797, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x686868, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xdedede, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x222222, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x0e0e0e, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0xdedede, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x686868, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x969696, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xa5a5a5, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x585858, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xececec, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x0e0e0e, 0x585858, 0x222222, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x0e0e0e, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x363636, 0x000000, 0x000000, 0x000000, 0x686868, 0xebebeb, 0xf9f9f9, 0x969696, 0x000000, 0x000000, 0x000000, 0x222222, 0xdedede, 0xf9f9f9, 0xdedede, 0x0e0e0e, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0xc2c2c2, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x787878, 0x000000, 0x000000, 0x000000, 0xdedede, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x787878, 0x000000, 0x000000, 0x474747, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x575757, 0x000000, 0x000000, 0x000000, 0x000000, 0x222222, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x878787, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xc2c2c2, 0x000000, 0x000000, 0x222222, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xc2c2c2, 0x000000, 0x000000, 0x0e0e0e, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x979797, 0x000000, 0x000000, 0x000000, 0x969696, 0xf9f9f9, 0xdedede, 0x0e0e0e, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x474747, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xececec, 0x000000, 0x000000, 0x000000, 0xdedede, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xececec, 0x0e0e0e, 0x000000, 0x000000, 0xdedede, 0xf9f9f9, 0xf9f9f9, 0xdedede, 0x000000, 0x000000, 0x000000, 0xdedede, 0xf9f9f9, 0xf9f9f9, 0x575757, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0xebebeb, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x474747, 0x000000, 0x000000, 0x969696, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x474747, 0x000000, 0x000000, 0x969696, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x222222, 0x000000, 0x000000, 0xc2c2c2, 0xf9f9f9, 0xf9f9f9, 0x979797, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0xc2c2c2, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x878787, 0x000000, 0x000000, 0x585858, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x979797, 0x000000, 0x000000, 0x474747, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x686868, 0x000000, 0x000000, 0x777777, 0xf9f9f9, 0xf9f9f9, 0xdedede, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x0e0e0e, 0x474747, 0x474747, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x777777, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xc2c2c2, 0x000000, 0x000000, 0x0e0e0e, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xcfcfcf, 0x000000, 0x000000, 0x0e0e0e, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xa5a5a5, 0x000000, 0x000000, 0x363636, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x222222, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x0e0e0e, 0xb3b3b3, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xdedede, 0x686868, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x363636, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x0e0e0e, 0x000000, 0x000000, 0xc2c2c2, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x0e0e0e, 0x000000, 0x000000, 0xc2c2c2, 0xf9f9f9, 0xf9f9f9, 0xececec, 0x222222, 0x222222, 0x363636, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x787878, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0xc2c2c2, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xdedede, 0x222222, 0x000000, 0x000000, 0x000000, 0x000000, 0xebebeb, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x979797, 0x686868, 0x686868, 0xcfcfcf, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xcfcfcf, 0xd0d0d0, 0xdedede, 0xebebeb, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xa5a5a5, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x474747, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xa5a5a5, 0x222222, 0x000000, 0x000000, 0xa5a5a5, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xececec, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x878787, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x787878, 0x000000, 0x000000, 0x686868, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x474747, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x878787, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xc2c2c2, 0x000000, 0x000000, 0x0e0e0e, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x787878, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x474747, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xececec, 0x0e0e0e, 0x000000, 0x000000, 0xdedede, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x222222, 0x222222, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x222222, 0x222222, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xc2c2c2, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0xc2c2c2, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x474747, 0x000000, 0x000000, 0x969696, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x0e0e0e, 0x000000, 0xc2c2c2, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x0e0e0e, 0x000000, 0xc2c2c2, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xececec, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x222222, 0xdedede, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x979797, 0x000000, 0x000000, 0x474747, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x878787, 0x000000, 0x474747, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x787878, 0x000000, 0x878787, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x0e0e0e, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x878787, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xcfcfcf, 0x000000, 0x000000, 0x585858, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xececec, 0x000000, 0x000000, 0xebebeb, 0xf9f9f9, 0xf9f9f9, 0xc2c2c2, 0x000000, 0x363636, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x222222, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x222222, 0xdedede, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x0e0e0e, 0x686868, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x222222, 0x222222, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x474747, 0x000000, 0x878787, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x0e0e0e, 0x000000, 0xdedede, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x474747, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x969696, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xd0d0d0, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x0e0e0e, 0x000000, 0xc2c2c2, 0xf9f9f9, 0xf9f9f9, 0xc2c2c2, 0x000000, 0x0e0e0e, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x686868, 0x000000, 0x969696, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x474747, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x474747, 0xdedede, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x878787, 0x000000, 0x585858, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x0e0e0e, 0x000000, 0xc2c2c2, 0xf9f9f9, 0xf9f9f9, 0xb3b3b3, 0x000000, 0x474747, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x222222, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x222222, 0xa5a5a5, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xececec, 0x000000, 0x0e0e0e, 0xebebeb, 0xf9f9f9, 0xf9f9f9, 0x878787, 0x000000, 0x474747, 0xf9f9f9, 0xf9f9f9, 0xececec, 0x0e0e0e, 0x000000, 0xebebeb, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x686868, 0xdedede, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x474747, 0x000000, 0x969696, 0xf9f9f9, 0xf9f9f9, 0xececec, 0x000000, 0x000000, 0xebebeb, 0xf9f9f9, 0xf9f9f9, 0x474747, 0x000000, 0x969696, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xcfcfcf, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x222222, 0xc2c2c2, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xb3b3b3, 0x000000, 0x474747, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x474747, 0x000000, 0x878787, 0xf9f9f9, 0xf9f9f9, 0x979797, 0x000000, 0x474747, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xa5a5a5, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x878787, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xececec, 0x0e0e0e, 0x000000, 0xc2c2c2, 0xf9f9f9, 0xf9f9f9, 0xc2c2c2, 0x000000, 0x0e0e0e, 0xf9f9f9, 0xf9f9f9, 0xececec, 0x000000, 0x0e0e0e, 0xebebeb, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x686868, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x878787, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x787878, 0x000000, 0x777777, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x0e0e0e, 0x000000, 0xc2c2c2, 0xf9f9f9, 0xf9f9f9, 0x474747, 0x000000, 0xb4b4b4, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xececec, 0x0e0e0e, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x0e0e0e, 0xebebeb, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xc2c2c2, 0x000000, 0x0e0e0e, 0xebebeb, 0xf9f9f9, 0xf9f9f9, 0x878787, 0x000000, 0x474747, 0xf9f9f9, 0xf9f9f9, 0x979797, 0x000000, 0x686868, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xa5a5a5, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x878787, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x474747, 0x000000, 0xb4b4b4, 0xf9f9f9, 0xf9f9f9, 0xececec, 0x000000, 0x000000, 0xebebeb, 0xf9f9f9, 0xdedede, 0x000000, 0x0e0e0e, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x686868, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0xcfcfcf, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x979797, 0x000000, 0x474747, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x474747, 0x000000, 0x878787, 0xf9f9f9, 0xf9f9f9, 0x363636, 0x000000, 0xc2c2c2, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x878787, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x222222, 0xdedede, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xececec, 0x0e0e0e, 0x000000, 0xebebeb, 0xf9f9f9, 0xf9f9f9, 0xc2c2c2, 0x000000, 0x0e0e0e, 0xf9f9f9, 0xf9f9f9, 0x878787, 0x000000, 0x777777, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xa5a5a5, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x343434, 0xebebeb, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x575757, 0x000000, 0x878787, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x222222, 0x222222, 0xf9f9f9, 0xf9f9f9, 0xc2c2c2, 0x000000, 0x0e0e0e, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xb3b3b3, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x343434, 0xdedede, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xc2c2c2, 0x000000, 0x0e0e0e, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x222222, 0x222222, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xc2c2c2, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x222222, 0xdedede, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x222222, 0x222222, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xc2c2c2, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x686868, 0xdedede, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x686868, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x777777, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xdedede, 0x222222, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0xcfcfcf, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0x585858, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x222222, 0xc2c2c2, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xf9f9f9, 0xebebeb, 0x585858, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x474747, 0x878787, 0xa5a5a5, 0xa5a5a5, 0xa5a5a5, 0xa5a5a5, 0xa5a5a5, 0xa5a5a5, 0xa5a5a5, 0xa5a5a5, 0xa5a5a5, 0xa5a5a5, 0xa5a5a5, 0x979797, 0x686868, 0x0e0e0e, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, - 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000 -}; diff --git a/dev/Usr/.keepme b/dev/Usr/.keepme new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/dev/Usr/.keepme diff --git a/dev/Usr/External/.gitkeep b/dev/Usr/External/.gitkeep new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/dev/Usr/External/.gitkeep diff --git a/dev/CompressKit/API.h b/dev/Usr/LibCompress/API.h index 47e568db..601753a0 100644 --- a/dev/CompressKit/API.h +++ b/dev/Usr/LibCompress/API.h @@ -7,8 +7,8 @@ #ifndef COMPRESSKIT_RLE_H #define COMPRESSKIT_RLE_H -#include <NewKit/Defines.h> -// #include <CompressKit/Exports.h> +#include <External/Defines.h> +// #include <LibCompress/Exports.h> namespace Kernel { diff --git a/dev/CompressKit/CKCompress.s b/dev/Usr/LibCompress/LCCompress.s index 2f12bf22..2f12bf22 100644 --- a/dev/CompressKit/CKCompress.s +++ b/dev/Usr/LibCompress/LCCompress.s diff --git a/dev/CompressKit/CKDecompress.s b/dev/Usr/LibCompress/LCDecompress.s index 2f12bf22..2f12bf22 100644 --- a/dev/CompressKit/CKDecompress.s +++ b/dev/Usr/LibCompress/LCDecompress.s diff --git a/dev/Usr/LibGUI/.keepme b/dev/Usr/LibGUI/.keepme new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/dev/Usr/LibGUI/.keepme diff --git a/dev/Usr/LibSystem/.keepme b/dev/Usr/LibSystem/.keepme new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/dev/Usr/LibSystem/.keepme |
