xnu-792.12.6.tar.gz

[apple/xnu.git] / osfmk / i386 / io_emulate.c

diff --git a/osfmk/i386/io_emulate.c b/osfmk/i386/io_emulate.c
index 0c955e130815a5497e2d7f144335c73a2bc4e1d6..a3c3b9d1269c42cc9e4d0a66c271896bc12641af 100644 (file)
--- a/osfmk/i386/io_emulate.c
+++ b/osfmk/i386/io_emulate.c
@@ -1,23 +1,31 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_LICENSE_OSREFERENCE_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 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.
- * 
- * @APPLE_LICENSE_HEADER_END@
+ * 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.
+ *
+ * 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, QUIET ENJOYMENT OR NON-INFRINGEMENT. 
+ * Please see the License for the specific language governing rights and 
+ * limitations under the License.
+ *
+ * @APPLE_LICENSE_OSREFERENCE_HEADER_END@
  */
 /*
  * @OSF_COPYRIGHT@
@@ -51,7 +59,6 @@
  */
 
 #include <platforms.h>
-#include <cpus.h>
 #include <mach/boolean.h>
 #include <mach/port.h>
 #include <kern/thread.h>
@@ -68,13 +75,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 
@@ -82,7 +89,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();
 
@@ -133,8 +147,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