From ab31b81050b3b1cce9e6166ff234a147d03d2083 Mon Sep 17 00:00:00 2001 From: "Eric J. Bowersox" Date: Thu, 2 May 2013 23:32:35 -0600 Subject: [PATCH] removed sizes.h and moved the defs it contained to layout.h --- include/comrogue/internals/layout.h | 8 ++++++ kernel/init_heap.c | 2 +- kernel/sizes.h | 43 ----------------------------- kernel/start.S | 1 - 4 files changed, 9 insertions(+), 45 deletions(-) delete mode 100644 kernel/sizes.h diff --git a/include/comrogue/internals/layout.h b/include/comrogue/internals/layout.h index 95f7952..19bf186 100644 --- a/include/comrogue/internals/layout.h +++ b/include/comrogue/internals/layout.h @@ -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 */ diff --git a/kernel/init_heap.c b/kernel/init_heap.c index f89f82f..fddd7cb 100644 --- a/kernel/init_heap.c +++ b/kernel/init_heap.c @@ -35,7 +35,7 @@ #include #include #include -#include "sizes.h" +#include /*------------------------------------------------------------------------------------------------------------- * Initial heap implementation. Since this will only be used by initializer code and freed with the rest diff --git a/kernel/sizes.h b/kernel/sizes.h deleted file mode 100644 index b32df6e..0000000 --- a/kernel/sizes.h +++ /dev/null @@ -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 */ diff --git a/kernel/start.S b/kernel/start.S index 5861dad..27252c6 100644 --- a/kernel/start.S +++ b/kernel/start.S @@ -31,7 +31,6 @@ */ #include #include -#include "sizes.h" .section ".first.init.text"