From d80e87991eb850e35f3ecb73043039c346dcf5db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Lov=C3=A9n?= Date: Tue, 24 Oct 2017 22:25:26 +0200 Subject: [PATCH] A bit of cleanup --- src/kernel/Makefile | 1 + src/kernel/boot/boot.S | 12 +----------- src/kernel/include/multiboot.h | 12 ++++++++++++ 3 files changed, 14 insertions(+), 11 deletions(-) create mode 100644 src/kernel/include/multiboot.h diff --git a/src/kernel/Makefile b/src/kernel/Makefile index 174668b..82c142e 100644 --- a/src/kernel/Makefile +++ b/src/kernel/Makefile @@ -9,6 +9,7 @@ OBJ := $(patsubst %, %.o, $(basename $(SRC))) CFLAGS ?= -Wall -Wextra CFLAGS += -ffreestanding +CPPFLAGS += -I include all: kernel diff --git a/src/kernel/boot/boot.S b/src/kernel/boot/boot.S index 7bdc83d..13f6fda 100644 --- a/src/kernel/boot/boot.S +++ b/src/kernel/boot/boot.S @@ -1,14 +1,4 @@ -#define MBOOT1_MAGIC 0x1BADB002 -#define MBOOT1_PALIGN 0x01 -#define MBOOT1_MEMINFO 0x02 -#define MBOOT1_FLAGS (MBOOT1_PALIGN | MBOOT1_MEMINFO) -#define MBOOT1_CS -(MBOOT1_FLAGS + MBOOT1_MAGIC) - -#define MBOOT2_MAGIC 0xE85250D6 -#define MBOOT2_ARCH 0 -#define MBOOT2_LENGTH (MultiBootHeader2End - MultiBootHeader2) -#define MBOOT2_CHECKSUM -(MBOOT2_MAGIC + MBOOT2_ARCH + MBOOT2_LENGTH) - +#include .intel_syntax noprefix .section .multiboot diff --git a/src/kernel/include/multiboot.h b/src/kernel/include/multiboot.h new file mode 100644 index 0000000..298f3c0 --- /dev/null +++ b/src/kernel/include/multiboot.h @@ -0,0 +1,12 @@ +#pragma once + +#define MBOOT1_MAGIC 0x1BADB002 +#define MBOOT1_PALIGN 0x01 +#define MBOOT1_MEMINFO 0x02 +#define MBOOT1_FLAGS (MBOOT1_PALIGN | MBOOT1_MEMINFO) +#define MBOOT1_CS -(MBOOT1_FLAGS + MBOOT1_MAGIC) + +#define MBOOT2_MAGIC 0xE85250D6 +#define MBOOT2_ARCH 0 +#define MBOOT2_LENGTH (MultiBootHeader2End - MultiBootHeader2) +#define MBOOT2_CHECKSUM -(MBOOT2_MAGIC + MBOOT2_ARCH + MBOOT2_LENGTH)