From 607266bfd37c303deae187a5cd39514dffc1d659 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Lov=C3=A9n?= Date: Thu, 15 Feb 2018 10:50:03 +0100 Subject: [PATCH] Clean up interface --- src/kernel/boot/multiboot_header.S | 6 +++++- src/kernel/include/multiboot.h | 7 ------- 2 files changed, 5 insertions(+), 8 deletions(-) delete mode 100644 src/kernel/include/multiboot.h diff --git a/src/kernel/boot/multiboot_header.S b/src/kernel/boot/multiboot_header.S index ab80287..bf136b9 100644 --- a/src/kernel/boot/multiboot_header.S +++ b/src/kernel/boot/multiboot_header.S @@ -1,4 +1,8 @@ -#include +#define MBOOT2_MAGIC 0xE85250D6 +#define MBOOT2_ARCH 0 +#define MBOOT2_LENGTH (Multiboot2HeaderEnd - Multiboot2Header) +#define MBOOT2_CHECKSUM -(MBOOT2_MAGIC + MBOOT2_ARCH + MBOOT2_LENGTH) + .section .multiboot .align 0x8 diff --git a/src/kernel/include/multiboot.h b/src/kernel/include/multiboot.h deleted file mode 100644 index 9964bd1..0000000 --- a/src/kernel/include/multiboot.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#define MBOOT2_MAGIC 0xE85250D6 -#define MBOOT2_REPLY 0x36D76289 -#define MBOOT2_ARCH 0 -#define MBOOT2_LENGTH (Multiboot2HeaderEnd - Multiboot2Header) -#define MBOOT2_CHECKSUM -(MBOOT2_MAGIC + MBOOT2_ARCH + MBOOT2_LENGTH)