From 5082e6523cafa49287cd3e57d2d0e1527f5313c5 Mon Sep 17 00:00:00 2001 From: Jonas 'Sortie' Termansen Date: Mon, 10 Oct 2011 20:14:37 +0200 Subject: [PATCH] Updated git version to 0.5dev. --- Makefile | 2 +- sortix/x86-family/memorymanagement.cpp | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index c6cd0621..992f5789 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ REMOTEUSER=sortie REMOTECOPYDIR:=/home/$(REMOTEUSER)/Desktop/MaxsiOS MODULES=libmaxsi hello games mkinitrd utils sortix -VERSION=0.4 +VERSION=0.5dev DEBNAME:=sortix_$(VERSION)_$(CPU) DEBSRCNAME:=sortix_$(VERSION) DEBDIR:=builds/$(DEBNAME) diff --git a/sortix/x86-family/memorymanagement.cpp b/sortix/x86-family/memorymanagement.cpp index 04c2258e..b72db72f 100644 --- a/sortix/x86-family/memorymanagement.cpp +++ b/sortix/x86-family/memorymanagement.cpp @@ -43,7 +43,7 @@ namespace Sortix namespace Memory { - addr_t currentdir; + addr_t currentdir; void InitCPU(); void AllocateKernelPMLs(); @@ -65,11 +65,11 @@ namespace Sortix typedef const multiboot_memory_map_t* mmap_t; // Loop over every detected memory region. - for ( - mmap_t mmap = (mmap_t) bootinfo->mmap_addr; - (addr_t) mmap < bootinfo->mmap_addr + bootinfo->mmap_length; - mmap = (mmap_t) ((addr_t) mmap + mmap->size + sizeof(mmap->size)) - ) + for ( + mmap_t mmap = (mmap_t) bootinfo->mmap_addr; + (addr_t) mmap < bootinfo->mmap_addr + bootinfo->mmap_length; + mmap = (mmap_t) ((addr_t) mmap + mmap->size + sizeof(mmap->size)) + ) { // Check that we can use this kind of RAM. if ( mmap->type != 1 ) { continue; }