xnu-792.12.6.tar.gz

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

diff --git a/osfmk/i386/iopb.c b/osfmk/i386/iopb.c
index 6ae4acb7a500fac51fa615916d1d7213589a2952..f4f28a0379908621d591022bcb1c5516de7f58f8 100644 (file)
--- a/osfmk/i386/iopb.c
+++ b/osfmk/i386/iopb.c
@@ -1,23 +1,31 @@
 /*
  * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
  *
 /*
  * 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@
  */
 /*
  * @OSF_COPYRIGHT@


@@ -394,7 +402,7 @@ i386_io_port_add(
        /* Make sure the thread has a TSS. */
 
        simple_lock(&pcb->lock);
        /* Make sure the thread has a TSS. */
 
        simple_lock(&pcb->lock);

-       io_tss = pcb->io_tss;
+       io_tss = pcb->ims.io_tss;

        if (io_tss == 0) {
            if (new_io_tss == 0) {
                /*
        if (io_tss == 0) {
            if (new_io_tss == 0) {
                /*


@@ -409,7 +417,7 @@ i386_io_port_add(
                goto Retry;
            }
            io_tss = new_io_tss;
                goto Retry;
            }
            io_tss = new_io_tss;

-           pcb->io_tss = io_tss;
+           pcb->ims.io_tss = io_tss;

            new_io_tss = 0;
        }
 
            new_io_tss = 0;
        }
 


@@ -483,7 +491,7 @@ i386_io_port_remove(
        }
 
        simple_lock(&pcb->lock);
        }
 
        simple_lock(&pcb->lock);

-       io_tss = pcb->io_tss;
+       io_tss = pcb->ims.io_tss;

        if (io_tss == 0) {
            simple_unlock(&pcb->lock);
            simple_unlock(&iopb_lock);
        if (io_tss == 0) {
            simple_unlock(&pcb->lock);
            simple_unlock(&iopb_lock);


@@ -563,7 +571,7 @@ i386_io_port_list(thread, list, list_count)
 
            simple_lock(&iopb_lock);
            simple_lock(&pcb->lock);
 
            simple_lock(&iopb_lock);
            simple_lock(&pcb->lock);

-           io_tss = pcb->io_tss;
+           io_tss = pcb->ims.io_tss;

            if (io_tss != 0) {
                register io_use_t iu;
 
            if (io_tss != 0) {
                register io_use_t iu;
 


@@ -648,7 +656,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) {
        /* 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->io_tss) {
+           if (iu->ts == pcb->ims.io_tss) {

                /*
                 * Device is mapped.
                 */
                /*
                 * Device is mapped.
                 */