X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/8ad349bb6ed4a0be06e34c92be0d98b92e078db4..d41d1dae2cd00cc08c7982087d1c445180cad9f5:/iokit/Kernel/IOFilterInterruptEventSource.cpp diff --git a/iokit/Kernel/IOFilterInterruptEventSource.cpp b/iokit/Kernel/IOFilterInterruptEventSource.cpp index 130a5d443..47a3b8a14 100644 --- a/iokit/Kernel/IOFilterInterruptEventSource.cpp +++ b/iokit/Kernel/IOFilterInterruptEventSource.cpp @@ -1,31 +1,29 @@ /* * Copyright (c) 1998-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@ */ /* Copyright (c) 1999 Apple Computer, Inc. All rights reserved. @@ -44,19 +42,19 @@ HISTORY #define IOTimeTypeStampS(t) \ do { \ IOTimeStampStart(IODBG_INTES(t), \ - (unsigned int) this, (unsigned int) owner); \ + (uintptr_t) this, (uintptr_t) owner); \ } while(0) #define IOTimeTypeStampE(t) \ do { \ IOTimeStampEnd(IODBG_INTES(t), \ - (unsigned int) this, (unsigned int) owner); \ + (uintptr_t) this, (uintptr_t) owner); \ } while(0) #define IOTimeStampLatency() \ do { \ IOTimeStampEnd(IODBG_INTES(IOINTES_LAT), \ - (unsigned int) this, (unsigned int) owner); \ + (uintptr_t) this, (uintptr_t) owner); \ } while(0) #else /* !KDEBUG */ @@ -163,7 +161,7 @@ IOTimeTypeStampS(IOINTES_INTCTXT); IOTimeTypeStampS(IOINTES_INTFLTR); IOTimeStampConstant(IODBG_INTES(IOINTES_FILTER), - (unsigned int) filterAction, (unsigned int) owner); + (uintptr_t) filterAction, (uintptr_t) owner); filterRes = (*filterAction)(owner, this); IOTimeTypeStampE(IOINTES_INTFLTR); @@ -182,7 +180,7 @@ IOTimeTypeStampS(IOINTES_INTCTXT); IOTimeTypeStampS(IOINTES_INTFLTR); IOTimeStampConstant(IODBG_INTES(IOINTES_FILTER), - (unsigned int) filterAction, (unsigned int) owner); + (uintptr_t) filterAction, (uintptr_t) owner); filterRes = (*filterAction)(owner, this); IOTimeTypeStampE(IOINTES_INTFLTR);