Development

CMakeLists.txt

@@ -217,7 +217,7 @@ add_custom_target(extra-img
         COMMAND ${QEMU_IMG} create -f raw VirtioDisk.img 128M
         COMMAND ${MKFS_EXT2} VirtioDisk.img
         COMMAND ${QEMU_IMG} create -f raw SataDisk.img 128M
-        COMMAND ${MKFS_FAT} -F12 SataDisk.img
+        COMMAND ${MKFS_EXT2} SataDisk.img
         COMMAND ${QEMU_IMG} create -f raw NVMeDisk.img 256M
         COMMAND ${MKFS_EXT2} NVMeDisk.img
         COMMENT "Creating extra disk images"

drivers/ACPI.c

@@ -2,6 +2,7 @@
 #include "Console.h"
 #include "Io.h"
 #include "MemOps.h"
+#include "NVMe.h"
 #include "Scheduler.h"
 #include "StringOps.h"
 #include "VMem.h"
@@ -153,6 +154,10 @@ void ACPIResetProcedure() {
     PrintKernel("ACPI: Stopping all processes and services...\n");
     KillAllProcess("SHUTDOWN");
     PrintKernelSuccess("ACPI: All processes and services stopped\n");
+
+    PrintKernel("ACPI: Stopping NVMe driver...\n");
+    NVMe_Shutdown();
+    PrintKernelSuccess("ACPI: NVMe driver stopped\n");
 }
 
 void ACPIShutdown(void) {

drivers/ACPI.h

@@ -83,4 +83,5 @@ typedef struct {
 bool ACPIInit(void);
 void ACPIShutdown(void);
 void ACPIReboot(void);
-void* AcpiFindTable(const char* signature);
+void* AcpiFindTable(const char* signature);
+void ACPIResetProcedure(void);

drivers/TSC.c

@@ -33,6 +33,11 @@ void TSCInit(void) {
     PrintKernelF("TSC: Calibrated frequency: %llu Hz\n", tsc_freq_hz);
 }
 
+uint64_t GetTimeInMs(void) {
+    if (!tsc_calibrated) return 0;
+    return (rdtsc() * 1000) / tsc_freq_hz;
+}
+
 void delay_us(uint32_t microseconds) {
     if (!tsc_calibrated) return;
 

drivers/TSC.h

@@ -3,6 +3,7 @@
 
 void TSCInit(void);
 
+uint64_t GetTimeInMs(void);
 void delay_us(uint32_t microseconds);
 void delay(uint32_t milliseconds);
 void delay_s(uint32_t seconds);