xnu-1456.1.26.tar.gz

[apple/xnu.git] / pexpert / gen / pe_gen.c

diff --git a/pexpert/gen/pe_gen.c b/pexpert/gen/pe_gen.c
index 9740000a138275267b1889bafebe99a28495a868..43ab61a9657461724091c1a0d8c8290c4fc12dc1 100644 (file)
--- a/pexpert/gen/pe_gen.c
+++ b/pexpert/gen/pe_gen.c
@@ -1,14 +1,19 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  * 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.
+ * 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.
+ * 
+ * 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
@@ -18,13 +23,14 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 /*
  * @OSF_FREE_COPYRIGHT@
  */
 
 #include <pexpert/pexpert.h>
+#include <pexpert/protos.h>
 #include <kern/debug.h>
 
 static int DEBUGFlag;
@@ -33,22 +39,21 @@ int32_t gPESerialBaud = -1;
 
 void pe_init_debug(void)
 {
-  if (!PE_parse_boot_arg("debug", &DEBUGFlag))
+  if (!PE_parse_boot_argn("debug", &DEBUGFlag, sizeof (DEBUGFlag)))
     DEBUGFlag = 0;
 }
 
-void PE_enter_debugger(char *cause)
+void PE_enter_debugger(const char *cause)
 {
   if (DEBUGFlag & DB_NMI)
     Debugger(cause);
 }
 
 /* extern references */
-extern void cnputc(char c);
 extern void vcattach(void);
 
 /* Globals */
-void (*PE_putc)(char c) = 0;
+void (*PE_putc)(char c);
 
 void PE_init_printf(boolean_t vm_initialized)
 {