New version

Resolves: rhbz#821144 - Dropped patches: unknown-readings-fix (upstreamed), compile-fix (upstreamed), power-supply-add-power-now-support (upstreamed), html-print-commands (upstreamed), add-power-supply-class-support (obsoleted), power-supply-units-fix (obsoleted) - Updated patches: show-watts-only-if-discharging patch (sent upstream), html-escape patch - Added patch: valid-html-output (sent upstream)
2012-05-16 21:46:46 +02:00 · 2012-05-16 21:46:46 +02:00 · 62cae60ab1
commit 62cae60ab1
parent 042fbe64d9
14 changed files with 718 additions and 1052 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,4 +1 @@
-powertop-1.11.tar.gz
-/powertop-1.13.tar.gz
-/powertop-1.97.tar.bz2
-/powertop-1.98.tar.bz2
+powertop-*.tar.bz2
--- a/powertop-1.98-add-power-supply-class-support.patch
+++ b/powertop-1.98-add-power-supply-class-support.patch
@ -1,337 +0,0 @@
-commit a1c28f69847480cc54f36046e96e93a02a2c661d
-Author: John Mathew <johnx.mathew@intel.com>
-Date:   Thu Jun 30 09:58:26 2011 +0300
-
-    measurement: add support for universal power supply monitor
-    
-    This patch enables powertop to display power estimates on devices that
-    implement power_supply class and donot have acpi battery interface.
-    
-    First the acpi/battery interface is checked and if it is not accesible
-    the sysfs/power_class interface is used
-
-diff --git a/Makefile b/Makefile
-index b0b6cb7..f0ebf21 100644
--- a/Makefile
-+++ b/Makefile
-@@ -13,7 +13,7 @@ OBJS += perf/perf.o perf/perf_bundle.o
- OBJS += process/process.o process/do_process.o process/interrupt.o process/timer.o process/work.o process/powerconsumer.o process/device.o
- DEVS += devices/device.o devices/backlight.o devices/usb.o devices/ahci.o devices/alsa.o devices/rfkill.o devices/i915-gpu.o devices/thinkpad-fan.o devices/network.o devices/thinkpad-light.o
- DEVS += devices/runtime_pm.o
-DEVS += measurement/measurement.o measurement/acpi.o measurement/extech.o
-+DEVS += measurement/measurement.o measurement/acpi.o measurement/extech.o measurement/power_supply.o
- OBJS += $(DEVS)
- OBJS += parameters/parameters.o parameters/learn.o parameters/persistent.o
- OBJS += calibrate/calibrate.o
-diff --git a/measurement/measurement.cpp b/measurement/measurement.cpp
-index 3dbaab9..0d679f7 100644
--- a/measurement/measurement.cpp
-+++ b/measurement/measurement.cpp
-@@ -25,11 +25,15 @@
- #include "measurement.h"
- #include "acpi.h"
- #include "extech.h"
-+#include "power_supply.h"
- #include "../parameters/parameters.h"
- #include "../lib.h"
- 
- #include <sys/types.h>
- #include <dirent.h>
-+#include <unistd.h>
-+#include <stdio.h>
-+#include <fstream>
- 
- double min_power = 50000.0;
- 
-@@ -111,16 +114,45 @@ void power_meters_callback(const char *d_name)
- 		power_meters.push_back(meter);
- }
- 
-+void power_supply_callback(const char *d_name)
-+{
-+	char filename[4096];
-+	char line[4096];
-+	ifstream file;
-+	bool discharging = false;
-+
-+	sprintf(filename, "/sys/class/power_supply/%s/uevent", d_name);
-+	file.open(filename, ios::in);
-+	if (!file)
-+		return;
-+
-+	while (file) {
-+		file.getline(line, 4096);
-+
-+		if (strstr(line, "POWER_SUPPLY_STATUS") && strstr(line, "POWER_SUPPLY_STATUS"))
-+		      discharging = true;
-+	}
-+	file.close();
-+
-+	if (!discharging)
-+	    return;
-+
-+	class power_supply *power;
-+	power = new(std::nothrow) class power_supply(d_name);
-+	if (power)
-+		power_meters.push_back(power);
-+}
-+
- void detect_power_meters(void)
- {
-	process_directory("/proc/acpi/battery", power_meters_callback);
-+	if (access("/sys/class/power_supply", R_OK ) == 0)
-+		process_directory("/sys/class/power_supply", power_supply_callback);
-+	else if (access("/proc/acpi/battery", R_OK ) == 0)
-+		process_directory("/proc/acpi/battery", power_meters_callback);
- }
- 
- void extech_power_meter(const char *devnode)
- {
-	DIR *dir;
-	struct dirent *entry;
-
- 	class extech_power_meter *meter;
- 
- 	meter = new class extech_power_meter(devnode);
-diff --git a/measurement/power_supply.cpp b/measurement/power_supply.cpp
-new file mode 100755
-index 0000000..b4fe3af
--- /dev/null
-+++ b/measurement/power_supply.cpp
-@@ -0,0 +1,184 @@
-+/*
-+ * Copyright 2011, Intel Corporation
-+ *
-+ * This file is part of PowerTOP
-+ *
-+ * This program file is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License as published by the
-+ * Free Software Foundation; version 2 of the License.
-+ *
-+ * This program is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+ * for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program in a file named COPYING; if not, write to the
-+ * Free Software Foundation, Inc,
-+ * 51 Franklin Street, Fifth Floor,
-+ * Boston, MA 02110-1301 USA
-+ * or just google for it.
-+ *
-+ * Authors:
-+ *	John Mathew <johnx.mathew@intel.com>
-+ */
-+#include "measurement.h"
-+#include "power_supply.h"
-+#include <iostream>
-+#include <fstream>
-+#include <string.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+
-+using namespace std;
-+
-+power_supply::power_supply(const char *supply_name)
-+{
-+	rate = 0.0;
-+	capacity = 0.0;
-+	voltage = 0.0;
-+	strncpy(battery_name, supply_name, sizeof(battery_name));
-+}
-+
-+/*
-+POWER_SUPPLY_NAME=msic-battery
-+POWER_SUPPLY_STATUS=Discharging
-+POWER_SUPPLY_HEALTH=Cold
-+POWER_SUPPLY_PRESENT=1
-+POWER_SUPPLY_TECHNOLOGY=Li-ion
-+POWER_SUPPLY_VOLTAGE_MAX_DESIGN=4200000
-+POWER_SUPPLY_VOLTAGE_NOW=4119000
-+POWER_SUPPLY_CURRENT_NOW=-290000
-+POWER_SUPPLY_CHARGE_NOW=1503000
-+POWER_SUPPLY_CHARGE_COUNTER=-254923
-+POWER_SUPPLY_CHARGE_FULL_DESIGN=1500000
-+POWER_SUPPLY_CHARGE_FULL=1500000
-+POWER_SUPPLY_CHARGE_AVG=32762000
-+POWER_SUPPLY_ENERGY_FULL=6300000
-+POWER_SUPPLY_ENERGY_NOW=6235000
-+POWER_SUPPLY_CAPACITY_LEVEL=Full
-+POWER_SUPPLY_CAPACITY=100
-+POWER_SUPPLY_TEMP=-340
-+POWER_SUPPLY_MODEL_NAME=CDK0
-+POWER_SUPPLY_MANUFACTURER=IN
-+
-+Quoting include/linux/power_supply.h:
-+
-+All voltages, currents, charges, energies, time and temperatures in µV,
-+µA, µAh, µWh, seconds and tenths of degree Celsius unless otherwise
-+stated. It's driver's job to convert its raw values to units in which
-+this class operates.
-+*/
-+
-+void power_supply::measure(void)
-+{
-+	char filename[4096];
-+	char line[4096];
-+	ifstream file;
-+
-+	double _rate = 0;
-+	double _capacity = 0;
-+	double _voltage = 0;
-+
-+	char rate_units[16];
-+	char capacity_units[16];
-+	char voltage_units[16];
-+
-+	rate_units[0] = 0;
-+	capacity_units[0] = 0;
-+	voltage_units[0] = 0;
-+
-+	rate = 0;
-+	voltage = 0;
-+	capacity = 0;
-+
-+	sprintf(filename, "/sys/class/power_supply/%s/uevent", battery_name);
-+
-+	file.open(filename, ios::in);
-+	if (!file)
-+		return;
-+
-+	while (file) {
-+		char *c;
-+		file.getline(line, 4096);
-+
-+		if (strstr(line, "PRESENT")) {
-+			c = strchr(line, '=');
-+			c++;
-+			if(*c == '0'){
-+				printf ("Battery not present");
-+				return;
-+			}
-+		}
-+		if (strstr(line, "CURRENT_NOW")) {
-+			c = strchr(line, '=');
-+			c++;
-+			if(*c == '-') c++; // ignoring the negative sign
-+			_rate = strtoull(c, NULL, 10);
-+			if (c) {
-+				//printf ("CURRENT: %f. \n",_rate);
-+			} else {
-+				_rate = 0;
-+			}
-+		}
-+		if (strstr(line, "CAPACITY=")) {
-+			c = strchr(line, '=');
-+			c++;
-+			_capacity = strtoull(c, NULL, 10);
-+			if (c) {
-+				//printf ("CAPACITY: %f. \n",_capacity);
-+			} else {
-+				_capacity = 0;
-+			}
-+		}
-+		if (strstr(line, "VOLTAGE_NOW")) {
-+			c = strchr(line, '=');
-+			c++;
-+			while (*c == ' ') c++;
-+			_voltage = strtoull(c, NULL, 10);
-+			if (c) {
-+				//printf ("VOLTAGE_NOW: %f. \n",_voltage);
-+			} else {
-+				_voltage = 0;
-+			}
-+		}
-+	}
-+	file.close();
-+
-+	if(_voltage) {
-+		_voltage = _voltage / 1000.0;
-+		voltage = _voltage;
-+	} else {
-+		voltage = 0.0;
-+	}
-+
-+	if(_rate) {
-+		_rate = _rate / 1000.0;
-+		_rate = _rate * _voltage;
-+		rate = _rate;
-+	} else {
-+		rate = 0.0;
-+	}
-+
-+	if(_capacity)
-+		capacity = _capacity;
-+	else
-+		capacity = 0.0;
-+}
-+
-+
-+void power_supply::end_measurement(void)
-+{
-+	measure();
-+}
-+
-+void power_supply::start_measurement(void)
-+{
-+	/* ACPI battery state is a lagging indication, lets only measure at the end */
-+}
-+
-+
-+double power_supply::joules_consumed(void)
-+{
-+	return rate;
-+}
-diff --git a/measurement/power_supply.h b/measurement/power_supply.h
-new file mode 100755
-index 0000000..5ad776e
--- /dev/null
-+++ b/measurement/power_supply.h
-@@ -0,0 +1,46 @@
-+/*
-+ * Copyright 2011, Intel Corporation
-+ *
-+ * This file is part of PowerTOP
-+ *
-+ * This program file is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License as published by the
-+ * Free Software Foundation; version 2 of the License.
-+ *
-+ * This program is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-+ * for more details.
-+ *
-+ * You should have received a copy of the GNU General Public License
-+ * along with this program in a file named COPYING; if not, write to the
-+ * Free Software Foundation, Inc,
-+ * 51 Franklin Street, Fifth Floor,
-+ * Boston, MA 02110-1301 USA
-+ * or just google for it.
-+ *
-+ * Authors:
-+ *	John Mathew <johnx.mathew@intel.com>
-+ */
-+#ifndef __INCLUDE_GUARD_POWER_SUPPLY_H
-+#define __INCLUDE_GUARD_POWER_SUPPLY_H
-+
-+#include "measurement.h"
-+
-+class power_supply:public power_meter {
-+	char battery_name[256];
-+
-+	double capacity;
-+	double rate;
-+	double voltage;
-+	void measure(void);
-+public:
-+	power_supply(const char *_battery_name);
-+	virtual void start_measurement(void);
-+	virtual void end_measurement(void);
-+
-+	virtual double joules_consumed(void);
-+	virtual double dev_capacity(void) { return capacity; };
-+};
-+
-+#endif
--- a/powertop-1.98-compile-fix.patch
+++ b/powertop-1.98-compile-fix.patch
@ -1,110 +0,0 @@
-diff -up powertop-1.98/devices/alsa.cpp.orig powertop-1.98/devices/alsa.cpp
--- powertop-1.98/devices/alsa.cpp.orig	2011-05-11 06:48:37.000000000 +0200
-+++ powertop-1.98/devices/alsa.cpp	2012-01-11 16:19:53.365786704 +0100
-@@ -28,6 +28,7 @@
- #include <stdio.h>
- #include <sys/types.h>
- #include <dirent.h>
-+#include <unistd.h>
- 
- 
- using namespace std;
-diff -up powertop-1.98/devices/device.cpp.orig powertop-1.98/devices/device.cpp
--- powertop-1.98/devices/device.cpp.orig	2011-05-11 06:48:37.000000000 +0200
-+++ powertop-1.98/devices/device.cpp	2012-01-11 16:13:38.284981557 +0100
-@@ -29,6 +29,7 @@
- #include <stdio.h>
- #include <limits.h>
- #include <stdlib.h>
-+#include <unistd.h>
- 
- using namespace std;
- 
-diff -up powertop-1.98/html.cpp.orig powertop-1.98/html.cpp
--- powertop-1.98/html.cpp.orig	2011-05-11 06:48:37.000000000 +0200
-+++ powertop-1.98/html.cpp	2012-01-11 16:06:58.714989836 +0100
-@@ -29,6 +29,7 @@
- #include <utility>
- #include <iostream>
- #include <fstream>
-+#include <unistd.h>
- 
- #include "css.h"
- #include "lib.h"
-diff -up powertop-1.98/devices/i915-gpu.cpp.orig powertop-1.98/devices/i915-gpu.cpp
--- powertop-1.98/devices/i915-gpu.cpp.orig	2011-05-11 06:48:37.000000000 +0200
-+++ powertop-1.98/devices/i915-gpu.cpp	2012-01-11 16:21:46.958008197 +0100
-@@ -28,6 +28,7 @@
- #include <stdio.h>
- #include <sys/types.h>
- #include <dirent.h>
-+#include <unistd.h>
- 
- 
- using namespace std;
-diff -up powertop-1.98/cpu/intel_cpus.cpp.orig powertop-1.98/cpu/intel_cpus.cpp
--- powertop-1.98/cpu/intel_cpus.cpp.orig	2011-05-11 06:48:37.000000000 +0200
-+++ powertop-1.98/cpu/intel_cpus.cpp	2012-01-11 16:11:55.784740852 +0100
-@@ -34,6 +34,7 @@
- #include <sys/time.h>
- #include <string.h>
- #include <errno.h>
-+#include <unistd.h>
- 
- #include "../lib.h"
- #include "../parameters/parameters.h"
-diff -up powertop-1.98/main.cpp.orig powertop-1.98/main.cpp
--- powertop-1.98/main.cpp.orig	2011-05-11 06:48:37.000000000 +0200
-+++ powertop-1.98/main.cpp	2012-01-11 16:00:06.445806979 +0100
-@@ -33,6 +33,7 @@
- #include <time.h>
- #include <sys/stat.h>
- #include <getopt.h>
-+#include <unistd.h>
- 
- #include "cpu/cpu.h"
- #include "process/process.h"
-diff -up powertop-1.98/devices/network.cpp.orig powertop-1.98/devices/network.cpp
--- powertop-1.98/devices/network.cpp.orig	2011-05-11 06:48:37.000000000 +0200
-+++ powertop-1.98/devices/network.cpp	2012-01-11 16:23:18.176178890 +0100
-@@ -33,6 +33,7 @@
- #include <dirent.h>
- #include <libgen.h>
- #include <stdlib.h>
-+#include <unistd.h>
- 
- #include <linux/ethtool.h>
- 
-diff -up powertop-1.98/devices/rfkill.cpp.orig powertop-1.98/devices/rfkill.cpp
--- powertop-1.98/devices/rfkill.cpp.orig	2011-05-11 06:48:37.000000000 +0200
-+++ powertop-1.98/devices/rfkill.cpp	2012-01-11 16:15:46.003268813 +0100
-@@ -29,6 +29,7 @@
- #include <sys/types.h>
- #include <dirent.h>
- #include <libgen.h>
-+#include <unistd.h>
- 
- 
- using namespace std;
-diff -up powertop-1.98/devices/thinkpad-fan.cpp.orig powertop-1.98/devices/thinkpad-fan.cpp
--- powertop-1.98/devices/thinkpad-fan.cpp.orig	2011-05-11 06:48:37.000000000 +0200
-+++ powertop-1.98/devices/thinkpad-fan.cpp	2012-01-11 16:25:27.550410318 +0100
-@@ -29,6 +29,7 @@
- #include <sys/types.h>
- #include <dirent.h>
- #include <math.h>
-+#include <unistd.h>
- 
- #include "../lib.h"
- 
-diff -up powertop-1.98/devices/thinkpad-light.cpp.orig powertop-1.98/devices/thinkpad-light.cpp
--- powertop-1.98/devices/thinkpad-light.cpp.orig	2012-01-11 16:27:38.000000000 +0100
-+++ powertop-1.98/devices/thinkpad-light.cpp	2012-01-11 16:27:50.995652724 +0100
-@@ -29,6 +29,7 @@
- #include <sys/types.h>
- #include <dirent.h>
- #include <math.h>
-+#include <unistd.h>
- 
- #include "../lib.h"
- 
--- a/powertop-1.98-html-escape.patch
+++ b/powertop-1.98-html-escape.patch
@ -1,38 +0,0 @@
-diff --git a/tuning/tuning.cpp b/tuning/tuning.cpp
-index dd5b1dc..234cea9 100644
--- a/tuning/tuning.cpp
-+++ b/tuning/tuning.cpp
-@@ -192,6 +192,21 @@ static const char *tune_class_bad(int line)
- 	return "tunable_even_bad";
- }
- 
-+static void html_encode(std::string& data) {
-+	std::string buffer;
-+	buffer.reserve(data.size());
-+	for (size_t pos = 0; pos != data.size(); ++pos) {
-+		switch(data[pos]) {
-+			case '&':  buffer.append("&amp;");       break;
-+			case '\"': buffer.append("&quot;");      break;
-+			case '<':  buffer.append("&lt;");        break;
-+			case '>':  buffer.append("&gt;");        break;
-+			default:   buffer.append(1, data[pos]); break;
-+		}
-+	}
-+	data.swap(buffer);
-+}
-+
- 
- void html_show_tunables(void)
- {
-@@ -218,7 +233,10 @@ void html_show_tunables(void)
- 		}
- 
- 		line++;
-		fprintf(htmlout, "<tr class=\"%s\"><td>%s</td><td>%s</td></tr>\n", tune_class_bad(line), all_tunables[i]->description(), all_tunables[i]->toggle_script());
-+
-+		std::string script(all_tunables[i]->toggle_script());
-+		html_encode(script);
-+		fprintf(htmlout, "<tr class=\"%s\"><td>%s</td><td>%s</td></tr>\n", tune_class_bad(line), all_tunables[i]->description(), script.c_str());
- 	}
- 
- 	if (line > 0) 
--- a/powertop-1.98-html-print-commands.patch
+++ b/powertop-1.98-html-print-commands.patch
@ -1,385 +0,0 @@
-diff --git a/tuning/bluetooth.cpp b/tuning/bluetooth.cpp
-index 3957316..cc98642 100644
--- a/tuning/bluetooth.cpp
-+++ b/tuning/bluetooth.cpp
-@@ -46,6 +46,8 @@
- bt_tunable::bt_tunable(void) : tunable("", 1.0, "Good", "Bad", "Unknown")
- {
- 	sprintf(desc, _("Bluetooth device interface status"));
-+	strcpy(toggle_bad, "/usr/sbin/hciconfig hci0 up &> /dev/null &");
-+	strcpy(toggle_good, "/usr/sbin/hciconfig hci0 down &> /dev/null");
- }
- 
- 
-@@ -180,6 +182,16 @@ void bt_tunable::toggle(void)
- 	system("/usr/sbin/hciconfig hci0 down &> /dev/null");
- }
- 
-+const char *bt_tunable::toggle_script(void)
-+{
-+	int good;
-+	good = good_bad();
-+
-+	if (good == TUNE_GOOD) {
-+		return toggle_bad;
-+	}
-+	return toggle_good;
-+}
- 
- 
- void add_bt_tunable(void)
-diff --git a/tuning/bluetooth.h b/tuning/bluetooth.h
-index 27e15f1..ecb667d 100644
--- a/tuning/bluetooth.h
-+++ b/tuning/bluetooth.h
-@@ -39,6 +39,8 @@ public:
- 
- 	virtual void toggle(void);
- 
-+	virtual const char *toggle_script(void);
-+
- };
- 
- extern void add_bt_tunable(void);
-diff --git a/tuning/cpufreq.cpp b/tuning/cpufreq.cpp
-index bf2b8ae..3d0dbea 100644
--- a/tuning/cpufreq.cpp
-+++ b/tuning/cpufreq.cpp
-@@ -35,6 +35,7 @@
- #include <unistd.h> 
- #include <dirent.h>
- #include <errno.h>
-+#include <sys/stat.h>
- 
- #include "../lib.h"
- #include "cpufreq.h"
-@@ -153,6 +154,54 @@ void cpufreq_tunable::toggle(void)
- 	closedir(dir);
- }
- 
-+const char *cpufreq_tunable::toggle_script(void) {
-+	DIR *dir;
-+	struct dirent *dirent;
-+	FILE *file;
-+	char filename[PATH_MAX];
-+	char tmp[4096];
-+	struct stat statbuf;
-+	int good;
-+	good = good_bad();
-+
-+	strcpy(toggle_good, "/sbin/modprobe cpufreq_ondemand > /dev/null 2>&1\n");
-+
-+	if (good == TUNE_GOOD) {
-+		dir = opendir("/sys/devices/system/cpu");
-+		if (!dir)
-+			return NULL;
-+
-+		while ((dirent = readdir(dir))) {
-+			if (dirent->d_name[0]=='.')
-+				continue;
-+			sprintf(filename, "/sys/devices/system/cpu/%s/cpufreq/scaling_governor", dirent->d_name);
-+			if (stat(filename, &statbuf) == -1)
-+				continue;
-+			sprintf(tmp, "echo '%s' > '%s';\n", original, filename);
-+			strcat(toggle_good, tmp);
-+		}
-+
-+		closedir(dir);
-+		return toggle_good;
-+	}
-+
-+	dir = opendir("/sys/devices/system/cpu");
-+	if (!dir)
-+		return NULL;
-+
-+	while ((dirent = readdir(dir))) {
-+		if (dirent->d_name[0]=='.')
-+			continue;
-+		sprintf(filename, "/sys/devices/system/cpu/%s/cpufreq/scaling_governor", dirent->d_name);
-+		if (stat(filename, &statbuf) == -1)
-+			continue;
-+		sprintf(tmp, "echo 'ondemand' > '%s';\n", filename);
-+		strcat(toggle_good, tmp);
-+	}
-+
-+	closedir(dir);
-+	return toggle_good;
-+}
- 
- 
- void add_cpufreq_tunable(void)
-diff --git a/tuning/cpufreq.h b/tuning/cpufreq.h
-index 55af71f..983f813 100644
--- a/tuning/cpufreq.h
-+++ b/tuning/cpufreq.h
-@@ -40,6 +40,8 @@ public:
- 
- 	virtual void toggle(void);
- 
-+	virtual const char *toggle_script(void);
-+
- };
- 
- extern void add_cpufreq_tunable(void);
-diff --git a/tuning/ethernet.cpp b/tuning/ethernet.cpp
-index 4666ac1..7687e38 100644
--- a/tuning/ethernet.cpp
-+++ b/tuning/ethernet.cpp
-@@ -54,6 +54,8 @@ ethernet_tunable::ethernet_tunable(const char *iface) : tunable("", 0.3, _("Good
- 	memset(interf, 0, sizeof(interf));
- 	strncpy(interf, iface, sizeof(interf));
- 	sprintf(desc, _("Wake-on-lan status for device %s"), iface);
-+	sprintf(toggle_good, "ethtool -s %s wol d;", iface);
-+	
- }
- 
- 
-@@ -128,6 +130,18 @@ void ethernet_tunable::toggle(void)
- 	close(sock);
- }
- 
-+const char *ethernet_tunable::toggle_script(void)
-+{
-+	int good;
-+	good = good_bad();
-+
-+	if (good != TUNE_GOOD) {
-+		return toggle_good;
-+	}
-+
-+	return NULL;
-+}
-+
- 
- void ethtunable_callback(const char *d_name)
- {
-diff --git a/tuning/ethernet.h b/tuning/ethernet.h
-index eeb6ebb..85810fb 100644
--- a/tuning/ethernet.h
-+++ b/tuning/ethernet.h
-@@ -40,6 +40,8 @@ public:
- 
- 	virtual void toggle(void);
- 
-+	virtual const char *toggle_script(void);
-+
- };
- 
- extern void add_ethernet_tunable(void);
-diff --git a/tuning/runtime.cpp b/tuning/runtime.cpp
-index 03cfa0b..3c6dae8 100644
--- a/tuning/runtime.cpp
-+++ b/tuning/runtime.cpp
-@@ -77,6 +77,8 @@ runtime_tunable::runtime_tunable(const char *path, const char *bus, const char *
- 
- 		
- 	}
-+	sprintf(toggle_good, "echo 'auto' > '%s';", runtime_path);
-+	sprintf(toggle_bad, "echo 'on' > '%s';", runtime_path);
- }
- 
- int runtime_tunable::good_bad(void)
-@@ -105,6 +107,18 @@ void runtime_tunable::toggle(void)
- 	write_sysfs(runtime_path, "auto");
- }
- 
-+const char *runtime_tunable::toggle_script(void)
-+{
-+	int good;
-+	good = good_bad();
-+
-+	if (good == TUNE_GOOD) {
-+		return toggle_bad;
-+	}
-+
-+	return toggle_good;
-+}
-+
- 
- void add_runtime_tunables(const char *bus)
- {
-diff --git a/tuning/runtime.h b/tuning/runtime.h
-index c874241..a3c3e20 100644
--- a/tuning/runtime.h
-+++ b/tuning/runtime.h
-@@ -39,6 +39,8 @@ public:
- 
- 	virtual void toggle(void);
- 
-+	virtual const char *toggle_script(void);
-+
- };
- 
- extern void add_runtime_tunables(const char *bus);
-diff --git a/tuning/sysfs.cpp b/tuning/sysfs.cpp
-index e1742a3..ffb2df0 100644
--- a/tuning/sysfs.cpp
-+++ b/tuning/sysfs.cpp
-@@ -39,6 +39,8 @@ sysfs_tunable::sysfs_tunable(const char *str, const char *_sysfs_path, const cha
- 	strcpy(sysfs_path, _sysfs_path);
- 	strcpy(target_value, _target_content);
- 	bad_value[0] = 0;
-+	sprintf(toggle_good, "echo '%s' > '%s';", target_value, sysfs_path);
-+	sprintf(toggle_bad, "echo '%s' > '%s';", bad_value, sysfs_path);
- }
- 
- int sysfs_tunable::good_bad(void)
-@@ -77,6 +79,19 @@ void sysfs_tunable::toggle(void)
- 	write_sysfs(sysfs_path, target_value);
- }
- 
-+const char *sysfs_tunable::toggle_script(void) {
-+	int good;
-+	good = good_bad();
-+
-+	if (good == TUNE_GOOD) {
-+		if (strlen(bad_value) > 0)
-+			return toggle_bad;
-+		return NULL;
-+	}
-+
-+	return toggle_good;
-+}
-+
- 
- void add_sysfs_tunable(const char *str, const char *_sysfs_path, const char *_target_content)
- {
-diff --git a/tuning/sysfs.h b/tuning/sysfs.h
-index 9fee4c0..ac7938c 100644
--- a/tuning/sysfs.h
-+++ b/tuning/sysfs.h
-@@ -42,6 +42,8 @@ public:
- 
- 	virtual void toggle(void);
- 
-+	virtual const char *toggle_script(void);
-+
- };
- 
- extern void add_sysfs_tunable(const char *str, const char *_sysfs_path, const char *_target_content);
-diff --git a/tuning/tunable.h b/tuning/tunable.h
-index a4e994d..dacbd79 100644
--- a/tuning/tunable.h
-+++ b/tuning/tunable.h
-@@ -42,6 +42,9 @@ class tunable {
- 	char good_string[128];
- 	char bad_string[128];
- 	char neutral_string[128];
-+protected:
-+	char toggle_good[4096];
-+	char toggle_bad[4096];
- public:
- 	char desc[4096];
- 	double score;
-@@ -67,6 +70,8 @@ public:
- 	virtual const char *description(void) { return desc; };
- 
- 	virtual void toggle(void) { };
-+
-+	virtual const char *toggle_script(void) { return NULL; }
- };
- 
- extern vector<class tunable *> all_tunables;
-diff --git a/tuning/tuning.cpp b/tuning/tuning.cpp
-index c63f1e8..dd5b1dc 100644
--- a/tuning/tuning.cpp
-+++ b/tuning/tuning.cpp
-@@ -218,7 +218,7 @@ void html_show_tunables(void)
- 		}
- 
- 		line++;
-		fprintf(htmlout, "<tr class=\"%s\"><td>%s</td></tr>\n", tune_class_bad(line), all_tunables[i]->description());
-+		fprintf(htmlout, "<tr class=\"%s\"><td>%s</td><td>%s</td></tr>\n", tune_class_bad(line), all_tunables[i]->description(), all_tunables[i]->toggle_script());
- 	}
- 
- 	if (line > 0) 
-diff --git a/tuning/usb.cpp b/tuning/usb.cpp
-index 16e25d4..6bcfb07 100644
--- a/tuning/usb.cpp
-+++ b/tuning/usb.cpp
-@@ -74,6 +74,9 @@ usb_tunable::usb_tunable(const char *path, const char *name) : tunable("", 0.9,
- 		sprintf(desc, _("Autosuspend for USB device %s [%s]"), product, name);
- 	else if (strlen(vendor))
- 		sprintf(desc, _("Autosuspend for USB device %s [%s]"), vendor, name);
-+
-+	sprintf(toggle_good, "echo 'auto' > '%s';", usb_path);
-+	sprintf(toggle_bad, "echo 'on' > '%s';", usb_path);
- }
- 
- int usb_tunable::good_bad(void)
-@@ -102,6 +105,17 @@ void usb_tunable::toggle(void)
- 	write_sysfs(usb_path, "auto");
- }
- 
-+const char *usb_tunable::toggle_script(void)
-+{
-+	int good;
-+	good = good_bad();
-+
-+	if (good == TUNE_GOOD) {
-+		return toggle_bad;
-+	}
-+
-+	return toggle_good;
-+}
- 
- void add_usb_tunables(void)
- {
-diff --git a/tuning/usb.h b/tuning/usb.h
-index a6f9557..a257904 100644
--- a/tuning/usb.h
-+++ b/tuning/usb.h
-@@ -40,6 +40,8 @@ public:
- 
- 	virtual void toggle(void);
- 
-+	virtual const char *toggle_script(void);
-+
- };
- 
- extern void add_usb_tunables(void);
-diff --git a/tuning/wifi.cpp b/tuning/wifi.cpp
-index 9d64a9f..8b67fc5 100644
--- a/tuning/wifi.cpp
-+++ b/tuning/wifi.cpp
-@@ -46,6 +46,9 @@ wifi_tunable::wifi_tunable(const char *_iface) : tunable("", 1.5, _("Good"), _("
- {
- 	strcpy(iface, _iface);
- 	sprintf(desc, _("Wireless Power Saving for interface %s"), iface);
-+	
-+	sprintf(toggle_good, "iw dev %s set power_save off", iface);
-+	sprintf(toggle_bad, "iw dev %s set power_save on", iface);
- }
- 
- int wifi_tunable::good_bad(void)
-@@ -69,6 +72,17 @@ void wifi_tunable::toggle(void)
- 	set_wifi_power_saving(iface, 1);
- }
- 
-+const char *wifi_tunable::toggle_script(void)
-+{
-+	int good;
-+	good = good_bad();
-+
-+	if (good == TUNE_GOOD) {
-+		return toggle_bad;
-+	}
-+
-+	return toggle_good;
-+}
- 
- void add_wifi_tunables(void)
- {
-diff --git a/tuning/wifi.h b/tuning/wifi.h
-index 347470e..50ca68c 100644
--- a/tuning/wifi.h
-+++ b/tuning/wifi.h
-@@ -40,6 +40,8 @@ public:
- 
- 	virtual void toggle(void);
- 
-+	virtual const char *toggle_script(void);
-+
- };
- 
- extern void add_wifi_tunables(void);
--- a/powertop-1.98-power-supply-add-power-now-support.patch
+++ b/powertop-1.98-power-supply-add-power-now-support.patch
@ -1,69 +0,0 @@
-From 0dce3803eff9c3919c025ba5534bacdfda471182 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
-Date: Fri, 24 Feb 2012 13:55:44 +0100
-Subject: [PATCH] power_supply: Add support for POWER_NOW readings
-
---
- measurement/power_supply.cpp |   30 ++++++++++++++++++++++--------
- 1 files changed, 22 insertions(+), 8 deletions(-)
-
-diff --git a/measurement/power_supply.cpp b/measurement/power_supply.cpp
-index b4fe3af..13d8d34 100755
--- a/measurement/power_supply.cpp
-+++ b/measurement/power_supply.cpp
-@@ -76,7 +76,8 @@ void power_supply::measure(void)
- 	char line[4096];
- 	ifstream file;
- 
-	double _rate = 0;
-+	double _power_rate = 0;
-+	double _current_rate = 0;
- 	double _capacity = 0;
- 	double _voltage = 0;
- 
-@@ -114,11 +115,21 @@ void power_supply::measure(void)
- 			c = strchr(line, '=');
- 			c++;
- 			if(*c == '-') c++; // ignoring the negative sign
-			_rate = strtoull(c, NULL, 10);
-+			_current_rate = strtoull(c, NULL, 10);
- 			if (c) {
-				//printf ("CURRENT: %f. \n",_rate);
-+				//printf ("CURRENT: %f. \n",_current_rate);
- 			} else {
-				_rate = 0;
-+				_current_rate = 0;
-+			}
-+		}
-+		if (strstr(line, "POWER_NOW")) {
-+			c = strchr(line, '=');
-+			c++;
-+			_power_rate = strtoull(c, NULL, 10);
-+			if (c) {
-+				//printf ("POWER: %f. \n",_power_rate);
-+			} else {
-+				_power_rate = 0;
- 			}
- 		}
- 		if (strstr(line, "CAPACITY=")) {
-@@ -152,10 +163,13 @@ void power_supply::measure(void)
- 		voltage = 0.0;
- 	}
- 
-	if(_rate) {
-		_rate = _rate / 1000.0;
-		_rate = _rate * _voltage;
-		rate = _rate;
-+	if(_power_rate)
-+	{
-+		rate = _power_rate / 1000000.0;
-+	}
-+	else if(_current_rate) {
-+		_current_rate = _current_rate / 1000.0;
-+		rate = _current_rate * _voltage;
- 	} else {
- 		rate = 0.0;
- 	}
-- 
-1.7.7.6
-
--- a/powertop-1.98-power-supply-units-fix.patch
+++ b/powertop-1.98-power-supply-units-fix.patch
@ -1,25 +0,0 @@
-diff -up powertop-1.98/measurement/power_supply.cpp.orig powertop-1.98/measurement/power_supply.cpp
--- powertop-1.98/measurement/power_supply.cpp.orig	2012-03-07 15:04:52.592471296 +0100
-+++ powertop-1.98/measurement/power_supply.cpp	2012-03-07 15:07:27.743785210 +0100
-@@ -157,7 +157,7 @@ void power_supply::measure(void)
- 	file.close();
- 
- 	if(_voltage) {
-		_voltage = _voltage / 1000.0;
-+		_voltage = _voltage / 1e6f;
- 		voltage = _voltage;
- 	} else {
- 		voltage = 0.0;
-@@ -165,10 +165,10 @@ void power_supply::measure(void)
- 
- 	if(_power_rate)
- 	{
-		rate = _power_rate / 1000000.0;
-+		rate = _power_rate / 1e6f;
- 	}
- 	else if(_current_rate) {
-		_current_rate = _current_rate / 1000.0;
-+		_current_rate = _current_rate / 1e6f;
- 		rate = _current_rate * _voltage;
- 	} else {
- 		rate = 0.0;
--- a/powertop-1.98-unknown-readings-fix.patch
+++ b/powertop-1.98-unknown-readings-fix.patch
@ -1,35 +0,0 @@
-diff -up powertop-1.98/measurement/acpi.cpp.orig powertop-1.98/measurement/acpi.cpp
--- powertop-1.98/measurement/acpi.cpp.orig	2011-05-11 06:48:37.000000000 +0200
-+++ powertop-1.98/measurement/acpi.cpp	2012-01-10 18:31:21.093799991 +0100
-@@ -108,8 +108,13 @@ void acpi_power_meter::measure(void)
- 			while (*c == ' ') c++;
- 			_capacity = strtoull(c, NULL, 10);
- 			c = strchr(c, ' ');
-			c++;
-			strcpy(capacity_units, c);
-+			if (c) {
-+				c++;
-+				strcpy(capacity_units, c);
-+			} else {
-+				_capacity = 0;
-+				strcpy(capacity_units, "Unknown");
-+			}
- 		}
- 		if (strstr(line, "present voltage:")) {
- 			c = strchr(line, ':');
-@@ -117,8 +122,13 @@ void acpi_power_meter::measure(void)
- 			while (*c == ' ') c++;
- 			_voltage = strtoull(c, NULL, 10);
- 			c = strchr(c, ' ');
-			c++;
-			strcpy(voltage_units, c);
-+			if (c) {
-+				c++;
-+				strcpy(voltage_units, c);
-+			} else {
-+				_voltage = 0;
-+				strcpy(voltage_units, "Unknown");
-+			}
- 		}
- 	}
- 	file.close();
--- a/powertop-1.98-always-create-params.patch
+++ b/powertop-1.98-always-create-params.patch
@ -1,26 +1,26 @@
-diff -up powertop-1.98/parameters/persistent.cpp.orig powertop-1.98/parameters/persistent.cpp
--- powertop-1.98/parameters/persistent.cpp.orig	2011-05-11 06:48:37.000000000 +0200
-+++ powertop-1.98/parameters/persistent.cpp	2011-12-02 19:48:45.056747667 +0100
-@@ -122,22 +122,23 @@ void save_parameters(const char *filenam
+diff -up powertop-2.0/src/parameters/persistent.cpp.orig powertop-2.0/src/parameters/persistent.cpp
+--- powertop-2.0/src/parameters/persistent.cpp.orig	2012-05-04 18:03:54.000000000 +0200
+++ powertop-2.0/src/parameters/persistent.cpp	2012-05-16 21:29:24.785390730 +0200
+@@ -129,9 +129,6 @@ void save_parameters(const char *filenam
 
 //	printf("result size is %i, #parameters is %i \n", (int)past_results.size(), (int)all_parameters.parameters.size());
 
 -	if (!global_power_valid())
 -		return;
+-
+ 	pathname = get_param_directory(filename);
 
- 	file.open(filename, ios::out);
- 	if (!file) {
- 		cout << _("Cannot save to file ") << filename << "\n";
+ 	file.open(pathname, ios::out);
+@@ -140,12 +137,15 @@ void save_parameters(const char *filenam
 		return;
 	}
-	
-	map<string, int>::iterator it;
 
+-	map<string, int>::iterator it;
+-
 -	for (it = param_index.begin(); it != param_index.end(); it++) {
 -		int index;
 -		index = it->second;
 -		file << it->first << "\t" << setprecision(9) << all_parameters.parameters[index] << "\n";
-	}	
 +	if (global_power_valid())
 +	{
 +		map<string, int>::iterator it;
@ -29,8 +29,7 @@ diff -up powertop-1.98/parameters/persistent.cpp.orig powertop-1.98/parameters/p
 +			int index;
 +			index = it->second;
 +			file << it->first << "\t" << setprecision(9) << all_parameters.parameters[index] << "\n";
-+		}	
-+	}
+		}
+ 	}
 	file.close();
 }
