xnu-1228.5.18.tar.gz

[apple/xnu.git] / osfmk / i386 / tsc.h

diff --git a/osfmk/i386/tsc.h b/osfmk/i386/tsc.h
index 71d2d652794d62611996067ce5543a504b526969..79ece708588d8efc20c83b28bde3bc3f29e6724c 100644 (file)
--- a/osfmk/i386/tsc.h
+++ b/osfmk/i386/tsc.h
@@ -1,23 +1,29 @@
 /*
 /*

- * Copyright (c) 2004-2006 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2004-2007 Apple Inc. All rights reserved.

  *
  *

- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_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 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.

  * 
  * 

- * This Original Code and all software distributed under the License are
- * distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * 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,
  * 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.
+ * 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_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 /*
  * @OSF_COPYRIGHT@
  */
 /*
  * @OSF_COPYRIGHT@


@@ -34,8 +40,6 @@
 #ifndef _I386_TSC_H_
 #define _I386_TSC_H_
 
 #ifndef _I386_TSC_H_
 #define _I386_TSC_H_
 

-#define BusRatioShift 40
-#define BusRatioMask 0x1F

 #define IA32_PERF_STS 0x198
 
 extern uint64_t        busFCvtt2n;
 #define IA32_PERF_STS 0x198
 
 extern uint64_t        busFCvtt2n;


@@ -45,6 +49,7 @@ extern uint64_t tscFCvtt2n;
 extern uint64_t tscFCvtn2t;
 extern uint64_t tscGranularity;
 extern uint64_t bus2tsc;
 extern uint64_t tscFCvtn2t;
 extern uint64_t tscGranularity;
 extern uint64_t bus2tsc;

+extern uint64_t busFreq;

 
 struct tscInfo
 {
 
 struct tscInfo
 {


@@ -55,6 +60,7 @@ uint64_t      tscFCvtt2n;
 uint64_t       tscFCvtn2t;
 uint64_t       tscGranularity;
 uint64_t       bus2tsc;
 uint64_t       tscFCvtn2t;
 uint64_t       tscGranularity;
 uint64_t       bus2tsc;

+uint64_t       busFreq;

 };
 typedef struct tscInfo tscInfo_t;
 
 };
 typedef struct tscInfo tscInfo_t;