xnu-792.22.5.tar.gz

[apple/xnu.git] / pexpert / i386 / kd.c

diff --git a/pexpert/i386/kd.c b/pexpert/i386/kd.c
index 0e8dd758f1c654e5791c975813037988b085516d..7424ed2e4d1ca021d9a2179817b0b20b0cf459ce 100644 (file)
--- a/pexpert/i386/kd.c
+++ b/pexpert/i386/kd.c
@@ -1,23 +1,29 @@
 /*
  * Copyright (c) 2000 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@
  */
 /*
  * @OSF_COPYRIGHT@
@@ -79,6 +85,10 @@
 
 #include <pexpert/pexpert.h>
 
+extern void cpu_shutdown(void);
+
+void   kdreboot(void);
+
 /*
  * Common I/O ports.
  */
@@ -110,35 +120,6 @@
 #define K_CMD_ECHO      0xee    /* used for diagnostic testing */
 #define K_CMD_RESET     0xfe    /* issue a system reset */
 
-/* 
- * cngetc / cnmaygetc
- * 
- * Get one character using polling, rather than interrupts.
- * Used by the kernel debugger.
- */
-
-int
-cngetc(void)
-{
-    char c;
-
-    if ( 0 == (*PE_poll_input)(0, &c) )
-        return ( c );
-    else
-        return ( 0 );
-}
-
-int
-cnmaygetc(void)
-{
-    char c;
-
-    if ( 0 == (*PE_poll_input)(0, &c) )
-        return ( c );
-    else
-        return ( 0 );
-}
-
 /*
  * kd_sendcmd
  *
@@ -165,8 +146,6 @@ kd_sendcmd(unsigned char ch)
 void
 kdreboot(void)
 {
-    extern void cpu_shutdown(void);
-
     kd_sendcmd( K_CMD_RESET );
 
     /*