X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/5d5c5d0d5b79ade9a973d55186ffda2638ba2b6e..8f6c56a50524aa785f7e596d52dddfb331e18961:/osfmk/i386/iopb.c?ds=sidebyside diff --git a/osfmk/i386/iopb.c b/osfmk/i386/iopb.c index 963686557..8e86de4b2 100644 --- a/osfmk/i386/iopb.c +++ b/osfmk/i386/iopb.c @@ -1,31 +1,29 @@ /* * Copyright (c) 2000 Apple Computer, Inc. All rights reserved. * - * @APPLE_LICENSE_OSREFERENCE_HEADER_START@ + * @APPLE_OSREFERENCE_LICENSE_HEADER_START@ * - * 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 + * 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@ + * + * @APPLE_OSREFERENCE_LICENSE_HEADER_END@ */ /* * @OSF_COPYRIGHT@ @@ -402,7 +400,7 @@ i386_io_port_add( /* 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) { /* @@ -417,7 +415,7 @@ i386_io_port_add( goto Retry; } io_tss = new_io_tss; - pcb->io_tss = io_tss; + pcb->ims.io_tss = io_tss; new_io_tss = 0; } @@ -491,7 +489,7 @@ i386_io_port_remove( } 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); @@ -571,7 +569,7 @@ i386_io_port_list(thread, list, list_count) 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; @@ -656,7 +654,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->io_tss) { + if (iu->ts == pcb->ims.io_tss) { /* * Device is mapped. */