File shuffling: kernel/i686/firmware/ (#114)

Move BIOS + ACPI related files to `kernel/i686/firmware/`. Multiprocessor Specification-related stuff will also be added there.
phaubertin · Jan 22, 2025 · cd37398 · cd37398
1 parent b118e64
commit cd37398
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/...kernel/infrastructure/i686/drivers/acpi.h → ...ernel/infrastructure/i686/firmware/acpi.h b/...kernel/infrastructure/i686/drivers/acpi.h → ...ernel/infrastructure/i686/firmware/acpi.h
@@ -29,8 +29,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef JINUE_KERNEL_INFRASTRUCTURE_I686_DRIVERS_ACPI_H
-#define JINUE_KERNEL_INFRASTRUCTURE_I686_DRIVERS_ACPI_H
+#ifndef JINUE_KERNEL_INFRASTRUCTURE_I686_FIRMWARE_ACPI_H
+#define JINUE_KERNEL_INFRASTRUCTURE_I686_FIRMWARE_ACPI_H
 
 #include <kernel/infrastructure/i686/types.h>
 #include <stdint.h>

diff --git a/...el/infrastructure/i686/drivers/asm/bios.h → ...l/infrastructure/i686/firmware/asm/bios.h b/...el/infrastructure/i686/drivers/asm/bios.h → ...l/infrastructure/i686/firmware/asm/bios.h
@@ -29,8 +29,8 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef JINUE_KERNEL_INFRASTRUCTURE_I686_DRIVERS_ASM_BIOS_H
-#define JINUE_KERNEL_INFRASTRUCTURE_I686_DRIVERS_ASM_BIOS_H
+#ifndef JINUE_KERNEL_INFRASTRUCTURE_I686_FIRMWARE_ASM_BIOS_H
+#define JINUE_KERNEL_INFRASTRUCTURE_I686_FIRMWARE_ASM_BIOS_H
 
 #define BIOS_BDA_EBDA_SEGMENT   0x40e
 

diff --git a/kernel/Makefile b/kernel/Makefile
@@ -102,11 +102,11 @@ sources.kernel.c = \
 	domain/services/scheduler.c \
 	domain/config.c \
 	infrastructure/acpi/acpi.c \
-	infrastructure/i686/drivers/acpi.c \
 	infrastructure/i686/drivers/pic8259.c \
 	infrastructure/i686/drivers/pit8253.c \
 	infrastructure/i686/drivers/uart16550a.c \
 	infrastructure/i686/drivers/vga.c \
+	infrastructure/i686/firmware/acpi.c \
 	infrastructure/i686/pmap/nopae.c \
 	infrastructure/i686/pmap/pmap.c \
 	infrastructure/i686/pmap/pae.c \

diff --git a/kernel/infrastructure/i686/drivers/acpi.c → kernel/infrastructure/i686/firmware/acpi.c b/kernel/infrastructure/i686/drivers/acpi.c → kernel/infrastructure/i686/firmware/acpi.c
@@ -32,8 +32,8 @@
 #include <kernel/infrastructure/acpi/acpi.h>
 #include <kernel/infrastructure/acpi/tables.h>
 #include <kernel/infrastructure/acpi/types.h>
-#include <kernel/infrastructure/i686/drivers/asm/bios.h>
-#include <kernel/infrastructure/i686/drivers/acpi.h>
+#include <kernel/infrastructure/i686/firmware/asm/bios.h>
+#include <kernel/infrastructure/i686/firmware/acpi.h>
 #include <kernel/infrastructure/i686/types.h>
 #include <stdbool.h>
 #include <stdint.h>

diff --git a/kernel/infrastructure/i686/init.c b/kernel/infrastructure/i686/init.c
@@ -37,11 +37,11 @@
 #include <kernel/domain/services/mman.h>
 #include <kernel/domain/services/panic.h>
 #include <kernel/infrastructure/i686/asm/msr.h>
-#include <kernel/infrastructure/i686/drivers/acpi.h>
 #include <kernel/infrastructure/i686/drivers/pic8259.h>
 #include <kernel/infrastructure/i686/drivers/pit8253.h>
 #include <kernel/infrastructure/i686/drivers/uart16550a.h>
 #include <kernel/infrastructure/i686/drivers/vga.h>
+#include <kernel/infrastructure/i686/firmware/acpi.h>
 #include <kernel/infrastructure/i686/isa/instrs.h>
 #include <kernel/infrastructure/i686/isa/regs.h>
 #include <kernel/infrastructure/i686/pmap/init.h>

diff --git a/kernel/interface/i686/auxv.c b/kernel/interface/i686/auxv.c
@@ -29,7 +29,7 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <kernel/infrastructure/i686/drivers/acpi.h>
+#include <kernel/infrastructure/i686/firmware/acpi.h>
 #include <kernel/interface/i686/trap.h>
 #include <kernel/machine/auxv.h>