xnu-792.tar.gz

[apple/xnu.git] / osfmk / kern / machine.h

diff --git a/osfmk/kern/machine.h b/osfmk/kern/machine.h
index 0b93cbf43410e7eb48b8723755219d9ae98eb373..ce77bd868095d0e733b66df985f89e6055698ab8 100644 (file)
--- a/osfmk/kern/machine.h
+++ b/osfmk/kern/machine.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2004 Apple Computer, Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
@@ -26,7 +26,6 @@
 #ifndef        _KERN_MACHINE_H_
 #define        _KERN_MACHINE_H_
 
-#include <cpus.h>
 #include <mach/kern_return.h>
 #include <mach/processor_info.h>
 #include <kern/kern_types.h>
@@ -35,46 +34,76 @@
  * Machine support declarations.
  */
 
-extern thread_t                machine_wake_thread;
-
-extern void            cpu_down(
-                                       int                     cpu);
-
-extern void            cpu_up(
-                                       int                     cpu);
+extern void            processor_up(
+                                       processor_t             processor);
 
 extern void            processor_offline(
                                        processor_t             processor);
 
+extern void            processor_start_thread(void);
+
 /*
  * Must be implemented in machine dependent code.
  */
 
 /* Initialize machine dependent ast code */
-extern void            init_ast_check(
-                                       processor_t             processor);
+extern void init_ast_check(
+                                       processor_t         processor);
 
 /* Cause check for ast */
-extern void            cause_ast_check(
-                                       processor_t             processor);
+extern void cause_ast_check(
+                                       processor_t         processor);
 
-extern kern_return_t   cpu_start(
-                                               int                     slot_num);
+extern kern_return_t cpu_control(
+                                       int                 slot_num,
+                                       processor_info_t    info,
+                                       unsigned int        count);
 
-extern kern_return_t   cpu_control(
-                                               int                                     slot_num,
-                                               processor_info_t        info,
-                                               unsigned int            count);
+extern void    cpu_sleep(void);
 
-extern thread_t                switch_to_shutdown_context(
-                                       thread_t                thread,
-                                       void                    (*doshutdown)(processor_t),
-                                       processor_t             processor);
+extern kern_return_t cpu_start(
+                                       int                 slot_num);
+
+extern void cpu_exit_wait(
+                                       int                 slot_num);
+
+extern kern_return_t cpu_info(
+                                       processor_flavor_t  flavor,
+                                       int                 slot_num,
+                                       processor_info_t    info,
+                                       unsigned int        *count);
+
+extern kern_return_t cpu_info_count(
+                                       processor_flavor_t  flavor,
+                                       unsigned int        *count);
+
+extern thread_t                machine_processor_shutdown(
+                                               thread_t            thread,
+                                               void                (*doshutdown)(processor_t),
+                                               processor_t         processor);
+
+extern void machine_idle(void);
+
+extern void machine_signal_idle(
+                                       processor_t         processor);
+
+extern void halt_cpu(void);
+
+extern void halt_all_cpus(
+                                       boolean_t           reboot);
+
+extern char *machine_boot_info(
+                                       char                *buf,
+                                       vm_size_t           buf_len);
+
+/*
+ * Machine-dependent routine to fill in an array with up to callstack_max
+ * levels of return pc information.
+ */
+extern void machine_callstack(
+                                       natural_t           *buf,
+                                       vm_size_t           callstack_max);
 
-extern kern_return_t cpu_signal(                               /* Signal the target CPU */
-                                       int target, 
-                                       int signal, 
-                                       unsigned int p1, 
-                                       unsigned int p2);
+extern void consider_machine_collect(void);
 
 #endif /* _KERN_MACHINE_H_ */