boot-132.tar.gz

[apple/boot.git] / i386 / libsaio / memory.c

diff --git a/i386/libsaio/memory.c b/i386/libsaio/memory.c
index 535cbb458942310d7270b78357ca2cc389af813d..a7980ebcd305840ff2266af7cdca327d6fc60ea3 100644 (file)
--- a/i386/libsaio/memory.c
+++ b/i386/libsaio/memory.c
@@ -3,22 +3,21 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 

- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
- * 
- * This file contains Original Code and/or Modifications of Original Code
- * as defined in and that are subject to the Apple Public Source License
- * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * Portions Copyright (c) 2003 Apple Computer, Inc.  All Rights
+ * Reserved.  This file contains Original Code and/or Modifications of
+ * Original Code as defined in and that are subject to the Apple Public
+ * Source License Version 2.0 (the "License").  You may not use this file
+ * except in compliance with the License.  Please obtain a copy of the
+ * License at http://www.apple.com/publicsource and read it before using
+ * this file.

  * 
  * The Original Code and all software distributed under the License are
  * 
  * The Original Code and all software distributed under the License are

- * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER

  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
  * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON- INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.

  * 
  * @APPLE_LICENSE_HEADER_END@
  */
  * 
  * @APPLE_LICENSE_HEADER_END@
  */


@@ -26,6 +25,7 @@
 #include "sl.h"
 #include "saio_internal.h"
 #include "bootstruct.h"
 #include "sl.h"
 #include "saio_internal.h"
 #include "bootstruct.h"

+#include "device_tree.h"

 
 static long  gImageLastKernelAddr;
 
 
 static long  gImageLastKernelAddr;
 


@@ -33,6 +33,28 @@ static long  gImageLastKernelAddr;
 #define RoundPage(x)  ((((unsigned)(x)) + kPageSize - 1) & ~(kPageSize - 1))
 
 
 #define RoundPage(x)  ((((unsigned)(x)) + kPageSize - 1) & ~(kPageSize - 1))
 
 

+long
+AllocateMemoryRange(char * rangeName, long start, long length, long type)
+{
+    char *nameBuf;
+    uint32_t *buffer;
+    
+    nameBuf = malloc(strlen(rangeName) + 1);
+    if (nameBuf == 0) return -1;
+    strcpy(nameBuf, rangeName);
+    
+    buffer = malloc(2 * sizeof(uint32_t));
+    if (buffer == 0) return -1;
+    
+    buffer[0] = start;
+    buffer[1] = length;
+    
+    DT__AddProperty(gMemoryMapNode, nameBuf, 2 * sizeof(uint32_t), (char *)buffer);
+    
+    return 0;
+}
+
+#if 0

 long
 AllocateMemoryRange(char * rangeName, long start, long length, long type)
 {
 long
 AllocateMemoryRange(char * rangeName, long start, long length, long type)
 {


@@ -51,6 +73,7 @@ AllocateMemoryRange(char * rangeName, long start, long length, long type)
     }
     return 0;
 }
     }
     return 0;
 }

+#endif

 
 long
 AllocateKernelMemory( long inSize )
 
 long
 AllocateKernelMemory( long inSize )