xnu-1486.2.11.tar.gz

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

diff --git a/osfmk/i386/machine_cpu.h b/osfmk/i386/machine_cpu.h
index 291719b36fff77ceabd1f685094e1728a78bdae5..2460bf606bb3c1c8e93af66f5238a2d2fc9d8fc9 100644 (file)
--- a/osfmk/i386/machine_cpu.h
+++ b/osfmk/i386/machine_cpu.h
@@ -1,23 +1,29 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2005 Apple Computer, 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,
- * 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@
  */
 #ifndef _I386_MACHINE_CPU_H_
 #define _I386_MACHINE_CPU_H_
@@ -26,28 +32,28 @@
 #include <mach/boolean.h>
 #include <kern/kern_types.h>
 #include <pexpert/pexpert.h>
+#include <sys/cdefs.h>
 
+__BEGIN_DECLS
 void   cpu_machine_init(
        void);
 
-kern_return_t cpu_register(
-        int *);
-
-kern_return_t cpu_start(
-        int);
+void   handle_pending_TLB_flushes(
+       void);
 
-void   cpu_doshutdown(
-        void);
 
-void   cpu_sleep(
-        void);
+kern_return_t cpu_register(
+        int *slot_nump);
+__END_DECLS
 
-struct i386_interrupt_state;
-void   cpu_signal_handler(
-       struct i386_interrupt_state *regs);
+static inline void cpu_halt(void)
+{
+       asm volatile( "wbinvd; cli; hlt" );
+}
 
 static inline void cpu_pause(void)
 {
        asm volatile( "rep; nop" );
 }
+
 #endif /* _I386_MACHINE_CPU_H_ */