Kernel: Apply changes to use LibBareMetal definitions

luteresa · Feb 9, 2020 · e559af2 · e559af2
1 parent 7c507c2
commit e559af2
Show file tree

Hide file tree

Showing 43 changed files with 84 additions and 892 deletions.
diff --git a/Kernel/ACPI/ACPIStaticParser.cpp b/Kernel/ACPI/ACPIStaticParser.cpp
@@ -25,9 +25,9 @@
  */
 
 #include <Kernel/ACPI/ACPIStaticParser.h>
-#include <Kernel/IO.h>
-#include <Kernel/StdLib.h>
 #include <Kernel/VM/MemoryManager.h>
+#include <LibBareMetal/IO.h>
+#include <LibBareMetal/StdLib.h>
 
 //#define ACPI_DEBUG
 

diff --git a/Kernel/ACPI/DMIDecoder.cpp b/Kernel/ACPI/DMIDecoder.cpp
@@ -25,8 +25,8 @@
  */
 
 #include <Kernel/ACPI/DMIDecoder.h>
-#include <Kernel/StdLib.h>
 #include <Kernel/VM/MemoryManager.h>
+#include <LibBareMetal/StdLib.h>
 
 static DMIDecoder* s_dmi_decoder;
 

diff --git a/Kernel/Arch/i386/APIC.cpp b/Kernel/Arch/i386/APIC.cpp
@@ -26,10 +26,10 @@
 
 #include <AK/Assertions.h>
 #include <AK/Types.h>
-#include <Kernel/Arch/i386/CPU.h>
 #include <Kernel/Arch/i386/APIC.h>
-#include <Kernel/IO.h>
+#include <Kernel/Arch/i386/CPU.h>
 #include <Kernel/VM/MemoryManager.h>
+#include <LibBareMetal/IO.h>
 
 #define IRQ_APIC_SPURIOUS 0x1f
 
