Index: kernel/genarch/include/genarch/multiboot/multiboot_info_struct.ag =================================================================== --- kernel/genarch/include/genarch/multiboot/multiboot_info_struct.ag (revision 1433ecda9b732f3f185f902feb26826ec2496e03) +++ (revision ) @@ -1,81 +1,0 @@ -# Copyright (c) 2016 Jakub Jermar -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -{ - name : multiboot_info, - packed : true, - - includes : [ - { - include : - }, - ], - - members : [ - { - name : flags, - type : uint32_t - }, - { - name : mem_lower, - type : uint32_t - }, - { - name : mem_upper, - type : uint32_t - }, - { - name : boot_device, - type : uint32_t - }, - { - name : cmd_line, - type : uint32_t - }, - { - name : mods_count, - type : uint32_t - }, - { - name : mods_addr, - type : uint32_t - }, - { - name : syms, - type : uint32_t, - elements : 4, - }, - { - name : mmap_length, - type : uint32_t, - }, - { - name : mmap_addr, - type : uint32_t, - } - ] -} Index: kernel/genarch/include/genarch/multiboot/multiboot_info_struct.h =================================================================== --- kernel/genarch/include/genarch/multiboot/multiboot_info_struct.h (revision aa0c8b24160b1e5af03a3ef9039095a71bccfeb7) +++ kernel/genarch/include/genarch/multiboot/multiboot_info_struct.h (revision aa0c8b24160b1e5af03a3ef9039095a71bccfeb7) @@ -0,0 +1,61 @@ +/* Copyright (c) 2016 Jakub Jermar + * All rights preserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef KERN_MULTIBOOT_INFO_STRUCT_H_ +#define KERN_MULTIBOOT_INFO_STRUCT_H_ + +#define MULTIBOOT_INFO_OFFSET_FLAGS 0x00 +#define MULTIBOOT_INFO_OFFSET_MEM_LOWER 0x04 +#define MULTIBOOT_INFO_OFFSET_MEM_UPPER 0x08 +#define MULTIBOOT_INFO_OFFSET_BOOT_DEVICE 0x0c +#define MULTIBOOT_INFO_OFFSET_CMD_LINE 0x10 +#define MULTIBOOT_INFO_OFFSET_MODS_COUNT 0x14 +#define MULTIBOOT_INFO_OFFSET_MODS_ADDR 0x18 +#define MULTIBOOT_INFO_OFFSET_SYMS 0x1c +#define MULTIBOOT_INFO_OFFSET_MMAP_LENGTH 0x2c +#define MULTIBOOT_INFO_OFFSET_MMAP_ADDR 0x30 +#define MULTIBOOT_INFO_SIZE 0x34 + +#ifndef __ASSEMBLER__ + +#include + +typedef struct multiboot_info { + uint32_t flags; + uint32_t mem_lower; + uint32_t mem_upper; + uint32_t boot_device; + uint32_t cmd_line; + uint32_t mods_count; + uint32_t mods_addr; + uint32_t syms[4]; + uint32_t mmap_length; + uint32_t mmap_addr; +} __attribute__((packed)) multiboot_info_t; + +#endif +#endif Index: kernel/genarch/include/genarch/multiboot/multiboot_memmap_struct.ag =================================================================== --- kernel/genarch/include/genarch/multiboot/multiboot_memmap_struct.ag (revision 1433ecda9b732f3f185f902feb26826ec2496e03) +++ (revision ) @@ -1,52 +1,0 @@ -# Copyright (c) 2016 Jakub Jermar -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -{ - name : multiboot_memmap, - packed : true, - - includes : [ - { - include : - }, - { - include : , - depends: arch/$(KARCH)/include/arch/boot/memmap_struct.h, - } - ], - - members : [ - { - name : size, - type : uint32_t - }, - { - name : mm_info, - type : e820memmap_t - } - ] -} Index: kernel/genarch/include/genarch/multiboot/multiboot_memmap_struct.h =================================================================== --- kernel/genarch/include/genarch/multiboot/multiboot_memmap_struct.h (revision aa0c8b24160b1e5af03a3ef9039095a71bccfeb7) +++ kernel/genarch/include/genarch/multiboot/multiboot_memmap_struct.h (revision aa0c8b24160b1e5af03a3ef9039095a71bccfeb7) @@ -0,0 +1,49 @@ +/* Copyright (c) 2016 Jakub Jermar + * All rights preserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef KERN_MULTIBOOT_MEMMAP_STRUCT_H_ +#define KERN_MULTIBOOT_MEMMAP_STRUCT_H_ + +#include + +#define MULTIBOOT_MEMMAP_OFFSET_SIZE 0x00 +#define MULTIBOOT_MEMMAP_OFFSET_MM_INFO 0x04 +#define MULTIBOOT_MEMMAP_SIZE 0x18 + +#define MULTIBOOT_MEMMAP_SIZE_SIZE 0x04 + +#ifndef __ASSEMBLER__ + +#include + +typedef struct multiboot_memmap { + uint32_t size; + e820memmap_t mm_info; +} __attribute__((packed)) multiboot_memmap_t; + +#endif +#endif