boot-132.tar.gz

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

diff --git a/i386/libsaio/memory.c b/i386/libsaio/memory.c
index 375d989c187da78701eab176995d53f48b1b9d40..a7980ebcd305840ff2266af7cdca327d6fc60ea3 100644 (file)
--- a/i386/libsaio/memory.c
+++ b/i386/libsaio/memory.c
@@ -6,7 +6,7 @@
  * 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
  * 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 1.2 (the "License").  You may not use this file
+ * 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.
  * 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.


@@ -25,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;
 


@@ -32,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)
 {


@@ -50,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 )