@@ -56,44 +56,39 @@ asm(
 
 namespace APIC {
 
-class ICRReg
-{
- u32 m_reg{0};
+class ICRReg {
+ u32 m_reg { 0 };
+
 public:
- enum DeliveryMode
- {
+ enum DeliveryMode {
  Fixed = 0x0,
  LowPriority = 0x1,
  SMI = 0x2,
  NMI = 0x4,
  INIT = 0x5,
  StartUp = 0x6,
  };
- enum DestinationMode
- {
+ enum DestinationMode {
  Physical = 0x0,
  Logical = 0x0,
  };
- enum Level
- {
+ enum Level {
  DeAssert = 0x0,
  Assert = 0x1
  };
- enum class TriggerMode
- {
+ enum class TriggerMode {
  Edge = 0x0,
  Level = 0x1,
  };
- enum DestinationShorthand
- {
+ enum DestinationShorthand {
  NoShorthand = 0x0,
  Self = 0x1,
  AllIncludingSelf = 0x2,
  AllExcludingSelf = 0x3,
  };
 
- ICRReg(u8 vector, DeliveryMode delivery_mode, DestinationMode destination_mode, Level level, TriggerMode trigger_mode, DestinationShorthand destination):
- m_reg(vector | (delivery_mode << 8) | (destination_mode << 11) | (level << 14) | (static_cast<u32>(trigger_mode) << 15) | (destination << 18))
+ ICRReg(u8 vector, DeliveryMode delivery_mode, DestinationMode destination_mode, Level level, TriggerMode trigger_mode, DestinationShorthand destination)
+ : m_reg(vector | (delivery_mode << 8) | (destination_mode << 11) | (level << 14) | (static_cast<u32>(trigger_mode) << 15) | (destination << 18))
  {
  }
 
@@ -180,38 +175,40 @@ bool init()
 void enable(u32 cpu)
 {
  kprintf("Enabling local APIC for cpu #%u\n", cpu);
- 
+
  // set spurious interrupt vector
  apic_write(APIC_REG_SIV, apic_read(APIC_REG_SIV) | 0x100);
- 
+
  // local destination mode (flat mode)
  apic_write(APIC_REG_DF, 0xf000000);
- 
+
  // set destination id (note that this limits it to 8 cpus)
  apic_write(APIC_REG_LD, (1 << cpu) << 24);
- 
+
  register_interrupt_handler(IRQ_APIC_SPURIOUS, apic_spurious_interrupt_entry);
- 
+
  apic_write(APIC_REG_LVT_TIMER, APIC_LVT(0xff, 0) | APIC_LVT_MASKED);
  apic_write(APIC_REG_LVT_THERMAL, APIC_LVT(0xff, 0) | APIC_LVT_MASKED);
  apic_write(APIC_REG_LVT_PERFORMANCE_COUNTER, APIC_LVT(0xff, 0) | APIC_LVT_MASKED);
  apic_write(APIC_REG_LVT_LINT0, APIC_LVT(0x1f, 7) | APIC_LVT_MASKED);
  apic_write(APIC_REG_LVT_LINT1, APIC_LVT(0xff, 4) | APIC_LVT_TRIGGER_LEVEL); // nmi
  apic_write(APIC_REG_LVT_ERR, APIC_LVT(0xe3, 0) | APIC_LVT_MASKED);
- 
+
  if (cpu == 0) {
  static volatile u32 foo = 0;
- 
+
  // INIT
  apic_write_icr(ICRReg(0, ICRReg::INIT, ICRReg::Physical, ICRReg::Assert, ICRReg::TriggerMode::Edge, ICRReg::AllExcludingSelf));
 
- for (foo = 0; foo < 0x800000; foo++); // TODO: 10 millisecond delay
+ for (foo = 0; foo < 0x800000; foo++)
+ ; // TODO: 10 millisecond delay
 
  for (int i = 0; i < 2; i++) {
  // SIPI
  apic_write_icr(ICRReg(0x08, ICRReg::StartUp, ICRReg::Physical, ICRReg::Assert, ICRReg::TriggerMode::Edge, ICRReg::AllExcludingSelf)); // start execution at P8000
 
- for (foo = 0; foo < 0x80000; foo++); // TODO: 200 microsecond delay
+ for (foo = 0; foo < 0x80000; foo++)
+ ; // TODO: 200 microsecond delay
  }
  }
 }

diff --git a/Kernel/Arch/i386/CPU.h b/Kernel/Arch/i386/CPU.h
@@ -30,7 +30,7 @@
 #include <AK/Noncopyable.h>
 #include <Kernel/VM/PhysicalAddress.h>
 #include <Kernel/VM/VirtualAddress.h>
-#include <Kernel/kstdio.h>
+#include <LibBareMetal/Output/kstdio.h>
 
 #define PAGE_SIZE 4096
 #define PAGE_MASK ((uintptr_t)0xfffff000u)

diff --git a/Kernel/Arch/i386/PIC.cpp b/Kernel/Arch/i386/PIC.cpp
@@ -28,7 +28,7 @@
 #include <AK/Types.h>
 #include <Kernel/Arch/i386/CPU.h>
 #include <Kernel/Arch/i386/PIC.h>
-#include <Kernel/IO.h>
+#include <LibBareMetal/IO.h>
 
 // The slave 8259 is connected to the master's IRQ2 line.
 // This is really only to enhance clarity.
@@ -137,4 +137,3 @@ u16 get_irr()
 }
 
 }
-
diff --git a/Kernel/Arch/i386/PIT.cpp b/Kernel/Arch/i386/PIT.cpp
@@ -27,8 +27,8 @@
 #include <Kernel/Arch/i386/CPU.h>
 #include <Kernel/Arch/i386/PIC.h>
 #include <Kernel/Arch/i386/PIT.h>
-#include <Kernel/IO.h>
 #include <Kernel/Scheduler.h>
+#include <LibBareMetal/IO.h>
 
 #define IRQ_TIMER 0
 

diff --git a/Kernel/Assertions.h b/Kernel/Assertions.h
@@ -27,7 +27,7 @@
 #pragma once
 
 #include <Kernel/Arch/i386/CPU.h>
-#include <Kernel/kstdio.h>
+#include <LibBareMetal/Output/kstdio.h>
 
 #ifdef DEBUG
 [[noreturn]] void __assertion_failed(const char* msg, const char* file, unsigned line, const char* func);

diff --git a/Kernel/CMOS.cpp b/Kernel/CMOS.cpp
@@ -25,7 +25,7 @@
  */
 
 #include <Kernel/CMOS.h>
-#include <Kernel/IO.h>
+#include <LibBareMetal/IO.h>
 
 namespace CMOS {
 

diff --git a/Kernel/Console.cpp b/Kernel/Console.cpp
diff --git a/Kernel/Console.h b/Kernel/Console.h
diff --git a/Kernel/Devices/BXVGADevice.cpp b/Kernel/Devices/BXVGADevice.cpp
@@ -25,11 +25,11 @@
  */
 
 #include <Kernel/Devices/BXVGADevice.h>
-#include <Kernel/IO.h>
 #include <Kernel/PCI/Access.h>
 #include <Kernel/Process.h>
 #include <Kernel/VM/AnonymousVMObject.h>
 #include <Kernel/VM/MemoryManager.h>
+#include <LibBareMetal/IO.h>
 #include <LibC/errno_numbers.h>
 #include <LibC/sys/ioctl_numbers.h>
 

diff --git a/Kernel/Devices/DebugLogDevice.cpp b/Kernel/Devices/DebugLogDevice.cpp
@@ -25,7 +25,7 @@
  */
 
 #include <Kernel/Devices/DebugLogDevice.h>
-#include <Kernel/IO.h>
+#include <LibBareMetal/IO.h>
 
 static DebugLogDevice* s_the;
 

diff --git a/Kernel/Devices/FloppyDiskDevice.cpp b/Kernel/Devices/FloppyDiskDevice.cpp
@@ -27,9 +27,9 @@
 #include <Kernel/Arch/i386/PIT.h>
 #include <Kernel/Devices/FloppyDiskDevice.h>
 #include <Kernel/FileSystem/ProcFS.h>
-#include <Kernel/IO.h>
 #include <Kernel/Process.h>
 #include <Kernel/VM/MemoryManager.h>
+#include <LibBareMetal/IO.h>
 
 // Uncomment me for a LOT of output
 //#define FLOPPY_DEBUG

diff --git a/Kernel/Devices/KeyboardDevice.cpp b/Kernel/Devices/KeyboardDevice.cpp
@@ -29,8 +29,8 @@
 #include <Kernel/Arch/i386/CPU.h>
 #include <Kernel/Arch/i386/PIC.h>
 #include <Kernel/Devices/KeyboardDevice.h>
-#include <Kernel/IO.h>
 #include <Kernel/TTY/VirtualConsole.h>
+#include <LibBareMetal/IO.h>
 
 //#define KEYBOARD_DEBUG