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 3e67ca5ca59e21a6e30deb5ed7e3d5a9983d64a9..0b12f2d3118139d6b6450e4c6c8b400047121469 100644 (file)
--- a/osfmk/ppc/pmsCPU.c
+++ b/osfmk/ppc/pmsCPU.c
@@ -1,5 +1,5 @@
 /*
 /*

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

  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 


@@ -132,8 +132,7 @@ pmsDef pmsDefault[] = {
  */
 
 void pmsCPUSet(uint32_t sel) {
  */
 
 void pmsCPUSet(uint32_t sel) {

-       int nvoltage, nfreq;
-       uint32_t oldaack;
+       int nfreq;

        struct per_proc_info *pp;
 
        pp = getPerProc();                                                                      /* Get our per_proc */
        struct per_proc_info *pp;
 
        pp = getPerProc();                                                                      /* Get our per_proc */


@@ -174,12 +173,11 @@ void pmsCPUConf(void) {
        kern_return_t ret;
        pmsSetFunc_t pmsDfltFunc[pmsSetFuncMax];                        /* List of functions for the external power control to use */
 
        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 */
 
 
 
        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 */
        }
        if(ret != KERN_SUCCESS) {                                                       /* Some screw up? */
                panic("pmsCPUConf: initial stepper table build failed, ret = %08X\n", ret);     /* Squeal */
        }


@@ -215,12 +213,13 @@ void pmsCPUInit(void) {
        pmsPark();                                                                                      /* Then park */
 
        kprintf("************ Stepper hardware initialized, cpu %d ******************\n", cpu); /* (BRINGUP) */
        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;
        uint32_t result;
        struct per_proc_info *pp;
        uint64_t scdata;