X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/43866e378188c25dd1e2208016ab3cbeb086ae6c..91447636331957f3d9b5ca5b508f07c526b0074d:/osfmk/i386/io_emulate.c?ds=sidebyside

diff --git a/osfmk/i386/io_emulate.c b/osfmk/i386/io_emulate.c
index f381088c7..f9ed656d5 100644
--- a/osfmk/i386/io_emulate.c
+++ b/osfmk/i386/io_emulate.c
@@ -3,22 +3,19 @@
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * 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. 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
+ * This 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, QUIET ENJOYMENT OR NON-INFRINGEMENT.
- * Please see the License for the specific language governing rights and
- * limitations under the License.
+ * FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT.  Please see the
+ * License for the specific language governing rights and limitations
+ * under the License.
  * 
  * @APPLE_LICENSE_HEADER_END@
  */
@@ -54,7 +51,6 @@
  */
 
 #include <platforms.h>
-#include <cpus.h>
 #include <mach/boolean.h>
 #include <mach/port.h>
 #include <kern/thread.h>
@@ -71,13 +67,13 @@
 #include <i386/io_emulate.h>
 #include <i386/iopb_entries.h>
 
+#if 1
 int
 emulate_io(
-	struct i386_saved_state	*regs,
-	int			opcode,
-	int			io_port)
+	__unused struct i386_saved_state	*regs,
+	__unused int				opcode,
+	__unused int				io_port)
 {
-#if 1
 	/* At the moment, we are not allowing I/O emulation 
 	 *
  	 * FIXME - this should probably change due to 
@@ -85,7 +81,14 @@ emulate_io(
 	 */
 
 	return EM_IO_ERROR;
+}
 #else
+int
+emulate_io(
+	struct i386_saved_state	*regs,
+	int			opcode,
+	int			io_port)
+{
 	thread_t	thread = current_thread();
 	at386_io_lock_state();
 
@@ -136,8 +139,8 @@ emulate_io(
 	 * Make the thread use its IO_TSS to get the IO permissions;
 	 * it may not have had one before this.
 	 */
-	act_machine_switch_pcb(thread->top_act);
+	act_machine_switch_pcb(thread);
 
 	return EM_IO_RETRY;
-#endif
 }
+#endif