xnu-1228.tar.gz

[apple/xnu.git] / bsd / dev / memdev.c

diff --git a/bsd/dev/memdev.c b/bsd/dev/memdev.c
index a01fcb258dba69f9fca80c3faf1e0194265c1948..307ad77d9949cead937863ce7f5835fe25c7e0c4 100644 (file)
--- a/bsd/dev/memdev.c
+++ b/bsd/dev/memdev.c
@@ -1,23 +1,29 @@
 /*
- * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
- * The contents of this file constitute Original Code as defined in and
- * are subject to the Apple Public Source License Version 1.1 (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.
+ * 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. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
  * 
- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
+ * 
+ * The Original Code and all software distributed under the License are
+ * 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,
- * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
- * License for the specific language governing rights and limitations
- * under the License.
+ * 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.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * Copyright (c) 1988 University of Utah.
@@ -88,6 +94,7 @@
 #include <vm/pmap.h>
 #include <vm/vm_pager.h>
 #include <mach/memory_object_types.h>
+#include <kern/debug.h>
 
 #include <miscfs/devfs/devfs.h>
 
@@ -134,7 +141,7 @@ static struct cdevsw mdevcdevsw = {
        /* ioctl */     mdevcioctl,
        /* stop */      eno_stop,
        /* reset */     eno_reset,
-       /* ttys */      0,
+       /* ttys */      NULL,
        /* select */    eno_select,
        /* mmap */      eno_mmap,
        /* strategy */  eno_strat,
@@ -544,10 +551,10 @@ dev_t mdevadd(int devid, ppnum_t base, unsigned int size, int phys) {
        }
        else {
                if(devid >= 16) {                                                               /* Giving us something bogus? */
-                       panic("mdevadd: attempt to explicitly add a bogus memory device: &08X\n", devid);
+                       panic("mdevadd: attempt to explicitly add a bogus memory device: %08X\n", devid);
                }
                if(mdev[devid].mdFlags &mdInited) {                             /* Already there? */
-                       panic("mdevadd: attempt to explicitly add a previously defined memory device: &08X\n", devid);
+                       panic("mdevadd: attempt to explicitly add a previously defined memory device: %08X\n", devid);
                }
        }