amy/comrogue-pi
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

removed sizes.h and moved the defs it contained to layout.h

Browse Source
This commit is contained in:
Eric J. Bowersox 2013-05-02 23:32:35 -06:00
parent 4cf088683f
commit ab31b81050
4 changed files with 9 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/comrogue/internals/layout.h
View File

@ -48,6 +48,14 @@
#define PAGE_COUNT_IO 4096 /* 16 megabytes mapped for IO */
#define VMADDR_KERNEL_NOMANS 0xFFFF0000 /* start of kernel "no man's land" */
/*------------------------------------
* Sizes of internal data structures.
*------------------------------------
*/
#define SIZE_INIT_STACK 4096 /* size of the initial stack */
#define SIZE_INIT_HEAP 16384 /* size of the initial heap */
#endif /* __COMROGUE_INTERNALS__ */
#endif /* __LAYOUT_H_INCLUDED */

2
kernel/init_heap.c
View File

@ -35,7 +35,7 @@
#include <comrogue/allocator.h>
#include <comrogue/objhelp.h>
#include <comrogue/internals/seg.h>
#include "sizes.h"
#include <comrogue/internals/layout.h>
/*-------------------------------------------------------------------------------------------------------------
* Initial heap implementation. Since this will only be used by initializer code and freed with the rest

43
kernel/sizes.h
View File

@ -1,43 +0,0 @@
/*
* This file is part of the COMROGUE Operating System for Raspberry Pi
*
* Copyright (c) 2013, Eric J. Bowersox / Erbosoft Enterprises
* All rights reserved.
*
* This program is free for commercial and non-commercial use as long as the following conditions are
* adhered to.
*
* Copyright in this file remains Eric J. Bowersox and/or Erbosoft, and as such any copyright notices
* in the code are not to be removed.
*
* 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.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 COPYRIGHT HOLDER OR CONTRIBUTORS 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.
*
* "Raspberry Pi" is a trademark of the Raspberry Pi Foundation.
*/
#ifndef __SIZES_H_INCLUDED
#define __SIZES_H_INCLUDED
/*-----------------------------------
* Sizes of internal data structures
*-----------------------------------
*/
#define SIZE_INIT_STACK 4096 /* size of the initial stack */
#define SIZE_INIT_HEAP 16384 /* size of the initial heap */
#endif /* __SIZES_H_INCLUDED */

1
kernel/start.S
View File

@ -31,7 +31,6 @@
*/
#include <comrogue/internals/layout.h>
#include <comrogue/internals/sctlr.h>
#include "sizes.h"
.section ".first.init.text"