tailix/kernel
1
0
Fork 0
mirror of https://github.com/tailix/kernel.git synced 2024-11-20 11:16:10 -05:00
Code Releases Activity

Move "include/kernelmq/multiboot.h" to "arch/multiboot.h"

Browse source
This commit is contained in:
Braiden Vasco 2017-11-03 01:59:18 +00:00
parent ae38fb3fe2
commit ec48a489be
5 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -5,7 +5,7 @@ all: all-kernel all-iso
clean: clean-iso clean-kernel clean: clean-iso clean-kernel
all-kernel: all-kernel:
make all -C arch I=$(shell pwd)/include make all -C arch
clean-kernel: clean-kernel:
make clean -C arch make clean -C arch

2
arch/Makefile
View file

@ -15,7 +15,7 @@ kernel: $(OBJS)
grub-file --is-x86-multiboot2 $@ grub-file --is-x86-multiboot2 $@
%.c.o: %.c %.c.o: %.c
$(CC) -c $< -o $@ -std=gnu99 -ffreestanding -nostdinc -fno-builtin -fno-stack-protector -Wall -Wextra -I "$(I)" $(CC) -c $< -o $@ -std=gnu99 -ffreestanding -nostdinc -fno-builtin -fno-stack-protector -Wall -Wextra
%.s.o: %.s %.s.o: %.s
$(AS) $< -o $@ $(AS) $< -o $@

3
arch/main.c
View file

@ -1,5 +1,4 @@
#include <kernelmq/multiboot.h> #include "multiboot.h"
#include "logger.h" #include "logger.h"
#include "protected.h" #include "protected.h"

2
arch/multiboot.c
View file

@ -1,4 +1,4 @@
#include <kernelmq/multiboot.h> #include "multiboot.h"
#include "console.h" #include "console.h"
#include "util.h" #include "util.h"

8
include/kernelmq/multiboot.h → arch/multiboot.h
View file

@ -1,10 +1,6 @@
#ifndef KERNELMQ_INCLUDED_MULTIBOOT #ifndef KERNELMQ_INCLUDED_MULTIBOOT
#define KERNELMQ_INCLUDED_MULTIBOOT 1 #define KERNELMQ_INCLUDED_MULTIBOOT 1
#ifdef __cplusplus
extern "C" {
#endif
struct KernelMQ_Multiboot_Info { struct KernelMQ_Multiboot_Info {
unsigned long magic; unsigned long magic;
unsigned long addr; unsigned long addr;
@ -12,8 +8,4 @@ struct KernelMQ_Multiboot_Info {
void print_multiboot_info(struct KernelMQ_Multiboot_Info info); void print_multiboot_info(struct KernelMQ_Multiboot_Info info);
#ifdef __cplusplus
}
#endif
#endif #endif