X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/43866e378188c25dd1e2208016ab3cbeb086ae6c..c0fea4742e91338fffdcf79f86a7c1d5e2b97eb1:/osfmk/i386/iopb.c

diff --git a/osfmk/i386/iopb.c b/osfmk/i386/iopb.c
index 02e6f0543..6ae4acb7a 100644
--- a/osfmk/i386/iopb.c
+++ b/osfmk/i386/iopb.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@
  */
@@ -84,7 +81,7 @@ iopb_init(void)
 
 
 void
-iopb_destroy(iopb_tss_t      io_tss)
+iopb_destroy(__unused iopb_tss_t      io_tss)
 {
 }
 
@@ -148,7 +145,7 @@ void
 iopb_init(void)
 {
 	queue_init(&device_to_io_port_list);
-	simple_lock_init(&iopb_lock, ETAP_IO_IOPB);
+	simple_lock_init(&iopb_lock, 0);
 }
 
 /*
@@ -301,7 +298,7 @@ io_tss_init(
 	io_bitmap_init(io_tss->bitmap);
 	io_tss->barrier = ~0;
 	queue_init(&io_tss->io_port_list);
-	addr += LINEAR_KERNEL_ADDRESS;
+	addr |= LINEAR_KERNEL_ADDRESS;
 	io_tss->iopb_desc[0] = ((size-1) & 0xffff)
 		| ((addr & 0xffff) << 16);
 	io_tss->iopb_desc[1] = ((addr & 0x00ff0000) >> 16)
@@ -371,7 +368,7 @@ i386_io_port_add(
 	 || device == DEVICE_NULL)
 	    return KERN_INVALID_ARGUMENT;
 
-	pcb = thread->top_act->mact.pcb;
+	pcb = thread->machine.pcb;
 
 	new_io_tss = 0;
 	iu = (io_use_t) kalloc(sizeof(struct io_use));
@@ -397,7 +394,7 @@ i386_io_port_add(
 	/* Make sure the thread has a TSS. */
 
 	simple_lock(&pcb->lock);
-	io_tss = pcb->ims.io_tss;
+	io_tss = pcb->io_tss;
 	if (io_tss == 0) {
 	    if (new_io_tss == 0) {
 		/*
@@ -412,7 +409,7 @@ i386_io_port_add(
 		goto Retry;
 	    }
 	    io_tss = new_io_tss;
-	    pcb->ims.io_tss = io_tss;
+	    pcb->io_tss = io_tss;
 	    new_io_tss = 0;
 	}
 
@@ -470,7 +467,7 @@ i386_io_port_remove(
 	 || device == DEVICE_NULL)
 	    return KERN_INVALID_ARGUMENT;
 
-	pcb = thread->top_act->mact.pcb;
+	pcb = thread->machine.pcb;
 
 	simple_lock(&iopb_lock);
 
@@ -486,7 +483,7 @@ i386_io_port_remove(
 	}
 
 	simple_lock(&pcb->lock);
-	io_tss = pcb->ims.io_tss;
+	io_tss = pcb->io_tss;
 	if (io_tss == 0) {
 	    simple_unlock(&pcb->lock);
 	    simple_unlock(&iopb_lock);
@@ -542,7 +539,7 @@ i386_io_port_list(thread, list, list_count)
 	if (thread == THREAD_NULL)
 	    return KERN_INVALID_ARGUMENT;
 
-	pcb = thread->top_act->mact.pcb;
+	pcb = thread->machine.pcb;
 
 	alloc_count = 16;		/* a guess */
 
@@ -566,7 +563,7 @@ i386_io_port_list(thread, list, list_count)
 
 	    simple_lock(&iopb_lock);
 	    simple_lock(&pcb->lock);
-	    io_tss = pcb->ims.io_tss;
+	    io_tss = pcb->io_tss;
 	    if (io_tss != 0) {
 		register io_use_t iu;
 
@@ -636,7 +633,7 @@ iopb_check_mapping(
 	io_port_t	io_port;
 	io_use_t	iu;
 
-	pcb = thread->top_act->mact.pcb;
+	pcb = thread->machine.pcb;
 
 	simple_lock(&iopb_lock);
 
@@ -651,7 +648,7 @@ iopb_check_mapping(
 	/* Look up the mapping in the device`s mapping list. */
 
 	queue_iterate(&io_port->io_use_list, iu, io_use_t, psq) {
-	    if (iu->ts == pcb->ims.io_tss) {
+	    if (iu->ts == pcb->io_tss) {
 		/*
 		 * Device is mapped.
 		 */