cpuspeed in apm info

[Ted Unangst]

The frequency of the cpu is likely to be of interest (in fact, it is to me).
We can include it in the apm info.


Index: arch/i386/i386/apm.c
===================================================================
RCS file: /cvs/src/sys/arch/i386/i386/apm.c,v
retrieving revision 1.113
diff -u -p -r1.113 apm.c
--- arch/i386/i386/apm.c        7 Feb 2015 01:19:40 -0000       1.113
+++ arch/i386/i386/apm.c        21 Sep 2015 15:38:14 -0000
@@ -1084,6 +1084,8 @@ apmioctl(dev_t dev, u_long cmd, caddr_t 
                                                    
swap16(powerp->minutes_left);
                                }
                        }
+                       if (cpu_cpuspeed)
+                               cpu_cpuspeed(&powerp->cpuspeed);
                } else {
                        apm_perror("ioctl get power status", &regs);
                        error = EIO;
Index: arch/i386/include/apmvar.h
===================================================================
RCS file: /cvs/src/sys/arch/i386/include/apmvar.h,v
retrieving revision 1.20
diff -u -p -r1.20 apmvar.h
--- arch/i386/include/apmvar.h  6 Feb 2015 08:16:49 -0000       1.20
+++ arch/i386/include/apmvar.h  21 Sep 2015 15:36:31 -0000
@@ -270,7 +270,8 @@ struct apm_power_info {
        u_char battery_life;
        u_char spare1;
        u_int minutes_left;             /* estimate */
-       u_int spare2[6];
+       u_int cpuspeed;
+       u_int spare2[5];
 };
 
 struct apm_ctl {
Index: arch/amd64/include/apmvar.h
===================================================================
RCS file: /cvs/src/sys/arch/amd64/include/apmvar.h,v
retrieving revision 1.6
diff -u -p -r1.6 apmvar.h
--- arch/amd64/include/apmvar.h 6 Feb 2015 08:16:49 -0000       1.6
+++ arch/amd64/include/apmvar.h 21 Sep 2015 15:32:02 -0000
@@ -271,7 +271,8 @@ struct apm_power_info {
        u_char battery_life;
        u_char spare1;
        u_int minutes_left;             /* estimate */
-       u_int spare2[6];
+       u_int cpuspeed;
+       u_int spare2[5];
 };
 
 struct apm_ctl {
Index: dev/acpi/acpi.c
===================================================================
RCS file: /cvs/src/sys/dev/acpi/acpi.c,v
retrieving revision 1.294
diff -u -p -r1.294 acpi.c
--- dev/acpi/acpi.c     6 Sep 2015 16:47:48 -0000       1.294
+++ dev/acpi/acpi.c     21 Sep 2015 15:33:41 -0000
@@ -2928,6 +2928,8 @@ acpiioctl(dev_t dev, u_long cmd, caddr_t
                        pi->battery_state = APM_BATT_LOW;
                else
                        pi->battery_state = APM_BATT_CRITICAL;
+               if (cpu_cpuspeed)
+                       cpu_cpuspeed(&pi->cpuspeed);
 
                break;