| /trunk/kernel/arch/ia32/include/boot/memmap.h |
|---|
| 65,7 → 65,6 |
| extern e820memmap_t e820table[MEMMAP_E820_MAX_RECORDS]; |
| extern uint8_t e820counter; |
| extern uint32_t e801memorysize; /**< Size of available memory in KB. */ |
| #endif |
| /trunk/kernel/arch/ia32/include/mm/memory_init.h |
|---|
| File deleted |
| /trunk/kernel/arch/ia32/Makefile.inc |
|---|
| 141,7 → 141,6 |
| arch/$(ARCH)/src/cpu/cpu.c \ |
| arch/$(ARCH)/src/mm/as.c \ |
| arch/$(ARCH)/src/mm/frame.c \ |
| arch/$(ARCH)/src/mm/memory_init.c \ |
| arch/$(ARCH)/src/mm/page.c \ |
| arch/$(ARCH)/src/mm/tlb.c \ |
| arch/$(ARCH)/src/ddi/ddi.c \ |
| 150,5 → 149,6 |
| arch/$(ARCH)/src/drivers/ega.c \ |
| arch/$(ARCH)/src/drivers/vesa.c \ |
| arch/$(ARCH)/src/boot/boot.S \ |
| arch/$(ARCH)/src/boot/memmap.c \ |
| arch/$(ARCH)/src/fpu_context.c \ |
| arch/$(ARCH)/src/debugger.c |
| /trunk/kernel/arch/ia32/src/ia32.c |
|---|
| 54,7 → 54,6 |
| #include <arch/bios/bios.h> |
| #include <arch/mm/memory_init.h> |
| #include <interrupt.h> |
| #include <ddi/irq.h> |
| #include <arch/debugger.h> |
| /trunk/kernel/arch/ia32/src/boot/boot.S |
|---|
| 109,8 → 109,7 |
| cmpl $MULTIBOOT_LOADER_MAGIC, %eax # compare GRUB signature |
| je valid_boot |
| xorl %ecx, %ecx # no memory size or map available |
| movl %ecx, e801memorysize |
| xorl %ecx, %ecx # no memory map available |
| movl %ecx, e820counter |
| jmp invalid_boot |
| 119,19 → 118,6 |
| movl (%ebx), %eax # ebx = physical address of struct multiboot_info |
| bt $0, %eax # mbi->flags[0] (mem_lower, mem_upper valid) |
| jc mem_valid |
| xorl %ecx, %ecx |
| jmp mem_invalid |
| mem_valid: |
| movl 4(%ebx), %ecx # mbi->mem_lower |
| addl 8(%ebx), %ecx # mbi->mem_upper |
| mem_invalid: |
| movl %ecx, e801memorysize |
| bt $3, %eax # mbi->flags[3] (mods_count, mods_addr valid) |
| jc mods_valid |
| /trunk/kernel/arch/ia32/src/boot/memmap.c |
|---|
| 0,0 → 1,41 |
| /* |
| * Copyright (c) 2005 Josef Cejka |
| * 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. |
| */ |
| /** @addtogroup ia32mm |
| * @{ |
| */ |
| /** @file |
| */ |
| #include <arch/boot/memmap.h> |
| uint8_t e820counter = 0xff; |
| e820memmap_t e820table[MEMMAP_E820_MAX_RECORDS]; |
| /** @} |
| */ |
| /trunk/kernel/arch/ia32/src/mm/memory_init.c |
|---|
| File deleted |