X-Git-Url: http://git.buserror.net/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=kernel%2Fmem%2Forbmm.cc;h=91187389af46184d0c4094628df4056453804344;hb=bac1d18b0bd376af8e9fdc8020e3a2132988b569;hp=938e2f24af71574ea99fe246b65dd017e77de8df;hpb=7da27a216a7f4bb3331fe315cdbec69bfcf2c762;p=polintos%2Fscott%2Fpriv.git

diff --git a/kernel/mem/orbmm.cc b/kernel/mem/orbmm.cc
index 938e2f2..9118738 100644
--- a/kernel/mem/orbmm.cc
+++ b/kernel/mem/orbmm.cc
@@ -2,31 +2,15 @@
 //
 // This software is copyright (c) 2006 Scott Wood <scott@buserror.net>.
 // 
-// Permission is hereby granted, free of charge, to any person obtaining a copy of
-// this software and associated documentation files (the "Software"), to deal with
-// the Software without restriction, including without limitation the rights to
-// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-// of the Software, and to permit persons to whom the Software is furnished to do
-// so, subject to the following conditions:
+// This software is provided 'as-is', without any express or implied warranty.
+// In no event will the authors or contributors be held liable for any damages
+// arising from the use of this software.
 // 
-//     * Redistributions of source code must retain the above copyright notice,
-//       this list of conditions and the following disclaimers.
-// 
-//     * Redistributions in binary form must reproduce the above copyright notice,
-//       this list of conditions and the following disclaimers in the
-//       documentation and/or other materials provided with the distribution.
-// 
-//     * The names of the Software's authors and/or contributors
-//       may not be used to endorse or promote products derived from
-//       this Software without specific prior written permission.
-// 
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-// FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-// CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
-// SOFTWARE.
+// Permission is hereby granted to everyone, free of charge, to use, copy,
+// modify, prepare derivative works of, publish, distribute, perform,
+// sublicense, and/or sell copies of the Software, provided that the above
+// copyright notice and disclaimer of warranty be included in all copies or
+// substantial portions of this software.
 
 #include <kern/mem.h>
 #include <kern/paging.h>
@@ -36,22 +20,22 @@ namespace RunTime {
 	ORBMM orbmm_real;
 	ORBMM *orbmm = &orbmm_real;
 	
-	ORBMM::ORBMM()
-	{
-		priv = NULL;
-	}
-
-	void *ORBMM::alloc(size_t size, AllocGroup *group)
+	void *ORBMM::alloc(size_t size, int refs)
 	{
 		return reinterpret_cast<void *>(new u8[size]);
 	}
 	
-	void ORBMM::retain(Region region)
+	void ORBMM::retain(void *ptr, int refs)
+	{
+		// FIXME
+	}
+
+	void ORBMM::release(void *ptr, int refs)
 	{
 		// FIXME
 	}
 
-	void ORBMM::release(Region region)
+	void ORBMM::add_region(Region rgn, bool unmap, int refs)
 	{
 		// FIXME
 	}