xnu-792.6.61.tar.gz

[apple/xnu.git] / bsd / dev / i386 / kern_machdep.c

diff --git a/bsd/dev/i386/kern_machdep.c b/bsd/dev/i386/kern_machdep.c
index 0c3684b58f8f883165baa85bd55defa3fd95e4d2..a78df67ed891385b29b1bea9aac3cb1e00f940b9 100644 (file)
--- a/bsd/dev/i386/kern_machdep.c
+++ b/bsd/dev/i386/kern_machdep.c
@@ -26,78 +26,30 @@
  *     Author: John Seamons
  *
  *     Machine-specific kernel routines.
- *
- *  8-Dec-91  Peter King (king) at NeXT
- *     Added grade_cpu_subtype().
- *     FIXME: Do we want to merge this with check_cpu_subtype()?
- *
- *  5-Mar-90  John Seamons (jks) at NeXT
- *     Created.
  */
 
 #include       <sys/types.h>
 #include       <mach/machine.h>
 #include       <kern/cpu_number.h>
 
-check_cpu_subtype (cpu_subtype)
-       cpu_subtype_t cpu_subtype;
-{
-       struct machine_slot *ms = &machine_slot[cpu_number()];
-       
-       switch (ms->cpu_subtype) {
-           case CPU_SUBTYPE_386:
-               if (cpu_subtype == CPU_SUBTYPE_386)
-                   return (TRUE);
-               break;
-
-           case CPU_SUBTYPE_486:
-           case CPU_SUBTYPE_486SX:
-               if (    cpu_subtype == CPU_SUBTYPE_486          ||
-                       cpu_subtype == CPU_SUBTYPE_486SX        ||
-                       cpu_subtype == CPU_SUBTYPE_386          )
-                   return (TRUE);
-               break;
-
-           case CPU_SUBTYPE_586:
-               if (    cpu_subtype == CPU_SUBTYPE_586          ||
-                       cpu_subtype == CPU_SUBTYPE_486          ||
-                       cpu_subtype == CPU_SUBTYPE_486SX        ||
-                       cpu_subtype == CPU_SUBTYPE_386          )
-                   return (TRUE);
-               break;
-
-           default:
-               if (    CPU_SUBTYPE_INTEL_MODEL(cpu_subtype) ==
-                       CPU_SUBTYPE_INTEL_MODEL_ALL) {
-                   if (        CPU_SUBTYPE_INTEL_FAMILY(ms->cpu_subtype) >=
-                               CPU_SUBTYPE_INTEL_FAMILY(cpu_subtype))
-                       return (TRUE);
-               }
-               else {
-                   if (        ms->cpu_subtype == cpu_subtype)
-                       return (TRUE);
-               }
-               break;
-       }
-
-       return (FALSE);
-}
+extern int grade_binary(cpu_type_t exectype, cpu_subtype_t execsubtype);
 
 /**********************************************************************
- * Routine:    grade_cpu_subtype()
+ * Routine:    grade_binary()
  *
- * Function:   Return a relative preference for cpu_subtypes in fat
- *             executable files.  The higher the grade, the higher the
- *             preference.  A grade of 0 means not acceptable.
+ * Function:   Return a relative preference for exectypes and
+ *             execsubtypes in fat executable files.  The higher the
+ *             grade, the higher the preference.  A grade of 0 means
+ *             not acceptable.
  **********************************************************************/
-grade_cpu_subtype (cpu_subtype)
-       cpu_subtype_t           cpu_subtype;
+int
+grade_binary(__unused cpu_type_t exectype, cpu_subtype_t execsubtype)
 {
-       struct machine_slot     *ms = &machine_slot[cpu_number()];
+       int             cpusubtype = cpu_subtype();
 
-       switch (ms->cpu_subtype) {
+       switch (cpusubtype) {
            case CPU_SUBTYPE_386:
-               switch (cpu_subtype) {
+               switch (execsubtype) {
                    case CPU_SUBTYPE_386:
                        return 1;
                    default:
@@ -105,7 +57,7 @@ grade_cpu_subtype (cpu_subtype)
                }
 
            case CPU_SUBTYPE_486:
-               switch (cpu_subtype) {
+               switch (execsubtype) {
                    case CPU_SUBTYPE_386:
                        return 1;
 
@@ -120,7 +72,7 @@ grade_cpu_subtype (cpu_subtype)
                }
 
            case CPU_SUBTYPE_486SX:
-               switch (cpu_subtype) {
+               switch (execsubtype) {
                    case CPU_SUBTYPE_386:
                        return 1;
 
@@ -135,7 +87,7 @@ grade_cpu_subtype (cpu_subtype)
                }
 
            case CPU_SUBTYPE_586:
-               switch (cpu_subtype) {
+               switch (execsubtype) {
                    case CPU_SUBTYPE_386:
                        return 1;
 
@@ -153,18 +105,28 @@ grade_cpu_subtype (cpu_subtype)
                }
 
            default:
-               if (    CPU_SUBTYPE_INTEL_MODEL(cpu_subtype) ==
+               if (    CPU_SUBTYPE_INTEL_MODEL(execsubtype) ==
                        CPU_SUBTYPE_INTEL_MODEL_ALL) {
-                   if (        CPU_SUBTYPE_INTEL_FAMILY(ms->cpu_subtype) >=
-                               CPU_SUBTYPE_INTEL_FAMILY(cpu_subtype))
+                   if (        CPU_SUBTYPE_INTEL_FAMILY(cpusubtype) >=
+                               CPU_SUBTYPE_INTEL_FAMILY(execsubtype))
                        return CPU_SUBTYPE_INTEL_FAMILY_MAX - 
-                           CPU_SUBTYPE_INTEL_FAMILY(ms->cpu_subtype) -
-                           CPU_SUBTYPE_INTEL_FAMILY(cpu_subtype);
+                           CPU_SUBTYPE_INTEL_FAMILY(cpusubtype) -
+                           CPU_SUBTYPE_INTEL_FAMILY(execsubtype);
                }
                else {
-                   if (        ms->cpu_subtype == cpu_subtype)
+                   if (        cpusubtype == execsubtype)
                        return CPU_SUBTYPE_INTEL_FAMILY_MAX + 1;
                }
                return 0;
        }
 }
+
+extern void md_prepare_for_shutdown(int, int, char *);
+
+void
+md_prepare_for_shutdown(
+       __unused int paniced,
+       __unused int howto,
+       __unused char * command)
+{
+}