kotovalexarian-likes-gitlab/sortix--sortix
1
0
Fork 0
mirror of https://gitlab.com/sortix/sortix.git synced 2023-02-13 20:55:38 -05:00
Code Releases Activity

Updated git version to 0.5dev.

Browse source
This commit is contained in:
Jonas 'Sortie' Termansen 2011-10-10 20:14:37 +02:00
parent 1b7dc2d817
commit 5082e6523c
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -7,7 +7,7 @@ REMOTEUSER=sortie
REMOTECOPYDIR:=/home/$(REMOTEUSER)/Desktop/MaxsiOS REMOTECOPYDIR:=/home/$(REMOTEUSER)/Desktop/MaxsiOS
MODULES=libmaxsi hello games mkinitrd utils sortix MODULES=libmaxsi hello games mkinitrd utils sortix
VERSION=0.4 VERSION=0.5dev
DEBNAME:=sortix_$(VERSION)_$(CPU) DEBNAME:=sortix_$(VERSION)_$(CPU)
DEBSRCNAME:=sortix_$(VERSION) DEBSRCNAME:=sortix_$(VERSION)
DEBDIR:=builds/$(DEBNAME) DEBDIR:=builds/$(DEBNAME)

12
sortix/x86-family/memorymanagement.cpp
View file

@ -43,7 +43,7 @@ namespace Sortix
namespace Memory namespace Memory
{ {
addr_t currentdir; addr_t currentdir;
void InitCPU(); void InitCPU();
void AllocateKernelPMLs(); void AllocateKernelPMLs();
@ -65,11 +65,11 @@ namespace Sortix
typedef const multiboot_memory_map_t* mmap_t; typedef const multiboot_memory_map_t* mmap_t;
// Loop over every detected memory region. // Loop over every detected memory region.
for ( for (
mmap_t mmap = (mmap_t) bootinfo->mmap_addr; mmap_t mmap = (mmap_t) bootinfo->mmap_addr;
(addr_t) mmap < bootinfo->mmap_addr + bootinfo->mmap_length; (addr_t) mmap < bootinfo->mmap_addr + bootinfo->mmap_length;
mmap = (mmap_t) ((addr_t) mmap + mmap->size + sizeof(mmap->size)) mmap = (mmap_t) ((addr_t) mmap + mmap->size + sizeof(mmap->size))
) )
{ {
// Check that we can use this kind of RAM. // Check that we can use this kind of RAM.
if ( mmap->type != 1 ) { continue; } if ( mmap->type != 1 ) { continue; }