xnu-1228.3.13.tar.gz

[apple/xnu.git] / osfmk / ppc / pmsCPU.c

diff --git a/osfmk/ppc/pmsCPU.c b/osfmk/ppc/pmsCPU.c
index f241ba7d17ca60b96d6b7b853f83c90532f8cde5..0b12f2d3118139d6b6450e4c6c8b400047121469 100644 (file)
--- a/osfmk/ppc/pmsCPU.c
+++ b/osfmk/ppc/pmsCPU.c
@@ -1,31 +1,29 @@
 /*
- * Copyright (c) 2004-2005 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2004-2006 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@
  */
 #include <ppc/machine_routines.h>
 #include <ppc/machine_cpu.h>
@@ -134,8 +132,7 @@ pmsDef pmsDefault[] = {
  */
 
 void pmsCPUSet(uint32_t sel) {
-       int nvoltage, nfreq;
-       uint32_t oldaack;
+       int nfreq;
        struct per_proc_info *pp;
 
        pp = getPerProc();                                                                      /* Get our per_proc */
@@ -176,12 +173,11 @@ void pmsCPUConf(void) {
        kern_return_t ret;
        pmsSetFunc_t pmsDfltFunc[pmsSetFuncMax];                        /* List of functions for the external power control to use */
 
-       for(i = 0; i < pmsSetFuncMax; i++) pmsDfltFunc[i] = 0;  /* Clear this */
+       for(i = 0; i < pmsSetFuncMax; i++) pmsDfltFunc[i] = NULL;       /* Clear this */
 
 
        ret = pmsBuild((pmsDef *)&pmsDefault, sizeof(pmsDefault), pmsDfltFunc, 0, (pmsQueryFunc_t)0);   /* Configure the default stepper */
 
-pCCfinish:
        if(ret != KERN_SUCCESS) {                                                       /* Some screw up? */
                panic("pmsCPUConf: initial stepper table build failed, ret = %08X\n", ret);     /* Squeal */
        }
@@ -217,12 +213,13 @@ void pmsCPUInit(void) {
        pmsPark();                                                                                      /* Then park */
 
        kprintf("************ Stepper hardware initialized, cpu %d ******************\n", cpu); /* (BRINGUP) */
-
-       return;
 }
 
-uint32_t pmsCPUQuery(void) {
+extern uint32_t hid1get(void);
 
+uint32_t
+pmsCPUQuery(void)
+{
        uint32_t result;
        struct per_proc_info *pp;
        uint64_t scdata;