diff options
| -rw-r--r-- | Boot/Modules/NetBoot/manifest.json | 2 | ||||
| -rw-r--r-- | Boot/Sources/HEL/AMD64/Support.cxx | 6 | ||||
| -rw-r--r-- | Boot/Sources/Root/ZETA/BootLoader-Load.webm | bin | 22081 -> 0 bytes | |||
| -rw-r--r-- | Boot/Sources/Root/ZETA/fonts.json | 4 | ||||
| -rw-r--r-- | Boot/Sources/Root/ZKA/Urbanist-Black.ttf (renamed from Boot/Sources/Root/ZETA/Urbanist-Black.ttf) | bin | 42784 -> 42784 bytes | |||
| -rw-r--r-- | Boot/Sources/Root/ZKA/Urbanist-BlackItalic.ttf (renamed from Boot/Sources/Root/ZETA/Urbanist-BlackItalic.ttf) | bin | 44084 -> 44084 bytes | |||
| -rw-r--r-- | Boot/Sources/Root/ZKA/Urbanist-Bold.ttf (renamed from Boot/Sources/Root/ZETA/Urbanist-Bold.ttf) | bin | 42636 -> 42636 bytes | |||
| -rw-r--r-- | Boot/Sources/Root/ZKA/Urbanist-BoldItalic.ttf (renamed from Boot/Sources/Root/ZETA/Urbanist-BoldItalic.ttf) | bin | 43900 -> 43900 bytes | |||
| -rw-r--r-- | Boot/Sources/Root/ZKA/Urbanist-ExtraBold.ttf (renamed from Boot/Sources/Root/ZETA/Urbanist-ExtraBold.ttf) | bin | 42908 -> 42908 bytes | |||
| -rw-r--r-- | Boot/Sources/Root/ZKA/Urbanist-ExtraBoldItalic.ttf (renamed from Boot/Sources/Root/ZETA/Urbanist-ExtraBoldItalic.ttf) | bin | 44208 -> 44208 bytes | |||
| -rw-r--r-- | Boot/Sources/Root/ZKA/Urbanist-ExtraLight.ttf (renamed from Boot/Sources/Root/ZETA/Urbanist-ExtraLight.ttf) | bin | 42792 -> 42792 bytes | |||
| -rw-r--r-- | Boot/Sources/Root/ZKA/Urbanist-ExtraLightItalic.ttf (renamed from Boot/Sources/Root/ZETA/Urbanist-ExtraLightItalic.ttf) | bin | 44104 -> 44104 bytes | |||
| -rw-r--r-- | Boot/Sources/Root/ZKA/Urbanist-Italic.ttf (renamed from Boot/Sources/Root/ZETA/Urbanist-Italic.ttf) | bin | 43996 -> 43996 bytes | |||
| -rw-r--r-- | Boot/Sources/Root/ZKA/Urbanist-Light.ttf (renamed from Boot/Sources/Root/ZETA/Urbanist-Light.ttf) | bin | 42764 -> 42764 bytes | |||
| -rw-r--r-- | Boot/Sources/Root/ZKA/Urbanist-LightItalic.ttf (renamed from Boot/Sources/Root/ZETA/Urbanist-LightItalic.ttf) | bin | 44052 -> 44052 bytes | |||
| -rw-r--r-- | Boot/Sources/Root/ZKA/Urbanist-Medium.ttf (renamed from Boot/Sources/Root/ZETA/Urbanist-Medium.ttf) | bin | 42752 -> 42752 bytes | |||
| -rw-r--r-- | Boot/Sources/Root/ZKA/Urbanist-MediumItalic.ttf (renamed from Boot/Sources/Root/ZETA/Urbanist-MediumItalic.ttf) | bin | 44080 -> 44080 bytes | |||
| -rw-r--r-- | Boot/Sources/Root/ZKA/Urbanist-Regular.ttf (renamed from Boot/Sources/Root/ZETA/Urbanist-Regular.ttf) | bin | 42704 -> 42704 bytes | |||
| -rw-r--r-- | Boot/Sources/Root/ZKA/Urbanist-SemiBold.ttf (renamed from Boot/Sources/Root/ZETA/Urbanist-SemiBold.ttf) | bin | 42740 -> 42740 bytes | |||
| -rw-r--r-- | Boot/Sources/Root/ZKA/Urbanist-SemiBoldItalic.ttf (renamed from Boot/Sources/Root/ZETA/Urbanist-SemiBoldItalic.ttf) | bin | 44088 -> 44088 bytes | |||
| -rw-r--r-- | Boot/Sources/Root/ZKA/Urbanist-Thin.ttf (renamed from Boot/Sources/Root/ZETA/Urbanist-Thin.ttf) | bin | 42580 -> 42580 bytes | |||
| -rw-r--r-- | Boot/Sources/Root/ZKA/Urbanist-ThinItalic.ttf (renamed from Boot/Sources/Root/ZETA/Urbanist-ThinItalic.ttf) | bin | 43868 -> 43868 bytes | |||
| -rw-r--r-- | Boot/Sources/Root/ZKA/fonts.json | 4 | ||||
| -rw-r--r-- | Boot/amd64-efi.make | 4 | ||||
| -rw-r--r-- | DDKit/source_deploy.xml | 4 | ||||
| -rw-r--r-- | Meta/OS-Design.drawio | 20 |
26 files changed, 28 insertions, 16 deletions
diff --git a/Boot/Modules/NetBoot/manifest.json b/Boot/Modules/NetBoot/manifest.json index 708c451e..bb3a509e 100644 --- a/Boot/Modules/NetBoot/manifest.json +++ b/Boot/Modules/NetBoot/manifest.json @@ -1,4 +1,4 @@ { "pluginName": "NetBoot", - "description": "Over the Air update module." + "description": "Boot NewOS from a network volume." } diff --git a/Boot/Sources/HEL/AMD64/Support.cxx b/Boot/Sources/HEL/AMD64/Support.cxx index a2ac6394..eb6f54df 100644 --- a/Boot/Sources/HEL/AMD64/Support.cxx +++ b/Boot/Sources/HEL/AMD64/Support.cxx @@ -14,6 +14,12 @@ #ifdef __STANDALONE__ +EXTERN_C void __cxa_pure_virtual() +{ + BTextWriter writer; + writer.Write("newosldr: Placeholder.\r"); +} + /// @brief memset definition in C++. /// @param dst destination pointer. /// @param byte value to fill in. diff --git a/Boot/Sources/Root/ZETA/BootLoader-Load.webm b/Boot/Sources/Root/ZETA/BootLoader-Load.webm Binary files differdeleted file mode 100644 index 84b5e749..00000000 --- a/Boot/Sources/Root/ZETA/BootLoader-Load.webm +++ /dev/null diff --git a/Boot/Sources/Root/ZETA/fonts.json b/Boot/Sources/Root/ZETA/fonts.json deleted file mode 100644 index de0425a1..00000000 --- a/Boot/Sources/Root/ZETA/fonts.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "font_ext": ".ttf", - "src_dir": "ZETA" -} diff --git a/Boot/Sources/Root/ZETA/Urbanist-Black.ttf b/Boot/Sources/Root/ZKA/Urbanist-Black.ttf Binary files differindex e1ec32b3..e1ec32b3 100644 --- a/Boot/Sources/Root/ZETA/Urbanist-Black.ttf +++ b/Boot/Sources/Root/ZKA/Urbanist-Black.ttf diff --git a/Boot/Sources/Root/ZETA/Urbanist-BlackItalic.ttf b/Boot/Sources/Root/ZKA/Urbanist-BlackItalic.ttf Binary files differindex 85323c97..85323c97 100644 --- a/Boot/Sources/Root/ZETA/Urbanist-BlackItalic.ttf +++ b/Boot/Sources/Root/ZKA/Urbanist-BlackItalic.ttf diff --git a/Boot/Sources/Root/ZETA/Urbanist-Bold.ttf b/Boot/Sources/Root/ZKA/Urbanist-Bold.ttf Binary files differindex 330e84f9..330e84f9 100644 --- a/Boot/Sources/Root/ZETA/Urbanist-Bold.ttf +++ b/Boot/Sources/Root/ZKA/Urbanist-Bold.ttf diff --git a/Boot/Sources/Root/ZETA/Urbanist-BoldItalic.ttf b/Boot/Sources/Root/ZKA/Urbanist-BoldItalic.ttf Binary files differindex 08d47a8a..08d47a8a 100644 --- a/Boot/Sources/Root/ZETA/Urbanist-BoldItalic.ttf +++ b/Boot/Sources/Root/ZKA/Urbanist-BoldItalic.ttf diff --git a/Boot/Sources/Root/ZETA/Urbanist-ExtraBold.ttf b/Boot/Sources/Root/ZKA/Urbanist-ExtraBold.ttf Binary files differindex 7971b6db..7971b6db 100644 --- a/Boot/Sources/Root/ZETA/Urbanist-ExtraBold.ttf +++ b/Boot/Sources/Root/ZKA/Urbanist-ExtraBold.ttf diff --git a/Boot/Sources/Root/ZETA/Urbanist-ExtraBoldItalic.ttf b/Boot/Sources/Root/ZKA/Urbanist-ExtraBoldItalic.ttf Binary files differindex 050297e2..050297e2 100644 --- a/Boot/Sources/Root/ZETA/Urbanist-ExtraBoldItalic.ttf +++ b/Boot/Sources/Root/ZKA/Urbanist-ExtraBoldItalic.ttf diff --git a/Boot/Sources/Root/ZETA/Urbanist-ExtraLight.ttf b/Boot/Sources/Root/ZKA/Urbanist-ExtraLight.ttf Binary files differindex a20a0bf9..a20a0bf9 100644 --- a/Boot/Sources/Root/ZETA/Urbanist-ExtraLight.ttf +++ b/Boot/Sources/Root/ZKA/Urbanist-ExtraLight.ttf diff --git a/Boot/Sources/Root/ZETA/Urbanist-ExtraLightItalic.ttf b/Boot/Sources/Root/ZKA/Urbanist-ExtraLightItalic.ttf Binary files differindex 68968472..68968472 100644 --- a/Boot/Sources/Root/ZETA/Urbanist-ExtraLightItalic.ttf +++ b/Boot/Sources/Root/ZKA/Urbanist-ExtraLightItalic.ttf diff --git a/Boot/Sources/Root/ZETA/Urbanist-Italic.ttf b/Boot/Sources/Root/ZKA/Urbanist-Italic.ttf Binary files differindex 79688a6c..79688a6c 100644 --- a/Boot/Sources/Root/ZETA/Urbanist-Italic.ttf +++ b/Boot/Sources/Root/ZKA/Urbanist-Italic.ttf diff --git a/Boot/Sources/Root/ZETA/Urbanist-Light.ttf b/Boot/Sources/Root/ZKA/Urbanist-Light.ttf Binary files differindex 59034000..59034000 100644 --- a/Boot/Sources/Root/ZETA/Urbanist-Light.ttf +++ b/Boot/Sources/Root/ZKA/Urbanist-Light.ttf diff --git a/Boot/Sources/Root/ZETA/Urbanist-LightItalic.ttf b/Boot/Sources/Root/ZKA/Urbanist-LightItalic.ttf Binary files differindex 1a455ce2..1a455ce2 100644 --- a/Boot/Sources/Root/ZETA/Urbanist-LightItalic.ttf +++ b/Boot/Sources/Root/ZKA/Urbanist-LightItalic.ttf diff --git a/Boot/Sources/Root/ZETA/Urbanist-Medium.ttf b/Boot/Sources/Root/ZKA/Urbanist-Medium.ttf Binary files differindex e9a6dbb0..e9a6dbb0 100644 --- a/Boot/Sources/Root/ZETA/Urbanist-Medium.ttf +++ b/Boot/Sources/Root/ZKA/Urbanist-Medium.ttf diff --git a/Boot/Sources/Root/ZETA/Urbanist-MediumItalic.ttf b/Boot/Sources/Root/ZKA/Urbanist-MediumItalic.ttf Binary files differindex 44a9c897..44a9c897 100644 --- a/Boot/Sources/Root/ZETA/Urbanist-MediumItalic.ttf +++ b/Boot/Sources/Root/ZKA/Urbanist-MediumItalic.ttf diff --git a/Boot/Sources/Root/ZETA/Urbanist-Regular.ttf b/Boot/Sources/Root/ZKA/Urbanist-Regular.ttf Binary files differindex 2a794b27..2a794b27 100644 --- a/Boot/Sources/Root/ZETA/Urbanist-Regular.ttf +++ b/Boot/Sources/Root/ZKA/Urbanist-Regular.ttf diff --git a/Boot/Sources/Root/ZETA/Urbanist-SemiBold.ttf b/Boot/Sources/Root/ZKA/Urbanist-SemiBold.ttf Binary files differindex 6d393d1c..6d393d1c 100644 --- a/Boot/Sources/Root/ZETA/Urbanist-SemiBold.ttf +++ b/Boot/Sources/Root/ZKA/Urbanist-SemiBold.ttf diff --git a/Boot/Sources/Root/ZETA/Urbanist-SemiBoldItalic.ttf b/Boot/Sources/Root/ZKA/Urbanist-SemiBoldItalic.ttf Binary files differindex 327aa044..327aa044 100644 --- a/Boot/Sources/Root/ZETA/Urbanist-SemiBoldItalic.ttf +++ b/Boot/Sources/Root/ZKA/Urbanist-SemiBoldItalic.ttf diff --git a/Boot/Sources/Root/ZETA/Urbanist-Thin.ttf b/Boot/Sources/Root/ZKA/Urbanist-Thin.ttf Binary files differindex 9e272162..9e272162 100644 --- a/Boot/Sources/Root/ZETA/Urbanist-Thin.ttf +++ b/Boot/Sources/Root/ZKA/Urbanist-Thin.ttf diff --git a/Boot/Sources/Root/ZETA/Urbanist-ThinItalic.ttf b/Boot/Sources/Root/ZKA/Urbanist-ThinItalic.ttf Binary files differindex 5cf054f1..5cf054f1 100644 --- a/Boot/Sources/Root/ZETA/Urbanist-ThinItalic.ttf +++ b/Boot/Sources/Root/ZKA/Urbanist-ThinItalic.ttf diff --git a/Boot/Sources/Root/ZKA/fonts.json b/Boot/Sources/Root/ZKA/fonts.json new file mode 100644 index 00000000..e804c2e7 --- /dev/null +++ b/Boot/Sources/Root/ZKA/fonts.json @@ -0,0 +1,4 @@ +{ + "font_pkg_src": "*.ttf", + "font_pkg_name": "ZKA Fonts." +} diff --git a/Boot/amd64-efi.make b/Boot/amd64-efi.make index 49d2ae59..b866e650 100644 --- a/Boot/amd64-efi.make +++ b/Boot/amd64-efi.make @@ -51,6 +51,8 @@ FLAG_GNU=-fshort-wchar -D__EFI_x86_64__ -D__NEWOS_OTA__ -mno-red-zone -D__KERNEL BOOT_LOADER=newosldr.exe KERNEL=newoskrnl.exe +DDK=libDDK.lib +SCI=libSCI.lib .PHONY: invalid-recipe invalid-recipe: @@ -63,6 +65,8 @@ all: compile-amd64 $(COPY) Sources/$(BOOT_LOADER) Sources/Root/EFI/BOOT/BOOTX64.EFI $(COPY) Sources/$(BOOT_LOADER) Sources/Root/EFI/BOOT/NEWBOOT.EFI $(COPY) ../Kernel/$(KERNEL) Sources/Root/$(KERNEL) + $(COPY) ../SCIKit/$(SCI) Sources/Root/$(SCI) + $(COPY) ../DDKit/$(DDK) Sources/Root/$(DDK) $(COPY) Sources/$(BOOT_LOADER) Sources/Root/$(BOOT_LOADER) ifneq ($(DEBUG_SUPPORT), ) diff --git a/DDKit/source_deploy.xml b/DDKit/source_deploy.xml index 6a03fdf8..3d2325a8 100644 --- a/DDKit/source_deploy.xml +++ b/DDKit/source_deploy.xml @@ -1,5 +1,7 @@ <SourceDeploy>
<HiddenFiles>
- <SourceFile>*.cxx, *.c, *.S</SourceFile>
+ <SourceFile>*.cxx</SourceFile>
+ <SourceFile>*.c</SourceFile>
+ <SourceFile>*.S</SourceFile>
</HiddenFiles>
</SourceDeploy>
diff --git a/Meta/OS-Design.drawio b/Meta/OS-Design.drawio index 46863670..0c6f4696 100644 --- a/Meta/OS-Design.drawio +++ b/Meta/OS-Design.drawio @@ -1,30 +1,30 @@ <mxfile host="65bd71144e"> <diagram name="Page-1" id="lDkK2i6CeL2VbSOVDvrP"> - <mxGraphModel dx="1356" dy="558" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0"> + <mxGraphModel dx="746" dy="307" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0"> <root> <mxCell id="0"/> <mxCell id="1" parent="0"/> - <mxCell id="ifhO3zQZNW-sXvZMTmu8-1" value="DDKit Hooks" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1"> - <mxGeometry x="234" y="450" width="360" height="60" as="geometry"/> - </mxCell> - <mxCell id="ifhO3zQZNW-sXvZMTmu8-2" value="SCIKit and SCM" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1"> + <mxCell id="ifhO3zQZNW-sXvZMTmu8-2" value="SCIKit" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1"> <mxGeometry x="235.5" y="340" width="360" height="30" as="geometry"/> </mxCell> <mxCell id="ifhO3zQZNW-sXvZMTmu8-3" value="FoundationKit, AnimationKit, GraphicsKit" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1"> - <mxGeometry x="235.5" y="295" width="360" height="30" as="geometry"/> + <mxGeometry x="235.5" y="295" width="360" height="35" as="geometry"/> </mxCell> <mxCell id="ifhO3zQZNW-sXvZMTmu8-8" value="<h1 style="margin-top: 0px;">System layer.</h1><p>This layer describes the kernel and it's API, which makes the Zeta OS.</p>" style="text;html=1;whiteSpace=wrap;overflow=hidden;rounded=0;" parent="1" vertex="1"> <mxGeometry x="610" y="440" width="180" height="120" as="geometry"/> </mxCell> - <mxCell id="ifhO3zQZNW-sXvZMTmu8-13" value="NewOS MP Kernel" style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1"> - <mxGeometry x="235.5" y="520" width="360" height="60" as="geometry"/> + <mxCell id="ifhO3zQZNW-sXvZMTmu8-13" value="NewOS MP Kernel, DDKit&nbsp;DLL and installed drivers." style="rounded=0;whiteSpace=wrap;html=1;" parent="1" vertex="1"> + <mxGeometry x="235.5" y="450" width="360" height="60" as="geometry"/> </mxCell> - <mxCell id="2" value="<h1 style="margin-top: 0px;">User layer</h1><div>This layer is located on user space, it is containing all of the users frameworks, SCI and SCM objects.</div>" style="text;html=1;whiteSpace=wrap;overflow=hidden;rounded=0;" vertex="1" parent="1"> + <mxCell id="2" value="<h1 style="margin-top: 0px;">User layer</h1><div>This layer is located on user space, it is containing all of the users frameworks, SCI and SCM objects.</div>" style="text;html=1;whiteSpace=wrap;overflow=hidden;rounded=0;" parent="1" vertex="1"> <mxGeometry x="610" y="290" width="180" height="120" as="geometry"/> </mxCell> - <mxCell id="3" value="<h1 style="margin-top: 0px;">NewOS</h1><div>NewOS is an interesting piece</div><div>of engineering, designed to be mutli-user and multi tasked, it perfectly suits that need. And gives a neat API to work on.</div>" style="text;html=1;whiteSpace=wrap;overflow=hidden;rounded=0;" vertex="1" parent="1"> + <mxCell id="3" value="<h1 style="margin-top: 0px;">NewOS</h1><div>NewOS is an interesting piece</div><div>of engineering, designed to be mutli-user and multi tasked, it perfectly suits that need. And gives a neat API to work on.</div>" style="text;html=1;whiteSpace=wrap;overflow=hidden;rounded=0;" parent="1" vertex="1"> <mxGeometry x="90" y="80" width="180" height="130" as="geometry"/> </mxCell> + <mxCell id="4" value="Subsystems (Security, Native)" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1"> + <mxGeometry x="235.5" y="380" width="360" height="60" as="geometry"/> + </mxCell> </root> </mxGraphModel> </diagram> |