- 
--- a/powertop-2.0-html-escape.patch
+++ b/powertop-2.0-html-escape.patch
@ -0,0 +1,33 @@
+diff -up powertop-2.0/src/tuning/tuning.cpp.orig powertop-2.0/src/tuning/tuning.cpp
+--- powertop-2.0/src/tuning/tuning.cpp.orig	2012-05-09 18:43:29.000000000 +0200
+++ powertop-2.0/src/tuning/tuning.cpp	2012-05-16 19:28:25.398232302 +0200
+@@ -217,6 +217,20 @@ static const char *tune_class_bad(int li
+ 	return "tunable_even_bad";
+ }
+ 
+static std::string html_encode(std::string data) {
+	std::string buffer;
+	buffer.reserve(data.size());
+	for (size_t pos = 0; pos != data.size(); pos++) {
+		switch(data[pos]) {
+			case '&':  buffer.append("&amp;"); break;
+			case '\"': buffer.append("&quot;"); break;
+			case '<':  buffer.append("&lt;"); break;
+			case '>':  buffer.append("&gt;"); break;
+			default:   buffer.append(1, data[pos]); break;
+		}
+	}
+	return buffer;
+}
+ 
+ void report_show_tunables(void)
+ {
+@@ -254,7 +268,7 @@ void report_show_tunables(void)
+ 			fprintf(reportout.csv_report, "Description, \n");
+ 
+ 		if (reporttype)
+-		        fprintf(reportout.http_report, "<tr class=\"%s\"><td>%s</td><td>%s</td></tr>\n", tune_class_bad(line), all_tunables[i]->description(), all_tunables[i]->toggle_script());
+		        fprintf(reportout.http_report, "<tr class=\"%s\"><td>%s</td><td>%s</td></tr>\n", tune_class_bad(line), all_tunables[i]->description(), html_encode(std::string(all_tunables[i]->toggle_script())).c_str());
+ 		else
+ 			fprintf(reportout.csv_report, "\"%s\", \n", all_tunables[i]->description());
+ 	}
--- a/powertop-1.98-show-watts-only-if-discharging.patch
+++ b/powertop-1.98-show-watts-only-if-discharging.patch
@ -1,6 +1,6 @@
-diff -up powertop-1.98/measurement/measurement.cpp.orig powertop-1.98/measurement/measurement.cpp
--- powertop-1.98/measurement/measurement.cpp.orig	2012-04-17 15:47:59.000000000 +0200
-+++ powertop-1.98/measurement/measurement.cpp	2012-04-17 15:49:31.690862740 +0200
+diff -up powertop-2.0/src/measurement/measurement.cpp.orig powertop-2.0/src/measurement/measurement.cpp
+--- powertop-2.0/src/measurement/measurement.cpp.orig	2012-04-17 15:47:59.000000000 +0200
+++ powertop-2.0/src/measurement/measurement.cpp	2012-04-17 15:49:31.690862740 +0200
@@ -130,7 +130,7 @@ void power_supply_callback(const char *d
 	while (file) {
 		file.getline(line, 4096);
--- a/powertop-2.0-valid-html-output.patch
+++ b/powertop-2.0-valid-html-output.patch
@ -0,0 +1,640 @@
+From dca19ed0aa83e558f050b28620262bcd0af9b55c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
+Date: Wed, 16 May 2012 16:36:54 +0200
+Subject: [PATCH] Fixed HTML output to make W3C validator happy
+
+Various fixes to pass W3C HTML validation. Also unified
+whitespaces - preferred tabs over multiple spaces to save
+some space.
+---
+ src/powertop.css           |  481 ++++++++++++++++++++++----------------------
+ src/process/do_process.cpp |    2 +-
+ src/report.cpp             |    2 +-
+ 3 files changed, 243 insertions(+), 242 deletions(-)
+
+diff --git a/src/powertop.css b/src/powertop.css
+index 4a67c7f..087e384 100644
+--- a/src/powertop.css
+++ b/src/powertop.css
+@@ -1,52 +1,55 @@
+-<!DOCTYPE html PUBLIC \"-//W3C/DTD HTML 4.01//EN\">
+<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">
+ <html>
+<head>
+<title>PowerTOP report</title>
+<meta http-equiv=\"content-type\" content=\"text/html;charset=utf-8\">
+ <script type=\"text/javascript\" src=\"http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js\"></script>
+-<script>
+-$(document).ready(function(){ 
+-     
+-        $('#system h2').addClass('hide');  
+<script type=\"text/javascript\">
+$(document).ready(function(){
+
+	$('#system h2').addClass('hide');
+ 	$('#system table').addClass('hide');
+-        $('#cpuidle h2').addClass('hide');  
+-	$('#cpuidle table').addClass('hide'); 
+-        $('#cpufreq h2').addClass('hide');  
+-	$('#cpufreq table').addClass('hide'); 
+-        $('#software h2').addClass('hide');  
+-	$('#software table').addClass('hide'); 
+-        $('#device h2').addClass('hide');  
+-	$('#device table').addClass('hide'); 
+-	$('#device p').addClass('hide');		
+-        $('#tuning h2').addClass('hide');  
+-	$('#tuning table').addClass('hide'); 
+-		
+-        $('#top').append('<div class=\"SystemButton\"   onclick=\"toggleSystem()\">System Info</div>'); 
+-        $('#top').append('<div class=\"SummaryButton\"  onclick=\"toggleSummary()\">Summary</div>'); 
+-        $('#top').append('<div class=\"CpuidleButton\"  onclick=\"toggleCpuidle()\">CPU Idle</div>'); 
+-        $('#top').append('<div class=\"CpufreqButton\"  onclick=\"toggleCpufreq()\">CPU Frequency</div>'); 
+-        $('#top').append('<div class=\"SoftwareButton\" onclick=\"toggleSoftware()\">Software info</div>'); 
+-        $('#top').append('<div class=\"DeviceButton\"   onclick=\"toggleDevice()\">Device Info</div>'); 
+-        $('#top').append('<div class=\"TuningButton\"   onclick=\"toggleTuning()\">Tuning</div>'); 
+-	$('#top').append('<div class=\"AllButton\"      onclick=\"toggleAll()\">All</div>'); 
+	$('#cpuidle h2').addClass('hide');
+	$('#cpuidle table').addClass('hide');
+	$('#cpufreq h2').addClass('hide');
+	$('#cpufreq table').addClass('hide');
+	$('#software h2').addClass('hide');
+	$('#software table').addClass('hide');
+	$('#device h2').addClass('hide');
+	$('#device table').addClass('hide');
+	$('#device p').addClass('hide');
+	$('#tuning h2').addClass('hide');
+	$('#tuning table').addClass('hide');
+
+	$('#top').append('<div class=\"SystemButton\"   onclick=\"toggleSystem()\">System Info<\\/div>');
+	$('#top').append('<div class=\"SummaryButton\"  onclick=\"toggleSummary()\">Summary<\\/div>');
+	$('#top').append('<div class=\"CpuidleButton\"  onclick=\"toggleCpuidle()\">CPU Idle<\\/div>');
+	$('#top').append('<div class=\"CpufreqButton\"  onclick=\"toggleCpufreq()\">CPU Frequency<\\/div>');
+	$('#top').append('<div class=\"SoftwareButton\" onclick=\"toggleSoftware()\">Software info<\\/div>');
+	$('#top').append('<div class=\"DeviceButton\"   onclick=\"toggleDevice()\">Device Info<\\/div>');
+	$('#top').append('<div class=\"TuningButton\"   onclick=\"toggleTuning()\">Tuning<\\/div>');
+	$('#top').append('<div class=\"AllButton\"      onclick=\"toggleAll()\">All<\\/div>');
+ 	$('#top .SummaryButton').toggleClass('pressed');
+ 
+     }
+ 	);
+-function toggleDummy() { 
+-	        $('#system table').toggleClass('hide', true); 
+-		$('#system h2').toggleClass('hide', true); 
+-	        $('#summary table').toggleClass('hide', true); 
+-		$('#summary h2').toggleClass('hide', true); 
+-		$('#summary p').toggleClass('hide', true); 
+-	        $('#cpuidle table').toggleClass('hide', true); 
+-		$('#cpuidle h2').toggleClass('hide', true); 
+-	        $('#cpufreq table').toggleClass('hide', true); 
+-		$('#cpufreq h2').toggleClass('hide', true); 
+-	        $('#software table').toggleClass('hide', true); 
+-		$('#software h2').toggleClass('hide', true); 
+-	        $('#device table').toggleClass('hide', true); 
+-		$('#device h2').toggleClass('hide', true);   
+-		$('#device p').toggleClass('hide', true); 
+-		$('#tuning table').toggleClass('hide', true); 
+-		$('#tuning h2').toggleClass('hide', true);      
+function toggleDummy() {
+		$('#system table').toggleClass('hide', true);
+		$('#system h2').toggleClass('hide', true);
+		$('#summary table').toggleClass('hide', true);
+		$('#summary h2').toggleClass('hide', true);
+		$('#summary p').toggleClass('hide', true);
+		$('#cpuidle table').toggleClass('hide', true);
+		$('#cpuidle h2').toggleClass('hide', true);
+		$('#cpufreq table').toggleClass('hide', true);
+		$('#cpufreq h2').toggleClass('hide', true);
+		$('#software table').toggleClass('hide', true);
+		$('#software h2').toggleClass('hide', true);
+		$('#device table').toggleClass('hide', true);
+		$('#device h2').toggleClass('hide', true);
+		$('#device p').toggleClass('hide', true);
+		$('#tuning table').toggleClass('hide', true);
+		$('#tuning h2').toggleClass('hide', true);
+ 		$('#top .SystemButton').toggleClass('pressed', false);
+ 		$('#top .SummaryButton').toggleClass('pressed', false);
+ 		$('#top .CpuidleButton').toggleClass('pressed', false);
+@@ -56,23 +59,23 @@ function toggleDummy() {
+ 		$('#top .TuningButton').toggleClass('pressed', false);
+ 		$('#top .AllButton').toggleClass('pressed', false);
+ }
+-function toggleSystem() { 
+-	        $('#system table').toggleClass('hide', false); 
+-		$('#system h2').toggleClass('hide', false); 
+-	        $('#summary table').toggleClass('hide', true); 
+-		$('#summary h2').toggleClass('hide', true); 
+-		$('#summary p').toggleClass('hide', true); 		
+-	        $('#cpuidle table').toggleClass('hide', true); 
+-		$('#cpuidle h2').toggleClass('hide', true); 
+-	        $('#cpufreq table').toggleClass('hide', true); 
+-		$('#cpufreq h2').toggleClass('hide', true); 
+-        	$('#software table').toggleClass('hide', true); 
+-		$('#software h2').toggleClass('hide', true); 
+-	        $('#device table').toggleClass('hide', true); 
+-		$('#device h2').toggleClass('hide', true);   
+-		$('#device p').toggleClass('hide', true); 
+-		$('#tuning table').toggleClass('hide', true); 
+-		$('#tuning h2').toggleClass('hide', true);   
+function toggleSystem() {
+		$('#system table').toggleClass('hide', false);
+		$('#system h2').toggleClass('hide', false);
+		$('#summary table').toggleClass('hide', true);
+		$('#summary h2').toggleClass('hide', true);
+		$('#summary p').toggleClass('hide', true);
+		$('#cpuidle table').toggleClass('hide', true);
+		$('#cpuidle h2').toggleClass('hide', true);
+		$('#cpufreq table').toggleClass('hide', true);
+		$('#cpufreq h2').toggleClass('hide', true);
+		$('#software table').toggleClass('hide', true);
+		$('#software h2').toggleClass('hide', true);
+		$('#device table').toggleClass('hide', true);
+		$('#device h2').toggleClass('hide', true);
+		$('#device p').toggleClass('hide', true);
+		$('#tuning table').toggleClass('hide', true);
+		$('#tuning h2').toggleClass('hide', true);
+ 		$('#top .SystemButton').toggleClass('pressed', true);
+ 		$('#top .SummaryButton').toggleClass('pressed', false);
+ 		$('#top .CpuidleButton').toggleClass('pressed', false);
+@@ -82,23 +85,23 @@ function toggleSystem() {
+ 		$('#top .TuningButton').toggleClass('pressed', false);
+ 		$('#top .AllButton').toggleClass('pressed', false);
+ }
+-function toggleSummary() { 
+-	        $('#system table').toggleClass('hide', true); 
+-		$('#system h2').toggleClass('hide', true); 
+-	        $('#summary table').toggleClass('hide', false); 
+-		$('#summary h2').toggleClass('hide', false); 
+-		$('#summary p').toggleClass('hide', false); 				
+-		$('#cpuidle table').toggleClass('hide', true); 
+-		$('#cpuidle h2').toggleClass('hide', true); 
+-	        $('#cpufreq table').toggleClass('hide', true); 
+-		$('#cpufreq h2').toggleClass('hide', true); 
+-	        $('#software table').toggleClass('hide', true); 
+-		$('#software h2').toggleClass('hide', true); 
+-	        $('#device table').toggleClass('hide', true); 
+-		$('#device h2').toggleClass('hide', true);   
+-		$('#device p').toggleClass('hide', true); 
+-		$('#tuning table').toggleClass('hide', true); 
+-		$('#tuning h2').toggleClass('hide', true);         
+function toggleSummary() {
+		$('#system table').toggleClass('hide', true);
+		$('#system h2').toggleClass('hide', true);
+		$('#summary table').toggleClass('hide', false);
+		$('#summary h2').toggleClass('hide', false);
+		$('#summary p').toggleClass('hide', false);
+		$('#cpuidle table').toggleClass('hide', true);
+		$('#cpuidle h2').toggleClass('hide', true);
+		$('#cpufreq table').toggleClass('hide', true);
+		$('#cpufreq h2').toggleClass('hide', true);
+		$('#software table').toggleClass('hide', true);
+		$('#software h2').toggleClass('hide', true);
+		$('#device table').toggleClass('hide', true);
+		$('#device h2').toggleClass('hide', true);
+		$('#device p').toggleClass('hide', true);
+		$('#tuning table').toggleClass('hide', true);
+		$('#tuning h2').toggleClass('hide', true);
+ 		$('#top .SystemButton').toggleClass('pressed', false);
+ 		$('#top .SummaryButton').toggleClass('pressed', true);
+ 		$('#top .CpuidleButton').toggleClass('pressed', false);
+@@ -108,23 +111,23 @@ function toggleSummary() {
+ 		$('#top .TuningButton').toggleClass('pressed', false);
+ 		$('#top .AllButton').toggleClass('pressed', false);
+ }
+-function toggleCpuidle() { 
+-	        $('#system table').toggleClass('hide', true); 
+-		$('#system h2').toggleClass('hide', true); 
+-	        $('#summary table').toggleClass('hide', true); 
+-		$('#summary h2').toggleClass('hide', true); 
+-	        $('#summary p').toggleClass('hide', true); 		
+-		$('#cpuidle table').toggleClass('hide', false); 
+-		$('#cpuidle h2').toggleClass('hide', false); 
+-	        $('#cpufreq table').toggleClass('hide', true); 
+-		$('#cpufreq h2').toggleClass('hide', true); 
+-	        $('#software table').toggleClass('hide', true); 
+-		$('#software h2').toggleClass('hide', true); 
+-	        $('#device table').toggleClass('hide', true); 
+-		$('#device h2').toggleClass('hide', true);   
+-		$('#device p').toggleClass('hide', true); 
+-		$('#tuning table').toggleClass('hide', true); 
+-		$('#tuning h2').toggleClass('hide', true);         
+function toggleCpuidle() {
+		$('#system table').toggleClass('hide', true);
+		$('#system h2').toggleClass('hide', true);
+		$('#summary table').toggleClass('hide', true);
+		$('#summary h2').toggleClass('hide', true);
+		$('#summary p').toggleClass('hide', true);
+		$('#cpuidle table').toggleClass('hide', false);
+		$('#cpuidle h2').toggleClass('hide', false);
+		$('#cpufreq table').toggleClass('hide', true);
+		$('#cpufreq h2').toggleClass('hide', true);
+		$('#software table').toggleClass('hide', true);
+		$('#software h2').toggleClass('hide', true);
+		$('#device table').toggleClass('hide', true);
+		$('#device h2').toggleClass('hide', true);
+		$('#device p').toggleClass('hide', true);
+		$('#tuning table').toggleClass('hide', true);
+		$('#tuning h2').toggleClass('hide', true);
+ 		$('#top .SystemButton').toggleClass('pressed', false);
+ 		$('#top .SummaryButton').toggleClass('pressed', false);
+ 		$('#top .CpuidleButton').toggleClass('pressed', true);
+@@ -133,25 +136,25 @@ function toggleCpuidle() {
+ 		$('#top .DeviceButton').toggleClass('pressed', false);
+ 		$('#top .TuningButton').toggleClass('pressed', false);
+ 		$('#top .AllButton').toggleClass('pressed', false);
+-        
+-}
+-function toggleCpufreq() { 
+-	        $('#system table').toggleClass('hide', true); 
+-		$('#system h2').toggleClass('hide', true); 
+-	        $('#summary table').toggleClass('hide', true); 
+-		$('#summary h2').toggleClass('hide', true); 
+-		$('#summary p').toggleClass('hide', true); 		
+-	        $('#cpuidle table').toggleClass('hide', true); 
+-		$('#cpuidle h2').toggleClass('hide', true); 
+-	        $('#cpufreq table').toggleClass('hide', false); 
+-		$('#cpufreq h2').toggleClass('hide', false); 
+-	        $('#software table').toggleClass('hide', true); 
+-		$('#software h2').toggleClass('hide', true); 
+-	        $('#device table').toggleClass('hide', true); 
+-		$('#device h2').toggleClass('hide', true);   
+-		$('#device p').toggleClass('hide', true); 
+-		$('#tuning table').toggleClass('hide', true); 
+-		$('#tuning h2').toggleClass('hide', true);                 
+
+}
+function toggleCpufreq() {
+		$('#system table').toggleClass('hide', true);
+		$('#system h2').toggleClass('hide', true);
+		$('#summary table').toggleClass('hide', true);
+		$('#summary h2').toggleClass('hide', true);
+		$('#summary p').toggleClass('hide', true);
+		$('#cpuidle table').toggleClass('hide', true);
+		$('#cpuidle h2').toggleClass('hide', true);
+		$('#cpufreq table').toggleClass('hide', false);
+		$('#cpufreq h2').toggleClass('hide', false);
+		$('#software table').toggleClass('hide', true);
+		$('#software h2').toggleClass('hide', true);
+		$('#device table').toggleClass('hide', true);
+		$('#device h2').toggleClass('hide', true);
+		$('#device p').toggleClass('hide', true);
+		$('#tuning table').toggleClass('hide', true);
+		$('#tuning h2').toggleClass('hide', true);
+ 		$('#top .SystemButton').toggleClass('pressed', false);
+ 		$('#top .SummaryButton').toggleClass('pressed', false);
+ 		$('#top .CpuidleButton').toggleClass('pressed', false);
+@@ -162,23 +165,23 @@ function toggleCpufreq() {
+ 		$('#top .AllButton').toggleClass('pressed', false);
+ }
+ 
+-function toggleSoftware() { 
+-	        $('#system table').toggleClass('hide', true); 
+-		$('#system h2').toggleClass('hide', true); 
+-	        $('#summary table').toggleClass('hide', true); 
+-		$('#summary h2').toggleClass('hide', true); 
+-		$('#summary p').toggleClass('hide', true); 				
+-	        $('#cpuidle table').toggleClass('hide', true); 
+-		$('#cpuidle h2').toggleClass('hide', true); 
+-	        $('#cpufreq table').toggleClass('hide', true); 
+-		$('#cpufreq h2').toggleClass('hide', true); 
+-	        $('#software table').toggleClass('hide', false); 
+-		$('#software h2').toggleClass('hide', false); 
+-	        $('#device table').toggleClass('hide', true); 
+-		$('#device h2').toggleClass('hide', true);   
+-		$('#device p').toggleClass('hide', true); 
+-		$('#tuning table').toggleClass('hide', true); 
+-		$('#tuning h2').toggleClass('hide', true);         
+function toggleSoftware() {
+		$('#system table').toggleClass('hide', true);
+		$('#system h2').toggleClass('hide', true);
+		$('#summary table').toggleClass('hide', true);
+		$('#summary h2').toggleClass('hide', true);
+		$('#summary p').toggleClass('hide', true);
+		$('#cpuidle table').toggleClass('hide', true);
+		$('#cpuidle h2').toggleClass('hide', true);
+		$('#cpufreq table').toggleClass('hide', true);
+		$('#cpufreq h2').toggleClass('hide', true);
+		$('#software table').toggleClass('hide', false);
+		$('#software h2').toggleClass('hide', false);
+		$('#device table').toggleClass('hide', true);
+		$('#device h2').toggleClass('hide', true);
+		$('#device p').toggleClass('hide', true);
+		$('#tuning table').toggleClass('hide', true);
+		$('#tuning h2').toggleClass('hide', true);
+ 		$('#top .SystemButton').toggleClass('pressed', false);
+ 		$('#top .SummaryButton').toggleClass('pressed', false);
+ 		$('#top .CpuidleButton').toggleClass('pressed', false);
+@@ -189,23 +192,23 @@ function toggleSoftware() {
+ 		$('#top .AllButton').toggleClass('pressed', false);
+ }
+ 
+-function toggleDevice() { 
+-	        $('#system table').toggleClass('hide', true); 
+-		$('#system h2').toggleClass('hide', true); 
+-	        $('#summary table').toggleClass('hide', true); 
+-		$('#summary h2').toggleClass('hide', true); 
+-		$('#summary p').toggleClass('hide', true); 				
+-	        $('#cpuidle table').toggleClass('hide', true); 
+-		$('#cpuidle h2').toggleClass('hide', true); 
+-	        $('#cpufreq table').toggleClass('hide', true); 
+-		$('#cpufreq h2').toggleClass('hide', true); 
+-	        $('#software table').toggleClass('hide', true); 
+-		$('#software h2').toggleClass('hide', true); 
+-	        $('#device table').toggleClass('hide', false); 
+-		$('#device h2').toggleClass('hide', false);   
+-		$('#device p').toggleClass('hide', false); 
+-		$('#tuning table').toggleClass('hide', true); 
+-		$('#tuning h2').toggleClass('hide', true);         
+function toggleDevice() {
+		$('#system table').toggleClass('hide', true);
+		$('#system h2').toggleClass('hide', true);
+		$('#summary table').toggleClass('hide', true);
+		$('#summary h2').toggleClass('hide', true);
+		$('#summary p').toggleClass('hide', true);
+		$('#cpuidle table').toggleClass('hide', true);
+		$('#cpuidle h2').toggleClass('hide', true);
+		$('#cpufreq table').toggleClass('hide', true);
+		$('#cpufreq h2').toggleClass('hide', true);
+		$('#software table').toggleClass('hide', true);
+		$('#software h2').toggleClass('hide', true);
+		$('#device table').toggleClass('hide', false);
+		$('#device h2').toggleClass('hide', false);
+		$('#device p').toggleClass('hide', false);
+		$('#tuning table').toggleClass('hide', true);
+		$('#tuning h2').toggleClass('hide', true);
+ 		$('#top .SystemButton').toggleClass('pressed', false);
+ 		$('#top .SummaryButton').toggleClass('pressed', false);
+ 		$('#top .CpuidleButton').toggleClass('pressed', false);
+@@ -216,23 +219,23 @@ function toggleDevice() {
+ 		$('#top .AllButton').toggleClass('pressed', false);
+ }
+ 
+-function toggleTuning() { 
+-        	$('#system table').toggleClass('hide', true); 
+-		$('#system h2').toggleClass('hide', true); 
+-	        $('#summary table').toggleClass('hide', true); 
+-		$('#summary h2').toggleClass('hide', true); 
+-		$('#summary p').toggleClass('hide', true); 				
+-	        $('#cpuidle table').toggleClass('hide', true); 
+-		$('#cpuidle h2').toggleClass('hide', true); 
+-	        $('#cpufreq table').toggleClass('hide', true); 
+-		$('#cpufreq h2').toggleClass('hide', true); 
+-	        $('#software table').toggleClass('hide', true); 
+-		$('#software h2').toggleClass('hide', true); 
+-	        $('#device table').toggleClass('hide', true); 
+-		$('#device h2').toggleClass('hide', true);   
+-		$('#device p').toggleClass('hide', true); 
+-		$('#tuning table').toggleClass('hide', false); 
+-		$('#tuning h2').toggleClass('hide', false);         
+function toggleTuning() {
+		$('#system table').toggleClass('hide', true);
+		$('#system h2').toggleClass('hide', true);
+		$('#summary table').toggleClass('hide', true);
+		$('#summary h2').toggleClass('hide', true);
+		$('#summary p').toggleClass('hide', true);
+		$('#cpuidle table').toggleClass('hide', true);
+		$('#cpuidle h2').toggleClass('hide', true);
+		$('#cpufreq table').toggleClass('hide', true);
+		$('#cpufreq h2').toggleClass('hide', true);
+		$('#software table').toggleClass('hide', true);
+		$('#software h2').toggleClass('hide', true);
+		$('#device table').toggleClass('hide', true);
+		$('#device h2').toggleClass('hide', true);
+		$('#device p').toggleClass('hide', true);
+		$('#tuning table').toggleClass('hide', false);
+		$('#tuning h2').toggleClass('hide', false);
+ 		$('#top .SystemButton').toggleClass('pressed', false);
+ 		$('#top .SummaryButton').toggleClass('pressed', false);
+ 		$('#top .CpuidleButton').toggleClass('pressed', false);
+@@ -242,23 +245,23 @@ function toggleTuning() {
+ 		$('#top .TuningButton').toggleClass('pressed', true);
+ 		$('#top .AllButton').toggleClass('pressed', false);
+ }
+-function toggleAll() { 
+-	        $('#system table').toggleClass('hide', false); 
+-		$('#system h2').toggleClass('hide', false); 
+-	        $('#summary table').toggleClass('hide', false); 
+-		$('#summary h2').toggleClass('hide', false); 
+-		$('#summary p').toggleClass('hide', false); 
+-	        $('#cpuidle table').toggleClass('hide', false); 
+-		$('#cpuidle h2').toggleClass('hide', false); 
+-	        $('#cpufreq table').toggleClass('hide', false); 
+-		$('#cpufreq h2').toggleClass('hide', false); 
+-	        $('#software table').toggleClass('hide', false); 
+-		$('#software h2').toggleClass('hide', false); 
+-	        $('#device table').toggleClass('hide', false); 
+-		$('#device h2').toggleClass('hide', false);   
+-		$('#device p').toggleClass('hide', false); 
+-		$('#tuning table').toggleClass('hide', false); 
+-		$('#tuning h2').toggleClass('hide', false);      
+function toggleAll() {
+		$('#system table').toggleClass('hide', false);
+		$('#system h2').toggleClass('hide', false);
+		$('#summary table').toggleClass('hide', false);
+		$('#summary h2').toggleClass('hide', false);
+		$('#summary p').toggleClass('hide', false);
+		$('#cpuidle table').toggleClass('hide', false);
+		$('#cpuidle h2').toggleClass('hide', false);
+		$('#cpufreq table').toggleClass('hide', false);
+		$('#cpufreq h2').toggleClass('hide', false);
+		$('#software table').toggleClass('hide', false);
+		$('#software h2').toggleClass('hide', false);
+		$('#device table').toggleClass('hide', false);
+		$('#device h2').toggleClass('hide', false);
+		$('#device p').toggleClass('hide', false);
+		$('#tuning table').toggleClass('hide', false);
+		$('#tuning h2').toggleClass('hide', false);
+ 		$('#top .SystemButton').toggleClass('pressed', false);
+ 		$('#top .SummaryButton').toggleClass('pressed', false);
+ 		$('#top .CpuidleButton').toggleClass('pressed', false);
+@@ -269,9 +272,7 @@ function toggleAll() {
+ 		$('#top .AllButton').toggleClass('pressed', true);
+ }
+ </script>
+- <head>
+ <style type=\"text/css\">
+-
+ table
+ {
+ 	background-color: #F8F8F8;
+@@ -439,94 +440,94 @@ tr.device_even
+ }
+ 
+ body {
+-    background-color: #eee; /* Background color */
+-    color: #222;            /* Foreground color used for text */
+-    font-family: Helvetica; 
+-    font-size: 14px;
+-    margin: 0;              /* Amount of negative space around the 
+-                               outside of the body */
+-    padding: 0;             /* Amount of negative space around the 
+-                               inside of the body */
+	background-color: #eee; /* Background color */
+	color: #222;            /* Foreground color used for text */
+	font-family: Helvetica;
+	font-size: 14px;
+	margin: 0;              /* Amount of negative space around the
+                                   outside of the body */
+	padding: 0;             /* Amount of negative space around the
+                                   inside of the body */
+ }
+ #top h1 {
+-    margin: 0;
+-    padding: 0;
+	margin: 0;
+	padding: 0;
+ }
+ #top h1 a {
+-    background-color: #ccc;
+-    border-bottom: 1px solid #666;
+-    color: #222;
+-    display: block;
+-    font-size: 20px;
+-    font-weight: bold;
+-    padding: 10px 0;
+-    text-align: center;
+-    text-decoration: none;
+	background-color: #ccc;
+	border-bottom: 1px solid #666;
+	color: #222;
+	display: block;
+	font-size: 20px;
+	font-weight: bold;
+	padding: 10px 0;
+	text-align: center;
+	text-decoration: none;
+ 	text-shadow: 0px 1px 1px #fff;
+-    background-image: -webkit-gradient(linear, left top, left bottom, 
+-                                       from(#ccc), to(#999));
+	background-image: -webkit-gradient(linear, left top, left bottom,
+						from(#ccc), to(#999));
+ }
+ 
+ 
+ #top div {
+-    height: 30px;
+-    font-weight: bold;
+-    text-align: center;
+-    color: white;
+-    text-shadow: rgba(0,0,0,0.6) 0px -1px 1px;
+-    line-height: 28px;
+-    border-width:0px 8px 0px 8px;
+	height: 30px;
+	font-weight: bold;
+	text-align: center;
+	color: white;
+	text-shadow: rgba(0,0,0,0.6) 0px -1px 1px;
+	line-height: 28px;
+	border-width:0px 8px 0px 8px;
+ }
+ #top div.SystemButton {
+-    position: absolute;
+-    top: 7px;
+-    left: 6px;
+	position: absolute;
+	top: 7px;
+	left: 6px;
+ }
+ #top div.SummaryButton {
+-    position: absolute;
+-    top: 7px;
+-    left: 160px;
+	position: absolute;
+	top: 7px;
+	left: 160px;
+ }
+ #top div.CpuidleButton {
+-    position: absolute;
+-    top: 7px;
+-    left: 320px;
+	position: absolute;
+	top: 7px;
+	left: 320px;
+ }
+ #top div.CpufreqButton {
+-    position: absolute;
+-    top: 7px;
+-    left: 480px;
+	position: absolute;
+	top: 7px;
+	left: 480px;
+ }
+ #top div.SoftwareButton {
+-    position: absolute;
+-    top: 7px;
+-    left: 640px;
+	position: absolute;
+	top: 7px;
+	left: 640px;
+ }
+ #top div.DeviceButton {
+-    position: absolute;
+-    top: 7px;
+-    left: 800px;
+	position: absolute;
+	top: 7px;
+	left: 800px;
+ }
+ #top div.TuningButton {
+-    position: absolute;
+-    top: 7px;
+-    left: 960px;
+	position: absolute;
+	top: 7px;
+	left: 960px;
+ }
+ #top div.AllButton {
+-    position: absolute;
+-    top: 7px;
+-    left: 1120px;
+	position: absolute;
+	top: 7px;
+	left: 1120px;
+ }
+ div.pressed {
+ 	background-color: #000000;
+-    border: 1px solid #000000;
+-    color: #000000;
+-    display: block;
+	border: 1px solid #000000;
+	color: #000000;
+	display: block;
+ 	border-width:0px 8px 0px 8px;
+-    -webkit-border-top-left-radius: 8px;
+-    -webkit-border-top-right-radius: 8px;
+	-webkit-border-top-left-radius: 8px;
+	-webkit-border-top-right-radius: 8px;
+ 	-webkit-border-bottom-left-radius: 8px;
+-    -webkit-border-bottom-right-radius: 8px; 
+	-webkit-border-bottom-right-radius: 8px;
+ }
+ table.hide {
+ 	display: none;
+diff --git a/src/process/do_process.cpp b/src/process/do_process.cpp
+index ef2d1d2..7366454 100644
+--- a/src/process/do_process.cpp
+++ b/src/process/do_process.cpp
+@@ -985,7 +985,7 @@ void report_process_update_display(void)
+ 
+ 		if (show_power) {
+ 			if (reporttype)
+-				fprintf(reportout.http_report,"<tr class=\"%s\"><td class=\"process_power\">%s</td><td class=\"process_power\">%s</td><td class=\"process_power\">%s</td><td class=\"process_power\">%s</td><td class=\"process_power\">%s</td></td><td class=\"process_power\">%s</td><td>%s</td><td>%s</td></tr>\n",
+				fprintf(reportout.http_report,"<tr class=\"%s\"><td class=\"process_power\">%s</td><td class=\"process_power\">%s</td><td class=\"process_power\">%s</td><td class=\"process_power\">%s</td><td class=\"process_power\">%s</td><td class=\"process_power\">%s</td><td>%s</td><td>%s</td></tr>\n",
+ 					process_class(lines), power, usage, wakes, gpus, disks, xwakes, name, pretty_print(all_power[i]->description(), descr, 128));
+ 			else
+ 				fprintf(reportout.csv_report,"%s, %s, %s, %s, %s, %s, %s, %s,\n",
+diff --git a/src/report.cpp b/src/report.cpp
+index d4f032d..82599e3 100644
+--- a/src/report.cpp
+++ b/src/report.cpp
+@@ -120,7 +120,7 @@ static void system_info(void)
+ 
+ 	if (reporttype) {
+ 		fprintf(reportout.http_report, "<div id=\"top\">\n<h1><a href=\"#top\">&nbsp;</a></h1>\n</div>\n<div id=\"system\">\n<table>");
+-		fprintf(reportout.http_report, "<tr class=\"system_even\"><td width=20%%>PowerTOP Version</td><td>%s</td></tr>\n", POWERTOP_VERSION);
+		fprintf(reportout.http_report, "<tr class=\"system_even\"><td width=\"20%%\">PowerTOP Version</td><td>%s</td></tr>\n", POWERTOP_VERSION);
+ 	} else {
+ 		fprintf(reportout.csv_report, "***PowerTOP Report***, \n");
+ 		fprintf(reportout.csv_report, "**System Information**, \n");
+-- 
+1.7.7.6
+
--- a/powertop.spec
+++ b/powertop.spec
@ -1,29 +1,20 @@
 Name:          powertop
-Version:       1.98
-Release:       9%{?dist}
+Version:       2.0
+Release:       1%{?dist}
 Summary:       Power consumption monitor

 Group:         Applications/System
 License:       GPLv2
-URL:           http://www.lesswatts.org/
-#Source0:       http://www.lesswatts.org/projects/%{name}/download/%{name}-%{version}.tar.gz
-Source0:       http://www.kernel.org/pub/linux/status/powertop/%{name}-%{version}.tar.bz2
+URL:           http://01.org/powertop/
+Source0:       http://01.org/powertop/sites/default/files/downloads/%{name}-%{version}.tar.bz2
+
 # Sent upstream
-Patch0:        powertop-1.98-always-create-params.patch
-# Accepted upstream
-Patch1:        powertop-1.98-unknown-readings-fix.patch
-# Accepted upstream
-Patch2:        powertop-1.98-compile-fix.patch
-# Backported from upstream HEAD
-Patch3:        powertop-1.98-add-power-supply-class-support.patch
+Patch0:        powertop-2.0-always-create-params.patch
+Patch1:        powertop-2.0-html-escape.patch
 # Sent upstream
-Patch4:        powertop-1.98-power-supply-add-power-now-support.patch
+Patch2:        powertop-2.0-show-watts-only-if-discharging.patch
 # Sent upstream
-Patch5:        powertop-1.98-power-supply-units-fix.patch
-# Accepted upstream
-Patch6:        powertop-1.98-html-print-commands.patch
-Patch7:        powertop-1.98-html-escape.patch
-Patch8:        powertop-1.98-show-watts-only-if-discharging.patch
+Patch3:        powertop-2.0-valid-html-output.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gettext, ncurses-devel, pciutils-devel, zlib-devel, libnl-devel

@ -34,16 +25,12 @@ computer use more power than necessary while it is idle.
 %prep
 %setup -q
 %patch0 -p1 -b .always-create-params
-%patch1 -p1 -b .unknown-readings-fix
-%patch2 -p1 -b .compile-fix
-%patch3 -p1 -b .add-power-supply-class-support.patch
-%patch4 -p1 -b .power-supply-add-power-now-support
-%patch5 -p1 -b .power-supply-units-fix
-%patch6 -p1 -b .html-print-commands
-%patch7 -p1 -b .html-escape
-%patch8 -p1 -b .show-watts-only-if-discharging
+%patch1 -p1 -b .html-escape
+%patch2 -p1 -b .show-watts-only-if-discharging
+%patch3 -p1 -b .valid-html-output

 %build
+%configure
 make %{?_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"

 %install
@ -51,8 +38,7 @@ rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 install -Dd %{buildroot}%{_localstatedir}/cache/powertop
 touch %{buildroot}%{_localstatedir}/cache/powertop/{saved_parameters.powertop,saved_results.powertop}
-# No translation yet.
-#%find_lang %{name}
+%find_lang %{name}

 %post
 # Hack for powertop not to show warnings on first start
@ -61,19 +47,29 @@ touch %{_localstatedir}/cache/powertop/{saved_parameters.powertop,saved_results.
 %clean
 rm -rf %{buildroot}

-# No translation yet.
-#%files -f %{name}.lang
+%files -f %{name}.lang
 %files
 %defattr(-,root,root,-)
-%doc COPYING README
+%doc COPYING README TODO
 %dir %{_localstatedir}/cache/powertop
 %ghost %{_localstatedir}/cache/powertop/saved_parameters.powertop
 %ghost %{_localstatedir}/cache/powertop/saved_results.powertop
-%{_bindir}/powertop
+%{_sbindir}/powertop
 # No man page yet.
 #%{_mandir}/man8/powertop.8*

 %changelog
+* Wed May 16 2012 Jaroslav Škarvada <jskarvad@redhat.com> - 2.0-1
+- New version
+  Resolves: rhbz#821144
+- Dropped patches: unknown-readings-fix (upstreamed), compile-fix (upstreamed),
+  power-supply-add-power-now-support (upstreamed),
+  html-print-commands (upstreamed), add-power-supply-class-support (obsoleted),
+  power-supply-units-fix (obsoleted)
+- Updated patches: show-watts-only-if-discharging patch (sent upstream),
+  html-escape patch
+- Added patch: valid-html-output (sent upstream)
+
 * Tue Apr 17 2012 Jaroslav Škarvada <jskarvad@redhat.com> - 1.98-9
 - Show power consumption only if discharging
  Resolves: rhbz#811949
--- a/2
+++ b/2
@ -1 +1 @@
-c1a1bec9a0ddf14e46c176693d4dff8e  powertop-1.98.tar.bz2
+8f27e2b0bf1c68b1f5a9a98294238bb2  powertop-2.0.tar.bz2