summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--.vscode/c_cpp_properties.json6
-rw-r--r--Private/Builtins/AHCI/Defines.hxx1
-rw-r--r--Private/Builtins/HPET/Defines.hxx (renamed from Private/Builtins/HPET/HPET.hxx)0
-rw-r--r--Private/Builtins/MBCI/Defines.hxx6
4 files changed, 8 insertions, 5 deletions
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index c6d63a65..fd85ea9f 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -15,7 +15,8 @@
"__HAVE_MAHROUSS_APIS__",
"__FSKIT_NEWFS__",
"__EFI_x86_64__",
- "__ATA_PIO__"
+ "__ATA_PIO__",
+ "__NEWOS_AMD64__"
],
"cStandard": "c17",
"cppStandard": "c++20",
@@ -47,7 +48,8 @@
"__HAVE_MAHROUSS_APIS__",
"__FSKIT_NEWFS__",
"__EFI_x86_64__",
- "__ATA_PIO__"
+ "__ATA_PIO__",
+ "__NEWOS_AMD64__"
],
"cStandard": "c17",
"cppStandard": "c++20",
diff --git a/Private/Builtins/AHCI/Defines.hxx b/Private/Builtins/AHCI/Defines.hxx
index afec2778..3af3cd4c 100644
--- a/Private/Builtins/AHCI/Defines.hxx
+++ b/Private/Builtins/AHCI/Defines.hxx
@@ -14,6 +14,7 @@
#pragma once
#include <NewKit/Defines.hpp>
+#include <Builtins/ACPI/ACPI.hxx>
// Forward declarations of structs.
diff --git a/Private/Builtins/HPET/HPET.hxx b/Private/Builtins/HPET/Defines.hxx
index a2c91af8..a2c91af8 100644
--- a/Private/Builtins/HPET/HPET.hxx
+++ b/Private/Builtins/HPET/Defines.hxx
diff --git a/Private/Builtins/MBCI/Defines.hxx b/Private/Builtins/MBCI/Defines.hxx
index 817c6f56..18b73ddf 100644
--- a/Private/Builtins/MBCI/Defines.hxx
+++ b/Private/Builtins/MBCI/Defines.hxx
@@ -7,8 +7,7 @@
#pragma once
#include <NewKit/Defines.hpp>
-
-#define kMBCIHostMagic "MBCI"
+#include <Builtins/ACPI/ACPI.hxx>
namespace NewOS {
struct MBCIHostInterface;
@@ -22,7 +21,6 @@ struct MBCIHostInterface final {
UInt64 BaseAddressRegister;
UInt64 DeviceSize;
UInt8 MemoryType;
- UInt8 Magic[4];
UInt8 HostType;
UInt8 HostFlags;
};
@@ -36,4 +34,6 @@ enum MBCIHostFlags {
kMBCIHostFlagsSupportsDMA, /// Has DMA.
kMBCIHostFlagsCount,
};
+
+MBCIHostInterface* drv_get_mbi_host(void);
} // namespace NewOS