[haiku-commits] BRANCH pdziepak-github.scheduler [a04b7d9] src/preferences/cpufrequency src/add-ons/kernel/drivers/power/enhanced_speedstep data/catalogs/preferences/cpufrequency
- From: pdziepak-github.scheduler <community@xxxxxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Fri, 22 Nov 2013 05:45:32 +0100 (CET)
added 3 changesets to branch 'refs/remotes/pdziepak-github/scheduler'
old head: 7c7b9b795bbb537b889e96e335dd9a4add8b2789
new head: a04b7d9f96772b54819061e3716f1e273526a84c
overview: https://github.com/pdziepak/Haiku/compare/7c7b9b7...a04b7d9
----------------------------------------------------------------------------
99a2e56: drivers: Remove Intel Enhanced SpeedStep driver
In current state this driver is useless anyway. It's not MP safe.
The P-state values stored in hardcoded tables are only for processors
on which we can't use SpeedStep, because of lack of invariant TSC.
Proper driver should get P-states from ACPI, ensure that the CPU offers
invariant TSC and obviouslt be MP safe.
208f76e: preferences: Remove CPUFrequency
We can't reliably set contemporary processors to an arbitrary frequency.
There are dependencies between cores and thechnologies like Turbo Boost
which may make actual frequency significantly different than the requested.
Moreover, it is the scheduler job to decide how much CPU performance is
needed and user shouldn't interfere with that.
a04b7d9: power: Remove old cpufreq interface
[ Pawel Dziepak <pdziepak@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
53 files changed, 2 insertions(+), 4570 deletions(-)
build/jam/images/HaikuImage | 2 +-
build/jam/images/HaikuImageBootstrap | 2 +-
build/jam/packages/Haiku | 1 -
build/jam/packages/HaikuBootstrap | 1 -
.../catalogs/preferences/cpufrequency/be.catkeys | 21 -
.../catalogs/preferences/cpufrequency/bg.catkeys | 18 -
.../catalogs/preferences/cpufrequency/cs.catkeys | 19 -
.../catalogs/preferences/cpufrequency/da.catkeys | 19 -
.../catalogs/preferences/cpufrequency/de.catkeys | 21 -
.../catalogs/preferences/cpufrequency/el.catkeys | 20 -
.../catalogs/preferences/cpufrequency/eo.catkeys | 19 -
.../catalogs/preferences/cpufrequency/fi.catkeys | 21 -
.../catalogs/preferences/cpufrequency/fr.catkeys | 21 -
.../catalogs/preferences/cpufrequency/hi.catkeys | 20 -
.../catalogs/preferences/cpufrequency/hr.catkeys | 12 -
.../catalogs/preferences/cpufrequency/hu.catkeys | 21 -
.../catalogs/preferences/cpufrequency/it.catkeys | 19 -
.../catalogs/preferences/cpufrequency/ja.catkeys | 21 -
.../catalogs/preferences/cpufrequency/ko.catkeys | 19 -
.../catalogs/preferences/cpufrequency/lt.catkeys | 21 -
.../catalogs/preferences/cpufrequency/nb.catkeys | 19 -
.../catalogs/preferences/cpufrequency/nl.catkeys | 21 -
.../catalogs/preferences/cpufrequency/pl.catkeys | 21 -
.../catalogs/preferences/cpufrequency/pt.catkeys | 12 -
.../preferences/cpufrequency/pt_BR.catkeys | 21 -
.../preferences/cpufrequency/pt_br.catkeys | 8 -
.../catalogs/preferences/cpufrequency/ro.catkeys | 20 -
.../catalogs/preferences/cpufrequency/ru.catkeys | 21 -
.../catalogs/preferences/cpufrequency/sk.catkeys | 21 -
.../catalogs/preferences/cpufrequency/sv.catkeys | 21 -
.../catalogs/preferences/cpufrequency/uk.catkeys | 20 -
.../preferences/cpufrequency/zh-Hans.catkeys | 20 -
.../preferences/cpufrequency/zh_Hans.catkeys | 21 -
headers/private/device/power_managment.h | 29 -
src/add-ons/kernel/drivers/power/Jamfile | 1 -
.../drivers/power/enhanced_speedstep/Jamfile | 18 -
.../enhanced_speedstep/enhanced_speedstep.cpp | 407 ---------
.../enhanced_speedstep/enhanced_speedstep.h | 29 -
.../power/enhanced_speedstep/frequency.cpp | 202 -----
.../drivers/power/enhanced_speedstep/frequency.h | 852 -------------------
src/preferences/Jamfile | 1 -
.../cpufrequency/CPUFrequencyView.cpp | 252 ------
src/preferences/cpufrequency/CPUFrequencyView.h | 91 --
src/preferences/cpufrequency/ColorStepView.cpp | 333 --------
src/preferences/cpufrequency/ColorStepView.h | 82 --
src/preferences/cpufrequency/DriverInterface.cpp | 222 -----
src/preferences/cpufrequency/DriverInterface.h | 53 --
src/preferences/cpufrequency/Jamfile | 24 -
src/preferences/cpufrequency/PreferencesWindow.h | 481 -----------
src/preferences/cpufrequency/StatusView.cpp | 712 ----------------
src/preferences/cpufrequency/StatusView.h | 135 ---
src/preferences/cpufrequency/cpufrequency.rdef | 45 -
src/preferences/cpufrequency/main.cpp | 39 -
############################################################################
Commit: 99a2e56579b306d366d0f390f45e5b7e69b2be34
Author: Pawel Dziepak <pdziepak@xxxxxxxxxxx>
Date: Fri Nov 22 04:02:34 2013 UTC
drivers: Remove Intel Enhanced SpeedStep driver
In current state this driver is useless anyway. It's not MP safe.
The P-state values stored in hardcoded tables are only for processors
on which we can't use SpeedStep, because of lack of invariant TSC.
Proper driver should get P-states from ACPI, ensure that the CPU offers
invariant TSC and obviouslt be MP safe.
----------------------------------------------------------------------------
diff --git a/build/jam/packages/Haiku b/build/jam/packages/Haiku
index 2ca840a..46df98a 100644
--- a/build/jam/packages/Haiku
+++ b/build/jam/packages/Haiku
@@ -61,7 +61,6 @@ if $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = x86_64 {
# drivers
AddNewDriversToPackage disk scsi : scsi_cd scsi_disk ;
AddNewDriversToPackage disk virtual : virtio_block ;
-AddNewDriversToPackage power : enhanced_speedstep@x86 ;
AddNewDriversToPackage power : acpi_battery@x86 ;
#AddNewDriversToPackage display : display_controls@x86 ;
diff --git a/build/jam/packages/HaikuBootstrap
b/build/jam/packages/HaikuBootstrap
index f4a419d..1fafbb2 100644
--- a/build/jam/packages/HaikuBootstrap
+++ b/build/jam/packages/HaikuBootstrap
@@ -60,7 +60,6 @@ if $(TARGET_ARCH) = x86 || $(TARGET_ARCH) = x86_64 {
# drivers
AddNewDriversToPackage disk scsi : scsi_cd scsi_disk ;
AddNewDriversToPackage disk virtual : virtio_block ;
-AddNewDriversToPackage power : enhanced_speedstep@x86 ;
AddNewDriversToPackage power : acpi_battery@x86 ;
#AddNewDriversToPackage display : display_controls@x86 ;
diff --git a/src/add-ons/kernel/drivers/power/Jamfile
b/src/add-ons/kernel/drivers/power/Jamfile
index 45feced..2755d26 100644
--- a/src/add-ons/kernel/drivers/power/Jamfile
+++ b/src/add-ons/kernel/drivers/power/Jamfile
@@ -4,5 +4,4 @@ SubInclude HAIKU_TOP src add-ons kernel drivers power
acpi_battery ;
SubInclude HAIKU_TOP src add-ons kernel drivers power acpi_button ;
SubInclude HAIKU_TOP src add-ons kernel drivers power acpi_lid ;
SubInclude HAIKU_TOP src add-ons kernel drivers power acpi_thermal ;
-SubInclude HAIKU_TOP src add-ons kernel drivers power enhanced_speedstep ;
SubInclude HAIKU_TOP src add-ons kernel drivers power x86_cpuidle ;
diff --git a/src/add-ons/kernel/drivers/power/enhanced_speedstep/Jamfile
b/src/add-ons/kernel/drivers/power/enhanced_speedstep/Jamfile
deleted file mode 100644
index 8187816..0000000
--- a/src/add-ons/kernel/drivers/power/enhanced_speedstep/Jamfile
+++ /dev/null
@@ -1,18 +0,0 @@
-SubDir HAIKU_TOP src add-ons kernel drivers power enhanced_speedstep ;
-
-SetSubDirSupportedPlatformsBeOSCompatible ;
-
-if $(TARGET_PLATFORM) != haiku {
- # Needed for <ACPI.h>. Unfortunately we also get the other headers
there,
- # that we don't really want.
- UsePublicHeaders drivers ;
-}
-
-UsePrivateHeaders kernel ;
-
-KernelAddon enhanced_speedstep :
- enhanced_speedstep.cpp
- frequency.cpp
- ;
-
-Depends acpi_enhanced_speedstep : acpi ;
\ No newline at end of file
diff --git
a/src/add-ons/kernel/drivers/power/enhanced_speedstep/enhanced_speedstep.cpp
b/src/add-ons/kernel/drivers/power/enhanced_speedstep/enhanced_speedstep.cpp
deleted file mode 100644
index eaf29c2..0000000
--- a/src/add-ons/kernel/drivers/power/enhanced_speedstep/enhanced_speedstep.cpp
+++ /dev/null
@@ -1,407 +0,0 @@
-/*
- * Copyright 2009, Haiku, Inc. All Rights Reserved.
- * Distributed under the terms of the MIT License.
- *
- * Authors:
- * Clemens Zeidler, haiku@xxxxxxxxxxxxxxxxxx
- */
-
-#include <KernelExport.h>
-#include <Drivers.h>
-#include <Errors.h>
-#include <string.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <kernel/arch/x86/arch_cpu.h>
-
-#include <ACPI.h>
-#include "enhanced_speedstep.h"
-#include <condition_variable.h>
-
-#include "frequency.h"
-
-
-#define EST_MODULE_NAME "drivers/power/enhanced_speedstep/driver_v1"
-
-#define EST_DEVICE_MODULE_NAME "drivers/power/enhanced_speedstep/device_v1"
-
-/* Base Namespace devices are published to */
-#define EST_BASENAME "power/enhanced_speedstep/%d"
-
-// name of pnp generator of path ids
-#define EST_PATHID_GENERATOR "enhanced_speedstep/path_id"
-
-static device_manager_info *sDeviceManager;
-static ConditionVariable sFrequencyCondition;
-static int32 sCurrentID;
-
-
-static status_t
-est_read(void* _cookie, off_t position, void *buffer, size_t* numBytes)
-{
- if (*numBytes < 1)
- return B_IO_ERROR;
-
- est_cookie *device = (est_cookie *)_cookie;
-
- if (position == 0) {
- size_t max_len = *numBytes;
- char *str = (char *)buffer;
-
- snprintf(str, max_len, "CPU Frequency states:\n");
- max_len-= strlen(str);
- str += strlen(str);
-
- freq_info *freqsInfo = device->available_states;
- freq_info *f;
- for (f = freqsInfo; f->frequency != 0; f++) {
- snprintf(str, max_len, " Frequency %hu, Volts %hu,
Power %i, "
- "Latency %i, id %hu\n", f->frequency, f->volts,
f->power, f->id,
- EST_TRANS_LAT);
- max_len-= strlen(str);
- str += strlen(str);
- }
-
- freq_info *f2 = est_get_current(freqsInfo);
- if (f2) {
- snprintf(str, max_len, "\nCurrent State: Frequency %hu,
Volts %hu, "
- "Power %i, Latency %i\n", f2->frequency,
f2->volts, f2->power,
- EST_TRANS_LAT);
- }
-
- *numBytes = strlen((char *)buffer);
- } else {
- *numBytes = 0;
- }
-
- return B_OK;
-}
-
-
-static status_t
-est_write(void* cookie, off_t position, const void* buffer, size_t* numBytes)
-{
- return B_ERROR;
-}
-
-
-status_t
-est_control(void* _cookie, uint32 op, void* arg, size_t len)
-{
- est_cookie* device = (est_cookie*)_cookie;
- status_t err = B_ERROR;
-
- uint32* magicId;
- uint16* id;
- freq_info* freqInfo = NULL;
- switch (op) {
- case IDENTIFY_DEVICE:
- if (len < sizeof(uint32))
- return B_IO_ERROR;
- magicId = (uint32*)arg;
- *magicId = kMagicFreqID;
- err = B_OK;
- break;
-
- case GET_CPU_FREQ_STATES:
- if (len < sizeof(freq_info) * (device->number_states +
1))
- return B_IO_ERROR;
- freqInfo = (freq_info*)arg;
- user_memcpy(freqInfo, device->available_states,
- sizeof(freq_info) * (device->number_states +
1));
- err = B_OK;
- break;
-
- case GET_CURENT_CPU_FREQ_STATE:
- if (len < sizeof(uint16))
- return B_IO_ERROR;
- freqInfo = est_get_current(device->available_states);
- if (!freqInfo)
- return B_ERROR;
- atomic_set(&sCurrentID, freqInfo->id);
- *((uint16*)arg) = freqInfo->id;
- err = B_OK;
- break;
-
- case SET_CPU_FREQ_STATE:
- if (len < sizeof(uint16))
- return B_IO_ERROR;
- id = (uint16*)arg;
- err = est_set_id16(*id);
- if (err == B_OK) {
- atomic_set(&sCurrentID, *id);
- sFrequencyCondition.NotifyAll();
- }
- break;
-
- case WATCH_CPU_FREQ:
- if (len < sizeof(uint16))
- return B_IO_ERROR;
- sFrequencyCondition.Wait();
- if (atomic_get(&(device->stop_watching))) {
- atomic_set(&(device->stop_watching), 0);
- err = B_ERROR;
- } else {
- *((uint16*)arg) = atomic_get(&sCurrentID);
- err = B_OK;
- }
- break;
-
- case STOP_WATCHING_CPU_FREQ:
- atomic_set(&(device->stop_watching), 1);
- sFrequencyCondition.NotifyAll();
- err = B_OK;
- break;
- }
- return err;
-}
-
-
-static status_t
-est_open(void *initCookie, const char *path, int flags, void** cookie)
-{
- TRACE("est: open\n");
- est_cookie *device;
- device = (est_cookie *)calloc(1, sizeof(est_cookie));
- if (device == NULL)
- return B_NO_MEMORY;
-
- *cookie = device;
-
- device_node *node = (device_node *)initCookie;
- device->node = node;
-
- device_node *parent;
- parent = sDeviceManager->get_parent_node(node);
- sDeviceManager->get_driver(parent, (driver_module_info **)&device->acpi,
- (void **)&device->acpi_cookie);
- sDeviceManager->put_node(parent);
-
- device->stop_watching = 0;
-
- // enable enhanced speedstep
- uint64 msrMisc = x86_read_msr(MSR_MISC);
- if ((msrMisc & MSR_EST_ENABLED) == 0) {
- TRACE("est: enable enhanced speedstep\n");
- x86_write_msr(MSR_MISC, msrMisc | MSR_EST_ENABLED);
-
- uint64 msrMisc = x86_read_msr(MSR_MISC);
- if ((msrMisc & MSR_EST_ENABLED) == 0) {
- TRACE("est: enable enhanced speedstep failed\n");
- return B_ERROR;
- }
- }
-
- // get freq_info
- if (est_get_info(&(device->available_states)) != B_OK)
- return B_ERROR;
- freq_info *freqsInfo = device->available_states;
-
- // count number of states
- TRACE("est: frequency info:\n");
- freq_info *f;
- device->number_states = 0;
- for (f = freqsInfo; f->frequency != 0; f++) {
- TRACE("est: Frequency %u, Volts %u, Power %i, Latency %u, id
%u\n",
- f->frequency, f->volts, f->power, f->id, EST_TRANS_LAT);
- device->number_states++;
- }
-
- // print current frequency
- freq_info *f2 = est_get_current(freqsInfo);
- if (f2) {
- TRACE("est: Current Frequency %u, Volts %u, Power %i, Latency
%u\n",
- f2->frequency, f2->volts, f2->power, EST_TRANS_LAT);
- }
-
- return B_OK;
-}
-
-
-static status_t
-est_close(void* cookie)
-{
- est_cookie *device = (est_cookie*)cookie;
- free(device);
- return B_OK;
-}
-
-
-static status_t
-est_free(void* cookie)
-{
- return B_OK;
-}
-
-
-// #pragma mark - driver module API
-
-
-static float
-est_support(device_node *parent)
-{
- // make sure parent is really the ACPI bus manager
- const char *bus;
- if (sDeviceManager->get_attr_string(parent, B_DEVICE_BUS, &bus, false))
- return -1;
-
- if (strcmp(bus, "acpi"))
- return 0.0;
-
- // check whether it's really a cpu Device
- uint32 deviceType;
- if (sDeviceManager->get_attr_uint32(parent, ACPI_DEVICE_TYPE_ITEM,
- &deviceType, false) != B_OK
- || deviceType != ACPI_TYPE_PROCESSOR) {
- return 0.0;
- }
-
- // check if cpu support est
- uint32 cpuNum = 0;
- system_info sysInfo;
- if (get_system_info(&sysInfo) != B_OK)
- return 0.0;
- TRACE("est: cpu_type: %u vendor %u model %u\n", sysInfo.cpu_type,
- sysInfo.cpu_type & B_CPU_x86_VENDOR_MASK, sysInfo.cpu_type &
0x00FF);
- if ((sysInfo.cpu_type & B_CPU_x86_VENDOR_MASK) != B_CPU_INTEL_x86)
- return 0.0;
-
- // TODO: Make the code SMP safe!
- if (sysInfo.cpu_count > 1)
- return 0.0;
-
- cpuid_info info;
- if (get_cpuid(&info, 1, cpuNum) != B_OK)
- return 0.0;
-
- TRACE("est: extended_features: %i\n",
int(info.eax_1.extended_features));
-
- // check for enhanced speedstep
- if ((info.eax_1.extended_features & IA32_FEATURE_EXT_EST) == 0)
- return 0.0;
-
- TRACE("est: supported\n");
- return 0.6;
-}
-
-
-static status_t
-est_register_device(device_node *node)
-{
- device_attr attrs[] = {
- { B_DEVICE_PRETTY_NAME, B_STRING_TYPE,
- { string: "ACPI Enhanced Speedstep" }},
- { NULL }
- };
-
- return sDeviceManager->register_node(node, EST_MODULE_NAME, attrs,
- NULL, NULL);
-}
-
-
-static status_t
-est_init_driver(device_node *node, void **_driverCookie)
-{
- *_driverCookie = node;
-
- sFrequencyCondition.Init(NULL, "frequency cv");
- sCurrentID = -1;
-
- return B_OK;
-}
-
-
-static void
-est_uninit_driver(void *driverCookie)
-{
-}
-
-
-static status_t
-est_register_child_devices(void *_cookie)
-{
- device_node *node = (device_node*)_cookie;
-
- int pathID = sDeviceManager->create_id(EST_PATHID_GENERATOR);
- if (pathID < 0) {
- TRACE("est_register_child_devices: couldn't create a
path_id\n");
- return B_ERROR;
- }
-
- char name[128];
- snprintf(name, sizeof(name), EST_BASENAME, pathID);
-
- return sDeviceManager->publish_device(node, name,
EST_DEVICE_MODULE_NAME);
-}
-
-
-static status_t
-est_init_device(void *driverCookie, void **cookie)
-{
- // driverCookie is the device node
- *cookie = driverCookie;
- return B_OK;
-}
-
-
-static void
-est_uninit_device(void *_cookie)
-{
-
-}
-
-
-
-module_dependency module_dependencies[] = {
- { B_DEVICE_MANAGER_MODULE_NAME, (module_info **)&sDeviceManager },
- {}
-};
-
-
-driver_module_info est_driver_module = {
- {
- EST_MODULE_NAME,
- 0,
- NULL
- },
-
- est_support,
- est_register_device,
- est_init_driver,
- est_uninit_driver,
- est_register_child_devices,
- NULL, // rescan
- NULL, // removed
-};
-
-
-struct device_module_info est_device_module = {
- {
- EST_DEVICE_MODULE_NAME,
- 0,
- NULL
- },
-
- est_init_device,
- est_uninit_device,
- NULL,
-
- est_open,
- est_close,
- est_free,
- est_read,
- est_write,
- NULL,
- est_control,
-
- NULL,
- NULL
-};
-
-module_info *modules[] = {
- (module_info *)&est_driver_module,
- (module_info *)&est_device_module,
- NULL
-};
diff --git
a/src/add-ons/kernel/drivers/power/enhanced_speedstep/enhanced_speedstep.h
b/src/add-ons/kernel/drivers/power/enhanced_speedstep/enhanced_speedstep.h
deleted file mode 100644
index b51fa91..0000000
--- a/src/add-ons/kernel/drivers/power/enhanced_speedstep/enhanced_speedstep.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef _EST_H
-#define _EST_H
-
-#include <KernelExport.h>
-#include <ACPI.h>
-
-#include "frequency.h"
-
-// Model Specific Register
-#define MSR_MISC 0x1a0
-#define MSR_EST_ENABLED (1<<16)
-
-
-struct est_cookie {
- // this three variables are not needed yet but helpfull when extend this
- // driver to use acpi
- device_node *node;
- acpi_device_module_info *acpi;
- acpi_device acpi_cookie;
-
- // array of states don't delete it
- freq_info* available_states;
- uint8 number_states;
-
- int32 stop_watching;
-};
-
-
-#endif /* _EST_H */
diff --git a/src/add-ons/kernel/drivers/power/enhanced_speedstep/frequency.cpp
b/src/add-ons/kernel/drivers/power/enhanced_speedstep/frequency.cpp
deleted file mode 100644
index 0c75901..0000000
--- a/src/add-ons/kernel/drivers/power/enhanced_speedstep/frequency.cpp
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * Copyright 2009, Haiku, Inc. All Rights Reserved.
- * Distributed under the terms of the MIT License.
- *
- * Authors:
- * Clemens Zeidler, haiku@xxxxxxxxxxxxxxxxxx
- */
-
-
-#include "frequency.h"
-
-#include <arch/x86/arch_cpu.h>
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-
-void
-est_get_id16(uint16* _id16)
-{
- *_id16 = x86_read_msr(MSR_GET_FREQ_STATE) & 0xffff;
-}
-
-
-status_t
-est_set_id16(uint16 id16, bool needCheck)
-{
- uint64 msr;
-
- // Read the current register, mask out the old, set the new id.
- msr = x86_read_msr(MSR_GET_FREQ_STATE);
- msr = (msr & ~0xffff) | id16;
- x86_write_msr(MSR_SET_FREQ_STATE, msr);
-
- if (needCheck) {
- // Wait a short while for the new setting. XXX Is this
necessary?
- snooze(EST_TRANS_LAT);
-
- uint16 newID16;
- est_get_id16(&newID16);
- if (newID16 != id16)
- return B_ERROR;
- TRACE("EST: set frequency ok, id %i\n", id16);
- }
- return B_OK;
-}
-
-
-freq_info*
-est_get_current(freq_info* list)
-{
- // Try a few times to get a valid value. Sometimes, if the CPU
- // is in the middle of an asynchronous transition (i.e., P4TCC),
- // we get a temporary invalid result.
- for (uint32 i = 0; i < 5; i++) {
- uint16 id16;
- est_get_id16(&id16);
-
- for (freq_info* info = list; info->id != 0; info++) {
- if (info->id == id16)
- return info;
- }
-
- snooze(100);
- }
- return NULL;
-}
-
-
-status_t
-est_get_info(freq_info** _frequencyInfos)
-{
- uint64 msr = x86_read_msr(MSR_GET_FREQ_STATE);
- status_t status = est_table_info(msr, _frequencyInfos);
- if (status != B_OK) {
- TRACE("EST: Get frequency table from model specific
register\n");
- status = est_msr_info(msr, _frequencyInfos);
- }
-
- if (status != B_OK) {
- TRACE("est: CPU supports Enhanced Speedstep, but is not
recognized.\n");
- return status;
- }
-
- return B_OK;
-}
-
-
-status_t
-est_table_info(uint64 msr, freq_info** _frequencyInfos)
-{
- // Find a table which matches (vendor, id32).
- system_info info;
- if (get_system_info(&info) != B_OK)
- return B_ERROR;
-
- ss_cpu_info* cpuInfo;
- uint32 id = msr >> 32;
- for (cpuInfo = ESTprocs; cpuInfo->id32 != 0; cpuInfo++) {
- if (cpuInfo->vendor_id == uint32(info.cpu_type &
B_CPU_x86_VENDOR_MASK)
- && cpuInfo->id32 == id)
- break;
- }
- if (cpuInfo->id32 == 0)
- return B_ERROR;
-
- // Make sure the current setpoint is valid.
- if (est_get_current(cpuInfo->freqtab) == NULL) {
- TRACE("current setting not found in table\n");
- return B_ERROR;
- }
-
- *_frequencyInfos = cpuInfo->freqtab;
- return B_OK;
-}
-
-
-bool
-bus_speed_ok(int bus)
-{
- switch (bus) {
- case 100:
- case 133:
- case 166:
- case 333:
- return true;
- default:
- return false;
- }
-}
-
-
-/*! Flesh out a simple rate table containing the high and low frequencies
- based on the current clock speed and the upper 32 bits of the MSR.
-*/
-status_t
-est_msr_info(uint64 msr, freq_info** _frequencyInfos)
-{
- // Figure out the bus clock.
- system_info info;
- if (get_system_info(&info) != B_OK)
- return B_ERROR;
-
- int32 freq = info.cpu_clock_speed / 1000000;
- uint16 id = msr >> 32;
- int32 bus = 0;
- if (id >> 8)
- bus = freq / (id >> 8);
-
- TRACE("est: Guessed bus clock (high) of %d MHz\n", int(bus));
- if (!bus_speed_ok(bus)) {
- // We may be running on the low frequency.
- id = msr >> 48;
- if (id >> 8)
- bus = freq / (id >> 8);
- TRACE("est: Guessed bus clock (low) of %d MHz\n", int(bus));
- if (!bus_speed_ok(bus))
- return B_ERROR;
-
- // Calculate high frequency.
- id = msr >> 32;
- freq = ((id >> 8) & 0xff) * bus;
- }
-
- // Fill out a new freq table containing just the high and low freqs.
- freq_info* frequencyInfo = (freq_info*)malloc(sizeof(freq_info) * 3);
- if (frequencyInfo == NULL)
- return B_NO_MEMORY;
-
- memset(frequencyInfo, 0, sizeof(freq_info) * 3);
-
- // First, the high frequency.
- int32 volts = id & 0xff;
- if (volts != 0) {
- volts <<= 4;
- volts += 700;
- }
- frequencyInfo[0].frequency = freq;
- frequencyInfo[0].volts = volts;
- frequencyInfo[0].id = id;
- frequencyInfo[0].power = CPUFREQ_VAL_UNKNOWN;
- TRACE("Guessed high setting of %d MHz @ %d Mv\n", int(freq),
int(volts));
-
- // Second, the low frequency.
- id = msr >> 48;
- freq = ((id >> 8) & 0xff) * bus;
- volts = id & 0xff;
- if (volts != 0) {
- volts <<= 4;
- volts += 700;
- }
- frequencyInfo[1].frequency = freq;
- frequencyInfo[1].volts = volts;
- frequencyInfo[1].id = id;
- frequencyInfo[1].power = CPUFREQ_VAL_UNKNOWN;
- TRACE("Guessed low setting of %d MHz @ %d Mv\n", int(freq), int(volts));
-
- // Table is already terminated due to M_ZERO.
- *_frequencyInfos = frequencyInfo;
- return B_OK;
-}
diff --git a/src/add-ons/kernel/drivers/power/enhanced_speedstep/frequency.h
b/src/add-ons/kernel/drivers/power/enhanced_speedstep/frequency.h
deleted file mode 100644
index 454bc6e..0000000
--- a/src/add-ons/kernel/drivers/power/enhanced_speedstep/frequency.h
+++ /dev/null
@@ -1,852 +0,0 @@
-#ifndef FREQ_TABLE_H
-#define FREQ_TABLE_H
-
-#include <OS.h>
-#include <KernelExport.h>
-#include <Errors.h>
-
-#include "device/power_managment.h"
-
-#define TRACE_EST
-#ifdef TRACE_EST
-# define TRACE(x...) dprintf(x)
-#else
-# define TRACE(x...)
-#endif
-
-// this code is taken from freeBSD
-
-#define MSR_GET_FREQ_STATE 0x198
-#define MSR_SET_FREQ_STATE 0x199
-
-/* Estimate in microseconds of latency for performing a transition. */
-#define EST_TRANS_LAT 1000
-
-/* Identifying characteristics of a processor and supported frequencies. */
-typedef struct {
- const uint32 vendor_id;
- uint32 id32;
- freq_info *freqtab;
-} ss_cpu_info;
-
-
-status_t est_get_info(freq_info **freqsInfo);
-status_t est_table_info(uint64 msr, freq_info **freqs);
-status_t est_msr_info(uint64 msr, freq_info **freqs);
-
-freq_info* est_get_current(freq_info *freq_list);
-void est_get_id16(uint16 *id16_p);
-status_t est_set_id16(uint16 id16, bool need_check = false);
-
-/* Convert MHz and mV into IDs for passing to the MSR. */
-#define ID16(MHz, mV, bus_clk) \
- (((MHz / bus_clk) << 8) | ((mV ? mV - 700 : 0) >> 4))
-#define ID32(MHz_hi, mV_hi, MHz_lo, mV_lo, bus_clk) \
- ((ID16(MHz_lo, mV_lo, bus_clk) << 16) | (ID16(MHz_hi, mV_hi, bus_clk)))
-
-/* Format for storing IDs in our table. */
-#define CPUFREQ_VAL_UNKNOWN (-1)
-#define CPU_VENDOR_INTEL B_CPU_INTEL_x86
-#define CPU_VENDOR_CENTAUR B_CPU_VIA_IDT_x86
-
-#define FREQ_INFO_PWR(MHz, mV, bus_clk, mW) \
- { MHz, mV, ID16(MHz, mV, bus_clk), mW }
-#define FREQ_INFO(MHz, mV, bus_clk) \
- FREQ_INFO_PWR(MHz, mV, bus_clk, CPUFREQ_VAL_UNKNOWN)
-#define INTEL(tab, zhi, vhi, zlo, vlo, bus_clk) \
- { CPU_VENDOR_INTEL, ID32(zhi, vhi, zlo, vlo, bus_clk), tab }
-#define CENTAUR(tab, zhi, vhi, zlo, vlo, bus_clk) \
- { CPU_VENDOR_CENTAUR, ID32(zhi, vhi, zlo, vlo, bus_clk), tab }
-
-/* Default bus clock value for Centrino processors. */
-#define INTEL_BUS_CLK 100
-
-/*
- * Frequency (MHz) and voltage (mV) settings. Data from the
- * Intel Pentium M Processor Datasheet (Order Number 252612), Table 5.
- *
- * Dothan processors have multiple VID#s with different settings for
- * each VID#. Since we can't uniquely identify this info
- * without undisclosed methods from Intel, we can't support newer
- * processors with this table method. If ACPI Px states are supported,
- * we get info from them.
- */
-static freq_info PM17_130[] = {
- /* 130nm 1.70GHz Pentium M */
- FREQ_INFO(1700, 1484, INTEL_BUS_CLK),
- FREQ_INFO(1400, 1308, INTEL_BUS_CLK),
- FREQ_INFO(1200, 1228, INTEL_BUS_CLK),
- FREQ_INFO(1000, 1116, INTEL_BUS_CLK),
- FREQ_INFO( 800, 1004, INTEL_BUS_CLK),
- FREQ_INFO( 600, 956, INTEL_BUS_CLK),
- FREQ_INFO( 0, 0, 1),
-};
-static freq_info PM16_130[] = {
- /* 130nm 1.60GHz Pentium M */
- FREQ_INFO(1600, 1484, INTEL_BUS_CLK),
- FREQ_INFO(1400, 1420, INTEL_BUS_CLK),
- FREQ_INFO(1200, 1276, INTEL_BUS_CLK),
- FREQ_INFO(1000, 1164, INTEL_BUS_CLK),
- FREQ_INFO( 800, 1036, INTEL_BUS_CLK),
- FREQ_INFO( 600, 956, INTEL_BUS_CLK),
- FREQ_INFO( 0, 0, 1),
-};
-static freq_info PM15_130[] = {
- /* 130nm 1.50GHz Pentium M */
- FREQ_INFO(1500, 1484, INTEL_BUS_CLK),
- FREQ_INFO(1400, 1452, INTEL_BUS_CLK),
- FREQ_INFO(1200, 1356, INTEL_BUS_CLK),
- FREQ_INFO(1000, 1228, INTEL_BUS_CLK),
- FREQ_INFO( 800, 1116, INTEL_BUS_CLK),
- FREQ_INFO( 600, 956, INTEL_BUS_CLK),
- FREQ_INFO( 0, 0, 1),
-};
-static freq_info PM14_130[] = {
- /* 130nm 1.40GHz Pentium M */
- FREQ_INFO(1400, 1484, INTEL_BUS_CLK),
- FREQ_INFO(1200, 1436, INTEL_BUS_CLK),
- FREQ_INFO(1000, 1308, INTEL_BUS_CLK),
- FREQ_INFO( 800, 1180, INTEL_BUS_CLK),
- FREQ_INFO( 600, 956, INTEL_BUS_CLK),
- FREQ_INFO( 0, 0, 1),
-};
-static freq_info PM13_130[] = {
- /* 130nm 1.30GHz Pentium M */
- FREQ_INFO(1300, 1388, INTEL_BUS_CLK),
- FREQ_INFO(1200, 1356, INTEL_BUS_CLK),
- FREQ_INFO(1000, 1292, INTEL_BUS_CLK),
- FREQ_INFO( 800, 1260, INTEL_BUS_CLK),
- FREQ_INFO( 600, 956, INTEL_BUS_CLK),
- FREQ_INFO( 0, 0, 1),
-};
-static freq_info PM13_LV_130[] = {
- /* 130nm 1.30GHz Low Voltage Pentium M */
- FREQ_INFO(1300, 1180, INTEL_BUS_CLK),
- FREQ_INFO(1200, 1164, INTEL_BUS_CLK),
- FREQ_INFO(1100, 1100, INTEL_BUS_CLK),
- FREQ_INFO(1000, 1020, INTEL_BUS_CLK),
- FREQ_INFO( 900, 1004, INTEL_BUS_CLK),
- FREQ_INFO( 800, 988, INTEL_BUS_CLK),
- FREQ_INFO( 600, 956, INTEL_BUS_CLK),
- FREQ_INFO( 0, 0, 1),
-};
-static freq_info PM12_LV_130[] = {
- /* 130 nm 1.20GHz Low Voltage Pentium M */
- FREQ_INFO(1200, 1180, INTEL_BUS_CLK),
- FREQ_INFO(1100, 1164, INTEL_BUS_CLK),
- FREQ_INFO(1000, 1100, INTEL_BUS_CLK),
- FREQ_INFO( 900, 1020, INTEL_BUS_CLK),
- FREQ_INFO( 800, 1004, INTEL_BUS_CLK),
- FREQ_INFO( 600, 956, INTEL_BUS_CLK),
- FREQ_INFO( 0, 0, 1),
-};
-static freq_info PM11_LV_130[] = {
- /* 130 nm 1.10GHz Low Voltage Pentium M */
- FREQ_INFO(1100, 1180, INTEL_BUS_CLK),
- FREQ_INFO(1000, 1164, INTEL_BUS_CLK),
- FREQ_INFO( 900, 1100, INTEL_BUS_CLK),
- FREQ_INFO( 800, 1020, INTEL_BUS_CLK),
- FREQ_INFO( 600, 956, INTEL_BUS_CLK),
- FREQ_INFO( 0, 0, 1),
-};
-static freq_info PM11_ULV_130[] = {
- /* 130 nm 1.10GHz Ultra Low Voltage Pentium M */
- FREQ_INFO(1100, 1004, INTEL_BUS_CLK),
- FREQ_INFO(1000, 988, INTEL_BUS_CLK),
- FREQ_INFO( 900, 972, INTEL_BUS_CLK),
- FREQ_INFO( 800, 956, INTEL_BUS_CLK),
- FREQ_INFO( 600, 844, INTEL_BUS_CLK),
- FREQ_INFO( 0, 0, 1),
-};
-static freq_info PM10_ULV_130[] = {
- /* 130 nm 1.00GHz Ultra Low Voltage Pentium M */
- FREQ_INFO(1000, 1004, INTEL_BUS_CLK),
- FREQ_INFO( 900, 988, INTEL_BUS_CLK),
- FREQ_INFO( 800, 972, INTEL_BUS_CLK),
- FREQ_INFO( 600, 844, INTEL_BUS_CLK),
- FREQ_INFO( 0, 0, 1),
-};
-
-/*
- * Data from "Intel Pentium M Processor on 90nm Process with
- * 2-MB L2 Cache Datasheet", Order Number 302189, Table 5.
- */
-static freq_info PM_765A_90[] = {
- /* 90 nm 2.10GHz Pentium M, VID #A */
- FREQ_INFO(2100, 1340, INTEL_BUS_CLK),
- FREQ_INFO(1800, 1276, INTEL_BUS_CLK),
- FREQ_INFO(1600, 1228, INTEL_BUS_CLK),
- FREQ_INFO(1400, 1180, INTEL_BUS_CLK),
- FREQ_INFO(1200, 1132, INTEL_BUS_CLK),
- FREQ_INFO(1000, 1084, INTEL_BUS_CLK),
- FREQ_INFO( 800, 1036, INTEL_BUS_CLK),
- FREQ_INFO( 600, 988, INTEL_BUS_CLK),
- FREQ_INFO( 0, 0, 1),
-};
-static freq_info PM_765B_90[] = {
- /* 90 nm 2.10GHz Pentium M, VID #B */
- FREQ_INFO(2100, 1324, INTEL_BUS_CLK),
- FREQ_INFO(1800, 1260, INTEL_BUS_CLK),
- FREQ_INFO(1600, 1212, INTEL_BUS_CLK),
- FREQ_INFO(1400, 1180, INTEL_BUS_CLK),
- FREQ_INFO(1200, 1132, INTEL_BUS_CLK),
- FREQ_INFO(1000, 1084, INTEL_BUS_CLK),
- FREQ_INFO( 800, 1036, INTEL_BUS_CLK),
- FREQ_INFO( 600, 988, INTEL_BUS_CLK),
- FREQ_INFO( 0, 0, 1),
-};
-static freq_info PM_765C_90[] = {
- /* 90 nm 2.10GHz Pentium M, VID #C */
- FREQ_INFO(2100, 1308, INTEL_BUS_CLK),
- FREQ_INFO(1800, 1244, INTEL_BUS_CLK),
- FREQ_INFO(1600, 1212, INTEL_BUS_CLK),
- FREQ_INFO(1400, 1164, INTEL_BUS_CLK),
- FREQ_INFO(1200, 1116, INTEL_BUS_CLK),
- FREQ_INFO(1000, 1084, INTEL_BUS_CLK),
- FREQ_INFO( 800, 1036, INTEL_BUS_CLK),
- FREQ_INFO( 600, 988, INTEL_BUS_CLK),
- FREQ_INFO( 0, 0, 1),
-};
-static freq_info PM_765E_90[] = {
- /* 90 nm 2.10GHz Pentium M, VID #E */
- FREQ_INFO(2100, 1356, INTEL_BUS_CLK),
- FREQ_INFO(1800, 1292, INTEL_BUS_CLK),
- FREQ_INFO(1600, 1244, INTEL_BUS_CLK),
- FREQ_INFO(1400, 1196, INTEL_BUS_CLK),
- FREQ_INFO(1200, 1148, INTEL_BUS_CLK),
- FREQ_INFO(1000, 1100, INTEL_BUS_CLK),
- FREQ_INFO( 800, 1052, INTEL_BUS_CLK),
- FREQ_INFO( 600, 988, INTEL_BUS_CLK),
- FREQ_INFO( 0, 0, 1),
-};
-static freq_info PM_755A_90[] = {
- /* 90 nm 2.00GHz Pentium M, VID #A */
- FREQ_INFO(2000, 1340, INTEL_BUS_CLK),
- FREQ_INFO(1800, 1292, INTEL_BUS_CLK),
- FREQ_INFO(1600, 1244, INTEL_BUS_CLK),
- FREQ_INFO(1400, 1196, INTEL_BUS_CLK),
- FREQ_INFO(1200, 1148, INTEL_BUS_CLK),
- FREQ_INFO(1000, 1100, INTEL_BUS_CLK),
- FREQ_INFO( 800, 1052, INTEL_BUS_CLK),
- FREQ_INFO( 600, 988, INTEL_BUS_CLK),
- FREQ_INFO( 0, 0, 1),
-};
-static freq_info PM_755B_90[] = {
- /* 90 nm 2.00GHz Pentium M, VID #B */
- FREQ_INFO(2000, 1324, INTEL_BUS_CLK),
- FREQ_INFO(1800, 1276, INTEL_BUS_CLK),
- FREQ_INFO(1600, 1228, INTEL_BUS_CLK),
- FREQ_INFO(1400, 1180, INTEL_BUS_CLK),
- FREQ_INFO(1200, 1132, INTEL_BUS_CLK),
- FREQ_INFO(1000, 1084, INTEL_BUS_CLK),
- FREQ_INFO( 800, 1036, INTEL_BUS_CLK),
- FREQ_INFO( 600, 988, INTEL_BUS_CLK),
- FREQ_INFO( 0, 0, 1),
-};
-static freq_info PM_755C_90[] = {
- /* 90 nm 2.00GHz Pentium M, VID #C */
- FREQ_INFO(2000, 1308, INTEL_BUS_CLK),
- FREQ_INFO(1800, 1276, INTEL_BUS_CLK),
- FREQ_INFO(1600, 1228, INTEL_BUS_CLK),
- FREQ_INFO(1400, 1180, INTEL_BUS_CLK),
- FREQ_INFO(1200, 1132, INTEL_BUS_CLK),
- FREQ_INFO(1000, 1084, INTEL_BUS_CLK),
- FREQ_INFO( 800, 1036, INTEL_BUS_CLK),
- FREQ_INFO( 600, 988, INTEL_BUS_CLK),
- FREQ_INFO( 0, 0, 1),
-};
-static freq_info PM_755D_90[] = {
- /* 90 nm 2.00GHz Pentium M, VID #D */
- FREQ_INFO(2000, 1276, INTEL_BUS_CLK),
- FREQ_INFO(1800, 1244, INTEL_BUS_CLK),
- FREQ_INFO(1600, 1196, INTEL_BUS_CLK),
- FREQ_INFO(1400, 1164, INTEL_BUS_CLK),
- FREQ_INFO(1200, 1116, INTEL_BUS_CLK),
- FREQ_INFO(1000, 1084, INTEL_BUS_CLK),
- FREQ_INFO( 800, 1036, INTEL_BUS_CLK),
- FREQ_INFO( 600, 988, INTEL_BUS_CLK),
- FREQ_INFO( 0, 0, 1),
-};
-static freq_info PM_745A_90[] = {
- /* 90 nm 1.80GHz Pentium M, VID #A */
- FREQ_INFO(1800, 1340, INTEL_BUS_CLK),
- FREQ_INFO(1600, 1292, INTEL_BUS_CLK),
- FREQ_INFO(1400, 1228, INTEL_BUS_CLK),
- FREQ_INFO(1200, 1164, INTEL_BUS_CLK),
- FREQ_INFO(1000, 1116, INTEL_BUS_CLK),
- FREQ_INFO( 800, 1052, INTEL_BUS_CLK),
- FREQ_INFO( 600, 988, INTEL_BUS_CLK),
- FREQ_INFO( 0, 0, 1),
-};
-static freq_info PM_745B_90[] = {
- /* 90 nm 1.80GHz Pentium M, VID #B */
- FREQ_INFO(1800, 1324, INTEL_BUS_CLK),
- FREQ_INFO(1600, 1276, INTEL_BUS_CLK),
- FREQ_INFO(1400, 1212, INTEL_BUS_CLK),
- FREQ_INFO(1200, 1164, INTEL_BUS_CLK),
- FREQ_INFO(1000, 1116, INTEL_BUS_CLK),
- FREQ_INFO( 800, 1052, INTEL_BUS_CLK),
- FREQ_INFO( 600, 988, INTEL_BUS_CLK),
- FREQ_INFO( 0, 0, 1),
-};
-static freq_info PM_745C_90[] = {
- /* 90 nm 1.80GHz Pentium M, VID #C */
- FREQ_INFO(1800, 1308, INTEL_BUS_CLK),
- FREQ_INFO(1600, 1260, INTEL_BUS_CLK),
- FREQ_INFO(1400, 1212, INTEL_BUS_CLK),
- FREQ_INFO(1200, 1148, INTEL_BUS_CLK),
- FREQ_INFO(1000, 1100, INTEL_BUS_CLK),
- FREQ_INFO( 800, 1052, INTEL_BUS_CLK),
- FREQ_INFO( 600, 988, INTEL_BUS_CLK),
- FREQ_INFO( 0, 0, 1),
-};
-static freq_info PM_745D_90[] = {
- /* 90 nm 1.80GHz Pentium M, VID #D */
- FREQ_INFO(1800, 1276, INTEL_BUS_CLK),
- FREQ_INFO(1600, 1228, INTEL_BUS_CLK),
- FREQ_INFO(1400, 1180, INTEL_BUS_CLK),
- FREQ_INFO(1200, 1132, INTEL_BUS_CLK),
- FREQ_INFO(1000, 1084, INTEL_BUS_CLK),
- FREQ_INFO( 800, 1036, INTEL_BUS_CLK),
- FREQ_INFO( 600, 988, INTEL_BUS_CLK),
- FREQ_INFO( 0, 0, 1),
-};
-static freq_info PM_735A_90[] = {
- /* 90 nm 1.70GHz Pentium M, VID #A */
- FREQ_INFO(1700, 1340, INTEL_BUS_CLK),
- FREQ_INFO(1400, 1244, INTEL_BUS_CLK),
- FREQ_INFO(1200, 1180, INTEL_BUS_CLK),
- FREQ_INFO(1000, 1116, INTEL_BUS_CLK),
- FREQ_INFO( 800, 1052, INTEL_BUS_CLK),
- FREQ_INFO( 600, 988, INTEL_BUS_CLK),
- FREQ_INFO( 0, 0, 1),
-};
-static freq_info PM_735B_90[] = {
- /* 90 nm 1.70GHz Pentium M, VID #B */
- FREQ_INFO(1700, 1324, INTEL_BUS_CLK),
- FREQ_INFO(1400, 1244, INTEL_BUS_CLK),
- FREQ_INFO(1200, 1180, INTEL_BUS_CLK),
- FREQ_INFO(1000, 1116, INTEL_BUS_CLK),
- FREQ_INFO( 800, 1052, INTEL_BUS_CLK),
- FREQ_INFO( 600, 988, INTEL_BUS_CLK),
- FREQ_INFO( 0, 0, 1),
-};
-static freq_info PM_735C_90[] = {
- /* 90 nm 1.70GHz Pentium M, VID #C */
- FREQ_INFO(1700, 1308, INTEL_BUS_CLK),
- FREQ_INFO(1400, 1228, INTEL_BUS_CLK),
- FREQ_INFO(1200, 1164, INTEL_BUS_CLK),
- FREQ_INFO(1000, 1116, INTEL_BUS_CLK),
- FREQ_INFO( 800, 1052, INTEL_BUS_CLK),
- FREQ_INFO( 600, 988, INTEL_BUS_CLK),
- FREQ_INFO( 0, 0, 1),
-};
-static freq_info PM_735D_90[] = {
- /* 90 nm 1.70GHz Pentium M, VID #D */
- FREQ_INFO(1700, 1276, INTEL_BUS_CLK),
- FREQ_INFO(1400, 1212, INTEL_BUS_CLK),
- FREQ_INFO(1200, 1148, INTEL_BUS_CLK),
- FREQ_INFO(1000, 1100, INTEL_BUS_CLK),
- FREQ_INFO( 800, 1052, INTEL_BUS_CLK),
- FREQ_INFO( 600, 988, INTEL_BUS_CLK),
- FREQ_INFO( 0, 0, 1),
-};
-static freq_info PM_725A_90[] = {
- /* 90 nm 1.60GHz Pentium M, VID #A */
- FREQ_INFO(1600, 1340, INTEL_BUS_CLK),
- FREQ_INFO(1400, 1276, INTEL_BUS_CLK),
- FREQ_INFO(1200, 1212, INTEL_BUS_CLK),
- FREQ_INFO(1000, 1132, INTEL_BUS_CLK),
- FREQ_INFO( 800, 1068, INTEL_BUS_CLK),
- FREQ_INFO( 600, 988, INTEL_BUS_CLK),
- FREQ_INFO( 0, 0, 1),
-};
-static freq_info PM_725B_90[] = {
- /* 90 nm 1.60GHz Pentium M, VID #B */
- FREQ_INFO(1600, 1324, INTEL_BUS_CLK),
- FREQ_INFO(1400, 1260, INTEL_BUS_CLK),
- FREQ_INFO(1200, 1196, INTEL_BUS_CLK),
- FREQ_INFO(1000, 1132, INTEL_BUS_CLK),
- FREQ_INFO( 800, 1068, INTEL_BUS_CLK),
- FREQ_INFO( 600, 988, INTEL_BUS_CLK),
- FREQ_INFO( 0, 0, 1),
-};
-static freq_info PM_725C_90[] = {
- /* 90 nm 1.60GHz Pentium M, VID #C */
- FREQ_INFO(1600, 1308, INTEL_BUS_CLK),
- FREQ_INFO(1400, 1244, INTEL_BUS_CLK),
- FREQ_INFO(1200, 1180, INTEL_BUS_CLK),
- FREQ_INFO(1000, 1116, INTEL_BUS_CLK),
- FREQ_INFO( 800, 1052, INTEL_BUS_CLK),
- FREQ_INFO( 600, 988, INTEL_BUS_CLK),
- FREQ_INFO( 0, 0, 1),
-};
-static freq_info PM_725D_90[] = {
- /* 90 nm 1.60GHz Pentium M, VID #D */
- FREQ_INFO(1600, 1276, INTEL_BUS_CLK),
- FREQ_INFO(1400, 1228, INTEL_BUS_CLK),
- FREQ_INFO(1200, 1164, INTEL_BUS_CLK),
- FREQ_INFO(1000, 1116, INTEL_BUS_CLK),
- FREQ_INFO( 800, 1052, INTEL_BUS_CLK),
- FREQ_INFO( 600, 988, INTEL_BUS_CLK),
- FREQ_INFO( 0, 0, 1),
-};
-static freq_info PM_715A_90[] = {
- /* 90 nm 1.50GHz Pentium M, VID #A */
- FREQ_INFO(1500, 1340, INTEL_BUS_CLK),
- FREQ_INFO(1200, 1228, INTEL_BUS_CLK),
- FREQ_INFO(1000, 1148, INTEL_BUS_CLK),
- FREQ_INFO( 800, 1068, INTEL_BUS_CLK),
- FREQ_INFO( 600, 988, INTEL_BUS_CLK),
- FREQ_INFO( 0, 0, 1),
-};
-static freq_info PM_715B_90[] = {
- /* 90 nm 1.50GHz Pentium M, VID #B */
- FREQ_INFO(1500, 1324, INTEL_BUS_CLK),
- FREQ_INFO(1200, 1212, INTEL_BUS_CLK),
- FREQ_INFO(1000, 1148, INTEL_BUS_CLK),
- FREQ_INFO( 800, 1068, INTEL_BUS_CLK),
- FREQ_INFO( 600, 988, INTEL_BUS_CLK),
- FREQ_INFO( 0, 0, 1),
-};
-static freq_info PM_715C_90[] = {
- /* 90 nm 1.50GHz Pentium M, VID #C */
- FREQ_INFO(1500, 1308, INTEL_BUS_CLK),
- FREQ_INFO(1200, 1212, INTEL_BUS_CLK),
- FREQ_INFO(1000, 1132, INTEL_BUS_CLK),
- FREQ_INFO( 800, 1068, INTEL_BUS_CLK),
- FREQ_INFO( 600, 988, INTEL_BUS_CLK),
- FREQ_INFO( 0, 0, 1),
-};
-static freq_info PM_715D_90[] = {
- /* 90 nm 1.50GHz Pentium M, VID #D */
- FREQ_INFO(1500, 1276, INTEL_BUS_CLK),
- FREQ_INFO(1200, 1180, INTEL_BUS_CLK),
- FREQ_INFO(1000, 1116, INTEL_BUS_CLK),
- FREQ_INFO( 800, 1052, INTEL_BUS_CLK),
- FREQ_INFO( 600, 988, INTEL_BUS_CLK),
- FREQ_INFO( 0, 0, 1),
-};
-static freq_info PM_778_90[] = {
- /* 90 nm 1.60GHz Low Voltage Pentium M */
- FREQ_INFO(1600, 1116, INTEL_BUS_CLK),
- FREQ_INFO(1500, 1116, INTEL_BUS_CLK),
- FREQ_INFO(1400, 1100, INTEL_BUS_CLK),
- FREQ_INFO(1300, 1084, INTEL_BUS_CLK),
- FREQ_INFO(1200, 1068, INTEL_BUS_CLK),
- FREQ_INFO(1100, 1052, INTEL_BUS_CLK),
- FREQ_INFO(1000, 1052, INTEL_BUS_CLK),
- FREQ_INFO( 900, 1036, INTEL_BUS_CLK),
- FREQ_INFO( 800, 1020, INTEL_BUS_CLK),
- FREQ_INFO( 600, 988, INTEL_BUS_CLK),
- FREQ_INFO( 0, 0, 1),
-};
-static freq_info PM_758_90[] = {
- /* 90 nm 1.50GHz Low Voltage Pentium M */
- FREQ_INFO(1500, 1116, INTEL_BUS_CLK),
- FREQ_INFO(1400, 1116, INTEL_BUS_CLK),
- FREQ_INFO(1300, 1100, INTEL_BUS_CLK),
- FREQ_INFO(1200, 1084, INTEL_BUS_CLK),
- FREQ_INFO(1100, 1068, INTEL_BUS_CLK),
- FREQ_INFO(1000, 1052, INTEL_BUS_CLK),
- FREQ_INFO( 900, 1036, INTEL_BUS_CLK),
- FREQ_INFO( 800, 1020, INTEL_BUS_CLK),
- FREQ_INFO( 600, 988, INTEL_BUS_CLK),
- FREQ_INFO( 0, 0, 1),
-};
-static freq_info PM_738_90[] = {
- /* 90 nm 1.40GHz Low Voltage Pentium M */
- FREQ_INFO(1400, 1116, INTEL_BUS_CLK),
- FREQ_INFO(1300, 1116, INTEL_BUS_CLK),
- FREQ_INFO(1200, 1100, INTEL_BUS_CLK),
- FREQ_INFO(1100, 1068, INTEL_BUS_CLK),
- FREQ_INFO(1000, 1052, INTEL_BUS_CLK),
- FREQ_INFO( 900, 1036, INTEL_BUS_CLK),
- FREQ_INFO( 800, 1020, INTEL_BUS_CLK),
- FREQ_INFO( 600, 988, INTEL_BUS_CLK),
- FREQ_INFO( 0, 0, 1),
-};
-static freq_info PM_773G_90[] = {
- /* 90 nm 1.30GHz Ultra Low Voltage Pentium M, VID #G */
- FREQ_INFO(1300, 956, INTEL_BUS_CLK),
- FREQ_INFO(1200, 940, INTEL_BUS_CLK),
- FREQ_INFO(1100, 924, INTEL_BUS_CLK),
- FREQ_INFO(1000, 908, INTEL_BUS_CLK),
- FREQ_INFO( 900, 876, INTEL_BUS_CLK),
- FREQ_INFO( 800, 860, INTEL_BUS_CLK),
- FREQ_INFO( 600, 812, INTEL_BUS_CLK),
-};
-static freq_info PM_773H_90[] = {
- /* 90 nm 1.30GHz Ultra Low Voltage Pentium M, VID #H */
- FREQ_INFO(1300, 940, INTEL_BUS_CLK),
- FREQ_INFO(1200, 924, INTEL_BUS_CLK),
- FREQ_INFO(1100, 908, INTEL_BUS_CLK),
- FREQ_INFO(1000, 892, INTEL_BUS_CLK),
- FREQ_INFO( 900, 876, INTEL_BUS_CLK),
- FREQ_INFO( 800, 860, INTEL_BUS_CLK),
- FREQ_INFO( 600, 812, INTEL_BUS_CLK),
-};
-static freq_info PM_773I_90[] = {
- /* 90 nm 1.30GHz Ultra Low Voltage Pentium M, VID #I */
- FREQ_INFO(1300, 924, INTEL_BUS_CLK),
- FREQ_INFO(1200, 908, INTEL_BUS_CLK),
- FREQ_INFO(1100, 892, INTEL_BUS_CLK),
- FREQ_INFO(1000, 876, INTEL_BUS_CLK),
- FREQ_INFO( 900, 860, INTEL_BUS_CLK),
- FREQ_INFO( 800, 844, INTEL_BUS_CLK),
- FREQ_INFO( 600, 812, INTEL_BUS_CLK),
-};
-static freq_info PM_773J_90[] = {
- /* 90 nm 1.30GHz Ultra Low Voltage Pentium M, VID #J */
- FREQ_INFO(1300, 908, INTEL_BUS_CLK),
- FREQ_INFO(1200, 908, INTEL_BUS_CLK),
- FREQ_INFO(1100, 892, INTEL_BUS_CLK),
- FREQ_INFO(1000, 876, INTEL_BUS_CLK),
- FREQ_INFO( 900, 860, INTEL_BUS_CLK),
- FREQ_INFO( 800, 844, INTEL_BUS_CLK),
- FREQ_INFO( 600, 812, INTEL_BUS_CLK),
-};
-static freq_info PM_773K_90[] = {
- /* 90 nm 1.30GHz Ultra Low Voltage Pentium M, VID #K */
- FREQ_INFO(1300, 892, INTEL_BUS_CLK),
- FREQ_INFO(1200, 892, INTEL_BUS_CLK),
- FREQ_INFO(1100, 876, INTEL_BUS_CLK),
- FREQ_INFO(1000, 860, INTEL_BUS_CLK),
- FREQ_INFO( 900, 860, INTEL_BUS_CLK),
- FREQ_INFO( 800, 844, INTEL_BUS_CLK),
- FREQ_INFO( 600, 812, INTEL_BUS_CLK),
-};
-static freq_info PM_773L_90[] = {
- /* 90 nm 1.30GHz Ultra Low Voltage Pentium M, VID #L */
- FREQ_INFO(1300, 876, INTEL_BUS_CLK),
- FREQ_INFO(1200, 876, INTEL_BUS_CLK),
- FREQ_INFO(1100, 860, INTEL_BUS_CLK),
- FREQ_INFO(1000, 860, INTEL_BUS_CLK),
- FREQ_INFO( 900, 844, INTEL_BUS_CLK),
- FREQ_INFO( 800, 844, INTEL_BUS_CLK),
- FREQ_INFO( 600, 812, INTEL_BUS_CLK),
-};
-static freq_info PM_753G_90[] = {
- /* 90 nm 1.20GHz Ultra Low Voltage Pentium M, VID #G */
- FREQ_INFO(1200, 956, INTEL_BUS_CLK),
- FREQ_INFO(1100, 940, INTEL_BUS_CLK),
- FREQ_INFO(1000, 908, INTEL_BUS_CLK),
- FREQ_INFO( 900, 892, INTEL_BUS_CLK),
- FREQ_INFO( 800, 860, INTEL_BUS_CLK),
- FREQ_INFO( 600, 812, INTEL_BUS_CLK),
-};
-static freq_info PM_753H_90[] = {
- /* 90 nm 1.20GHz Ultra Low Voltage Pentium M, VID #H */
- FREQ_INFO(1200, 940, INTEL_BUS_CLK),
- FREQ_INFO(1100, 924, INTEL_BUS_CLK),
- FREQ_INFO(1000, 908, INTEL_BUS_CLK),
- FREQ_INFO( 900, 876, INTEL_BUS_CLK),
- FREQ_INFO( 800, 860, INTEL_BUS_CLK),
- FREQ_INFO( 600, 812, INTEL_BUS_CLK),
-};
-static freq_info PM_753I_90[] = {
- /* 90 nm 1.20GHz Ultra Low Voltage Pentium M, VID #I */
- FREQ_INFO(1200, 924, INTEL_BUS_CLK),
- FREQ_INFO(1100, 908, INTEL_BUS_CLK),
- FREQ_INFO(1000, 892, INTEL_BUS_CLK),
- FREQ_INFO( 900, 876, INTEL_BUS_CLK),
- FREQ_INFO( 800, 860, INTEL_BUS_CLK),
- FREQ_INFO( 600, 812, INTEL_BUS_CLK),
-};
-static freq_info PM_753J_90[] = {
- /* 90 nm 1.20GHz Ultra Low Voltage Pentium M, VID #J */
- FREQ_INFO(1200, 908, INTEL_BUS_CLK),
- FREQ_INFO(1100, 892, INTEL_BUS_CLK),
- FREQ_INFO(1000, 876, INTEL_BUS_CLK),
- FREQ_INFO( 900, 860, INTEL_BUS_CLK),
- FREQ_INFO( 800, 844, INTEL_BUS_CLK),
- FREQ_INFO( 600, 812, INTEL_BUS_CLK),
-};
-static freq_info PM_753K_90[] = {
- /* 90 nm 1.20GHz Ultra Low Voltage Pentium M, VID #K */
- FREQ_INFO(1200, 892, INTEL_BUS_CLK),
- FREQ_INFO(1100, 892, INTEL_BUS_CLK),
- FREQ_INFO(1000, 876, INTEL_BUS_CLK),
- FREQ_INFO( 900, 860, INTEL_BUS_CLK),
- FREQ_INFO( 800, 844, INTEL_BUS_CLK),
- FREQ_INFO( 600, 812, INTEL_BUS_CLK),
-};
-static freq_info PM_753L_90[] = {
- /* 90 nm 1.20GHz Ultra Low Voltage Pentium M, VID #L */
- FREQ_INFO(1200, 876, INTEL_BUS_CLK),
- FREQ_INFO(1100, 876, INTEL_BUS_CLK),
- FREQ_INFO(1000, 860, INTEL_BUS_CLK),
- FREQ_INFO( 900, 844, INTEL_BUS_CLK),
- FREQ_INFO( 800, 844, INTEL_BUS_CLK),
- FREQ_INFO( 600, 812, INTEL_BUS_CLK),
-};
-
-static freq_info PM_733JG_90[] = {
- /* 90 nm 1.10GHz Ultra Low Voltage Pentium M, VID #G */
- FREQ_INFO(1100, 956, INTEL_BUS_CLK),
- FREQ_INFO(1000, 940, INTEL_BUS_CLK),
- FREQ_INFO( 900, 908, INTEL_BUS_CLK),
- FREQ_INFO( 800, 876, INTEL_BUS_CLK),
- FREQ_INFO( 600, 812, INTEL_BUS_CLK),
-};
-static freq_info PM_733JH_90[] = {
- /* 90 nm 1.10GHz Ultra Low Voltage Pentium M, VID #H */
- FREQ_INFO(1100, 940, INTEL_BUS_CLK),
- FREQ_INFO(1000, 924, INTEL_BUS_CLK),
- FREQ_INFO( 900, 892, INTEL_BUS_CLK),
- FREQ_INFO( 800, 876, INTEL_BUS_CLK),
- FREQ_INFO( 600, 812, INTEL_BUS_CLK),
-};
-static freq_info PM_733JI_90[] = {
- /* 90 nm 1.10GHz Ultra Low Voltage Pentium M, VID #I */
- FREQ_INFO(1100, 924, INTEL_BUS_CLK),
- FREQ_INFO(1000, 908, INTEL_BUS_CLK),
- FREQ_INFO( 900, 892, INTEL_BUS_CLK),
- FREQ_INFO( 800, 860, INTEL_BUS_CLK),
- FREQ_INFO( 600, 812, INTEL_BUS_CLK),
-};
-static freq_info PM_733JJ_90[] = {
- /* 90 nm 1.10GHz Ultra Low Voltage Pentium M, VID #J */
- FREQ_INFO(1100, 908, INTEL_BUS_CLK),
- FREQ_INFO(1000, 892, INTEL_BUS_CLK),
- FREQ_INFO( 900, 876, INTEL_BUS_CLK),
- FREQ_INFO( 800, 860, INTEL_BUS_CLK),
- FREQ_INFO( 600, 812, INTEL_BUS_CLK),
-};
-static freq_info PM_733JK_90[] = {
- /* 90 nm 1.10GHz Ultra Low Voltage Pentium M, VID #K */
- FREQ_INFO(1100, 892, INTEL_BUS_CLK),
- FREQ_INFO(1000, 876, INTEL_BUS_CLK),
- FREQ_INFO( 900, 860, INTEL_BUS_CLK),
- FREQ_INFO( 800, 844, INTEL_BUS_CLK),
- FREQ_INFO( 600, 812, INTEL_BUS_CLK),
-};
-static freq_info PM_733JL_90[] = {
- /* 90 nm 1.10GHz Ultra Low Voltage Pentium M, VID #L */
- FREQ_INFO(1100, 876, INTEL_BUS_CLK),
- FREQ_INFO(1000, 876, INTEL_BUS_CLK),
- FREQ_INFO( 900, 860, INTEL_BUS_CLK),
- FREQ_INFO( 800, 844, INTEL_BUS_CLK),
- FREQ_INFO( 600, 812, INTEL_BUS_CLK),
-};
-static freq_info PM_733_90[] = {
- /* 90 nm 1.10GHz Ultra Low Voltage Pentium M */
- FREQ_INFO(1100, 940, INTEL_BUS_CLK),
- FREQ_INFO(1000, 924, INTEL_BUS_CLK),
- FREQ_INFO( 900, 892, INTEL_BUS_CLK),
- FREQ_INFO( 800, 876, INTEL_BUS_CLK),
- FREQ_INFO( 600, 812, INTEL_BUS_CLK),
- FREQ_INFO( 0, 0, 1),
-};
-static freq_info PM_723_90[] = {
- /* 90 nm 1.00GHz Ultra Low Voltage Pentium M */
- FREQ_INFO(1000, 940, INTEL_BUS_CLK),
- FREQ_INFO( 900, 908, INTEL_BUS_CLK),
- FREQ_INFO( 800, 876, INTEL_BUS_CLK),
- FREQ_INFO( 600, 812, INTEL_BUS_CLK),
- FREQ_INFO( 0, 0, 1),
-};
-
-/*
- * VIA C7-M 500 MHz FSB, 400 MHz FSB, and ULV variants.
- * Data from the "VIA C7-M Processor BIOS Writer's Guide (v2.17)" datasheet.
- */
-static freq_info C7M_795[] = {
- /* 2.00GHz Centaur C7-M 533 Mhz FSB */
- FREQ_INFO_PWR(2000, 1148, 133, 20000),
- FREQ_INFO_PWR(1867, 1132, 133, 18000),
- FREQ_INFO_PWR(1600, 1100, 133, 15000),
- FREQ_INFO_PWR(1467, 1052, 133, 13000),
- FREQ_INFO_PWR(1200, 1004, 133, 10000),
- FREQ_INFO_PWR( 800, 844, 133, 7000),
- FREQ_INFO_PWR( 667, 844, 133, 6000),
- FREQ_INFO_PWR( 533, 844, 133, 5000),
- FREQ_INFO(0, 0, 1),
-};
-static freq_info C7M_785[] = {
- /* 1.80GHz Centaur C7-M 533 Mhz FSB */
- FREQ_INFO_PWR(1867, 1148, 133, 18000),
- FREQ_INFO_PWR(1600, 1100, 133, 15000),
- FREQ_INFO_PWR(1467, 1052, 133, 13000),
- FREQ_INFO_PWR(1200, 1004, 133, 10000),
- FREQ_INFO_PWR( 800, 844, 133, 7000),
- FREQ_INFO_PWR( 667, 844, 133, 6000),
- FREQ_INFO_PWR( 533, 844, 133, 5000),
- FREQ_INFO(0, 0, 1),
-};
-static freq_info C7M_765[] = {
- /* 1.60GHz Centaur C7-M 533 Mhz FSB */
- FREQ_INFO_PWR(1600, 1084, 133, 15000),
- FREQ_INFO_PWR(1467, 1052, 133, 13000),
- FREQ_INFO_PWR(1200, 1004, 133, 10000),
- FREQ_INFO_PWR( 800, 844, 133, 7000),
- FREQ_INFO_PWR( 667, 844, 133, 6000),
- FREQ_INFO_PWR( 533, 844, 133, 5000),
- FREQ_INFO(0, 0, 1),
-};
-
-static freq_info C7M_794[] = {
- /* 2.00GHz Centaur C7-M 400 Mhz FSB */
- FREQ_INFO_PWR(2000, 1148, 100, 20000),
- FREQ_INFO_PWR(1800, 1132, 100, 18000),
- FREQ_INFO_PWR(1600, 1100, 100, 15000),
- FREQ_INFO_PWR(1400, 1052, 100, 13000),
- FREQ_INFO_PWR(1000, 1004, 100, 10000),
- FREQ_INFO_PWR( 800, 844, 100, 7000),
- FREQ_INFO_PWR( 600, 844, 100, 6000),
- FREQ_INFO_PWR( 400, 844, 100, 5000),
- FREQ_INFO(0, 0, 1),
-};
-static freq_info C7M_784[] = {
- /* 1.80GHz Centaur C7-M 400 Mhz FSB */
- FREQ_INFO_PWR(1800, 1148, 100, 18000),
- FREQ_INFO_PWR(1600, 1100, 100, 15000),
- FREQ_INFO_PWR(1400, 1052, 100, 13000),
- FREQ_INFO_PWR(1000, 1004, 100, 10000),
- FREQ_INFO_PWR( 800, 844, 100, 7000),
- FREQ_INFO_PWR( 600, 844, 100, 6000),
- FREQ_INFO_PWR( 400, 844, 100, 5000),
- FREQ_INFO(0, 0, 1),
-};
-static freq_info C7M_764[] = {
- /* 1.60GHz Centaur C7-M 400 Mhz FSB */
- FREQ_INFO_PWR(1600, 1084, 100, 15000),
- FREQ_INFO_PWR(1400, 1052, 100, 13000),
- FREQ_INFO_PWR(1000, 1004, 100, 10000),
- FREQ_INFO_PWR( 800, 844, 100, 7000),
- FREQ_INFO_PWR( 600, 844, 100, 6000),
- FREQ_INFO_PWR( 400, 844, 100, 5000),
- FREQ_INFO(0, 0, 1),
-};
-static freq_info C7M_754[] = {
- /* 1.50GHz Centaur C7-M 400 Mhz FSB */
- FREQ_INFO_PWR(1500, 1004, 100, 12000),
- FREQ_INFO_PWR(1400, 988, 100, 11000),
- FREQ_INFO_PWR(1000, 940, 100, 9000),
- FREQ_INFO_PWR( 800, 844, 100, 7000),
- FREQ_INFO_PWR( 600, 844, 100, 6000),
- FREQ_INFO_PWR( 400, 844, 100, 5000),
- FREQ_INFO(0, 0, 1),
-};
-static freq_info C7M_771[] = {
- /* 1.20GHz Centaur C7-M 400 Mhz FSB */
- FREQ_INFO_PWR(1200, 860, 100, 7000),
- FREQ_INFO_PWR(1000, 860, 100, 6000),
- FREQ_INFO_PWR( 800, 844, 100, 5500),
- FREQ_INFO_PWR( 600, 844, 100, 5000),
- FREQ_INFO_PWR( 400, 844, 100, 4000),
- FREQ_INFO(0, 0, 1),
-};
-
-static freq_info C7M_775_ULV[] = {
- /* 1.50GHz Centaur C7-M ULV */
- FREQ_INFO_PWR(1500, 956, 100, 7500),
- FREQ_INFO_PWR(1400, 940, 100, 6000),
- FREQ_INFO_PWR(1000, 860, 100, 5000),
- FREQ_INFO_PWR( 800, 828, 100, 2800),
- FREQ_INFO_PWR( 600, 796, 100, 2500),
- FREQ_INFO_PWR( 400, 796, 100, 2000),
- FREQ_INFO(0, 0, 1),
-};
-static freq_info C7M_772_ULV[] = {
- /* 1.20GHz Centaur C7-M ULV */
- FREQ_INFO_PWR(1200, 844, 100, 5000),
- FREQ_INFO_PWR(1000, 844, 100, 4000),
- FREQ_INFO_PWR( 800, 828, 100, 2800),
- FREQ_INFO_PWR( 600, 796, 100, 2500),
- FREQ_INFO_PWR( 400, 796, 100, 2000),
- FREQ_INFO(0, 0, 1),
-};
-static freq_info C7M_779_ULV[] = {
- /* 1.00GHz Centaur C7-M ULV */
- FREQ_INFO_PWR(1000, 796, 100, 3500),
- FREQ_INFO_PWR( 800, 796, 100, 2800),
- FREQ_INFO_PWR( 600, 796, 100, 2500),
- FREQ_INFO_PWR( 400, 796, 100, 2000),
- FREQ_INFO(0, 0, 1),
-};
-static freq_info C7M_770_ULV[] = {
- /* 1.00GHz Centaur C7-M ULV */
- FREQ_INFO_PWR(1000, 844, 100, 5000),
- FREQ_INFO_PWR( 800, 796, 100, 2800),
- FREQ_INFO_PWR( 600, 796, 100, 2500),
- FREQ_INFO_PWR( 400, 796, 100, 2000),
- FREQ_INFO(0, 0, 1),
-};
-
-static ss_cpu_info ESTprocs[] = {
- INTEL(PM17_130, 1700, 1484, 600, 956, INTEL_BUS_CLK),
- INTEL(PM16_130, 1600, 1484, 600, 956, INTEL_BUS_CLK),
- INTEL(PM15_130, 1500, 1484, 600, 956, INTEL_BUS_CLK),
- INTEL(PM14_130, 1400, 1484, 600, 956, INTEL_BUS_CLK),
- INTEL(PM13_130, 1300, 1388, 600, 956, INTEL_BUS_CLK),
- INTEL(PM13_LV_130, 1300, 1180, 600, 956, INTEL_BUS_CLK),
- INTEL(PM12_LV_130, 1200, 1180, 600, 956, INTEL_BUS_CLK),
- INTEL(PM11_LV_130, 1100, 1180, 600, 956, INTEL_BUS_CLK),
- INTEL(PM11_ULV_130, 1100, 1004, 600, 844, INTEL_BUS_CLK),
- INTEL(PM10_ULV_130, 1000, 1004, 600, 844, INTEL_BUS_CLK),
- INTEL(PM_765A_90, 2100, 1340, 600, 988, INTEL_BUS_CLK),
- INTEL(PM_765B_90, 2100, 1324, 600, 988, INTEL_BUS_CLK),
- INTEL(PM_765C_90, 2100, 1308, 600, 988, INTEL_BUS_CLK),
- INTEL(PM_765E_90, 2100, 1356, 600, 988, INTEL_BUS_CLK),
- INTEL(PM_755A_90, 2000, 1340, 600, 988, INTEL_BUS_CLK),
- INTEL(PM_755B_90, 2000, 1324, 600, 988, INTEL_BUS_CLK),
- INTEL(PM_755C_90, 2000, 1308, 600, 988, INTEL_BUS_CLK),
- INTEL(PM_755D_90, 2000, 1276, 600, 988, INTEL_BUS_CLK),
- INTEL(PM_745A_90, 1800, 1340, 600, 988, INTEL_BUS_CLK),
- INTEL(PM_745B_90, 1800, 1324, 600, 988, INTEL_BUS_CLK),
- INTEL(PM_745C_90, 1800, 1308, 600, 988, INTEL_BUS_CLK),
- INTEL(PM_745D_90, 1800, 1276, 600, 988, INTEL_BUS_CLK),
- INTEL(PM_735A_90, 1700, 1340, 600, 988, INTEL_BUS_CLK),
- INTEL(PM_735B_90, 1700, 1324, 600, 988, INTEL_BUS_CLK),
- INTEL(PM_735C_90, 1700, 1308, 600, 988, INTEL_BUS_CLK),
- INTEL(PM_735D_90, 1700, 1276, 600, 988, INTEL_BUS_CLK),
- INTEL(PM_725A_90, 1600, 1340, 600, 988, INTEL_BUS_CLK),
- INTEL(PM_725B_90, 1600, 1324, 600, 988, INTEL_BUS_CLK),
- INTEL(PM_725C_90, 1600, 1308, 600, 988, INTEL_BUS_CLK),
- INTEL(PM_725D_90, 1600, 1276, 600, 988, INTEL_BUS_CLK),
- INTEL(PM_715A_90, 1500, 1340, 600, 988, INTEL_BUS_CLK),
- INTEL(PM_715B_90, 1500, 1324, 600, 988, INTEL_BUS_CLK),
- INTEL(PM_715C_90, 1500, 1308, 600, 988, INTEL_BUS_CLK),
- INTEL(PM_715D_90, 1500, 1276, 600, 988, INTEL_BUS_CLK),
- INTEL(PM_778_90, 1600, 1116, 600, 988, INTEL_BUS_CLK),
- INTEL(PM_758_90, 1500, 1116, 600, 988, INTEL_BUS_CLK),
- INTEL(PM_738_90, 1400, 1116, 600, 988, INTEL_BUS_CLK),
- INTEL(PM_773G_90, 1300, 956, 600, 812, INTEL_BUS_CLK),
- INTEL(PM_773H_90, 1300, 940, 600, 812, INTEL_BUS_CLK),
- INTEL(PM_773I_90, 1300, 924, 600, 812, INTEL_BUS_CLK),
- INTEL(PM_773J_90, 1300, 908, 600, 812, INTEL_BUS_CLK),
- INTEL(PM_773K_90, 1300, 892, 600, 812, INTEL_BUS_CLK),
- INTEL(PM_773L_90, 1300, 876, 600, 812, INTEL_BUS_CLK),
- INTEL(PM_753G_90, 1200, 956, 600, 812, INTEL_BUS_CLK),
- INTEL(PM_753H_90, 1200, 940, 600, 812, INTEL_BUS_CLK),
- INTEL(PM_753I_90, 1200, 924, 600, 812, INTEL_BUS_CLK),
- INTEL(PM_753J_90, 1200, 908, 600, 812, INTEL_BUS_CLK),
- INTEL(PM_753K_90, 1200, 892, 600, 812, INTEL_BUS_CLK),
- INTEL(PM_753L_90, 1200, 876, 600, 812, INTEL_BUS_CLK),
- INTEL(PM_733JG_90, 1100, 956, 600, 812, INTEL_BUS_CLK),
- INTEL(PM_733JH_90, 1100, 940, 600, 812, INTEL_BUS_CLK),
- INTEL(PM_733JI_90, 1100, 924, 600, 812, INTEL_BUS_CLK),
- INTEL(PM_733JJ_90, 1100, 908, 600, 812, INTEL_BUS_CLK),
- INTEL(PM_733JK_90, 1100, 892, 600, 812, INTEL_BUS_CLK),
- INTEL(PM_733JL_90, 1100, 876, 600, 812, INTEL_BUS_CLK),
- INTEL(PM_733_90, 1100, 940, 600, 812, INTEL_BUS_CLK),
- INTEL(PM_723_90, 1000, 940, 600, 812, INTEL_BUS_CLK),
-
- CENTAUR(C7M_795, 2000, 1148, 533, 844, 133),
- CENTAUR(C7M_794, 2000, 1148, 400, 844, 100),
- CENTAUR(C7M_785, 1867, 1148, 533, 844, 133),
- CENTAUR(C7M_784, 1800, 1148, 400, 844, 100),
- CENTAUR(C7M_765, 1600, 1084, 533, 844, 133),
- CENTAUR(C7M_764, 1600, 1084, 400, 844, 100),
- CENTAUR(C7M_754, 1500, 1004, 400, 844, 100),
- CENTAUR(C7M_775_ULV, 1500, 956, 400, 796, 100),
- CENTAUR(C7M_771, 1200, 860, 400, 844, 100),
- CENTAUR(C7M_772_ULV, 1200, 844, 400, 796, 100),
- CENTAUR(C7M_779_ULV, 1000, 796, 400, 796, 100),
- CENTAUR(C7M_770_ULV, 1000, 844, 400, 796, 100),
- { 0, 0, NULL },
-};
-
-#endif
-
############################################################################
Commit: 208f76e578adb0bd495e22ed84d35c67c0ff86de
Author: Pawel Dziepak <pdziepak@xxxxxxxxxxx>
Date: Fri Nov 22 04:24:44 2013 UTC
preferences: Remove CPUFrequency
We can't reliably set contemporary processors to an arbitrary frequency.
There are dependencies between cores and thechnologies like Turbo Boost
which may make actual frequency significantly different than the requested.
Moreover, it is the scheduler job to decide how much CPU performance is
needed and user shouldn't interfere with that.
----------------------------------------------------------------------------
diff --git a/build/jam/images/HaikuImage b/build/jam/images/HaikuImage
index df8b0e9..83d650b 100644
--- a/build/jam/images/HaikuImage
+++ b/build/jam/images/HaikuImage
@@ -53,7 +53,7 @@ SYSTEM_APPS = [ FFilterByBuildFeatures
StyledEdit Terminal TextSearch TV WebWatch Workspaces
] ;
SYSTEM_PREFERENCES = [ FFilterByBuildFeatures
- Appearance Backgrounds CPUFrequency DataTranslations
+ Appearance Backgrounds DataTranslations
<preference>Deskbar E-mail FileTypes Keyboard Keymap Locale Media
Mouse Network Notifications Printers Screen ScreenSaver
Shortcuts Sounds Time Touchpad <preference>Tracker VirtualMemory
diff --git a/build/jam/images/HaikuImageBootstrap
b/build/jam/images/HaikuImageBootstrap
index ebf7d14..15a5903 100644
--- a/build/jam/images/HaikuImageBootstrap
+++ b/build/jam/images/HaikuImageBootstrap
@@ -53,7 +53,7 @@ SYSTEM_APPS = [ FFilterByBuildFeatures
StyledEdit Terminal TextSearch Workspaces
] ;
SYSTEM_PREFERENCES = [ FFilterByBuildFeatures
- Appearance Backgrounds CPUFrequency
+ Appearance Backgrounds
<preference>Deskbar FileTypes Keyboard Keymap Locale
Mouse Network Notifications Screen ScreenSaver
Shortcuts Time Touchpad <preference>Tracker VirtualMemory
diff --git a/data/catalogs/preferences/cpufrequency/be.catkeys
b/data/catalogs/preferences/cpufrequency/be.catkeys
deleted file mode 100644
index 3c09cb3..0000000
--- a/data/catalogs/preferences/cpufrequency/be.catkeys
+++ /dev/null
@@ -1,21 +0,0 @@
-1 belarusian x-vnd.Haiku-CPUFrequencyPref 1007318924
-Ok Status view Так
-CPU frequency status view CPU Frequency View Паказнік стану
частаты працэсара
-OK Status view ОК
-Set state Status view Пазначыць стан
-Defaults Pref Window Прадвызначаныя
-Install replicant into Deskbar CPU Frequency View Усталяваць
рэплікант у Deskbar
-Quit Status view Выйсце
-High performance Status view Вышэйшая прадукцыйнасць
-Stepping policy CPU Frequency View Палітыка пакрокавай
рэгуляцыі
-Dynamic performance Status view Дынамічная прадукцыйнасць
-Step up by CPU usage Color Step View Актывізаваць у залежнасьці ад
занятасці працэсара
-Dynamic stepping CPU Frequency View Дынамічны рэжым
пакрокавай рэгуляцыі
-Stepping policy: CPU Frequency View Палітыка пакрокавай
рэгуляцыі:
-Integration time [ms]: CPU Frequency View Квант
інтэграцыі [ms]:
-Open Speedstep preferences… Status view Паказаць наладкі
Speedstep…
-Revert Pref Window Вярнуць
-Low energy Status view Экономия энергии
-Launching the CPU frequency preflet failed.\n\nError: Status view
Немагчыма запусціць канфігурацыйную праграму!\n\nКод памылкі:
-CPUFrequency\n\twritten by Clemens Zeidler\n\tCopyright 2009, Haiku, Inc.\n
Status view CPU Frequency\n\tбыў распрацаваны Clemens
Zeidler\n\tCopyright 2009, Haiku, Inc.\n
-CPUFrequency System name Частата Працэсара
diff --git a/data/catalogs/preferences/cpufrequency/bg.catkeys
b/data/catalogs/preferences/cpufrequency/bg.catkeys
deleted file mode 100644
index 763d7c4..0000000
--- a/data/catalogs/preferences/cpufrequency/bg.catkeys
+++ /dev/null
@@ -1,18 +0,0 @@
-1 bulgarian x-vnd.Haiku-CPUFrequencyPref 1018039204
-Ok Status view Ок
-CPU frequency status view CPU Frequency View Статус на CPU
честотата
-Set state Status view Изберете състояние
-Defaults Pref Window По подразбиране
-Install replicant into Deskbar CPU Frequency View Инсталирай
репликант в Deskbar
-High performance Status view Висока производителност
-Stepping policy CPU Frequency View Постъпково изменение на
частотата на CPU
-Dynamic performance Status view Динамична производителност
-Step up by CPU usage Color Step View Стъпка на производителност на
CPU:
-Dynamic stepping CPU Frequency View Динамично изменение
-Stepping policy: CPU Frequency View Постъпково изменение на
частотата на CPU:
-Integration time [ms]: CPU Frequency View Време на
интеграция [мс]:
-Open Speedstep preferences… Status view Отвори постъпковите
настройки
-Revert Pref Window Върни
-Low energy Status view Икономия на енергия
-Launching the CPU frequency preflet failed.\n\nError: Status view
Старта на CPU Frequency не се състоя.\n\nГрешка:
-CPUFrequency\n\twritten by Clemens Zeidler\n\tCopyright 2009, Haiku, Inc.\n
Status view CPUFrequency\n\tе разработен от Clemens
Zeidler\n\tCopyright 2009, Haiku, Inc.\n
diff --git a/data/catalogs/preferences/cpufrequency/cs.catkeys
b/data/catalogs/preferences/cpufrequency/cs.catkeys
deleted file mode 100644
index 647de76..0000000
--- a/data/catalogs/preferences/cpufrequency/cs.catkeys
+++ /dev/null
@@ -1,19 +0,0 @@
-1 czech x-vnd.Haiku-CPUFrequencyPref 3974849433
-CPU frequency status view CPU Frequency View Zobrazení
statusu frekvence CPU
-CPUFrequency\n\twritten by Clemens Zeidler\n\tCopyright 2009, Haiku, Inc.\n
Status view CPUFrequency\n\tnapsal Clemens Zeidler\n\tCopyright
2009, Haiku, Inc.\n
-Defaults Pref Window Původní
-Dynamic performance Status view Dynamický výkon
-Dynamic stepping CPU Frequency View Dynamické krokování
-High performance Status view Vysoký výkon
-Install replicant into Deskbar CPU Frequency View Instaloval
replikant do Deskbaru
-Integration time [ms]: CPU Frequency View Integrační čas
[ms]:
-Launching the CPU frequency preflet failed.\n\nError: Status view
Nepodařilo se otevřít nastavení frekvence CPU.\n\nChyba:
-Low energy Status view Nízká spotřeba
-Ok Status view Ok
-Open Speedstep preferences… Status view Otevřít nastavení
SpeedStep...
-Quit Status view Odejít
-Revert Pref Window Obnovit
-Set state Status view Nastavit stav
-Step up by CPU usage Color Step View Krokovat podle využití CPU
-Stepping policy CPU Frequency View Krokovací politika
-Stepping policy: CPU Frequency View Krokovací politika:
diff --git a/data/catalogs/preferences/cpufrequency/da.catkeys
b/data/catalogs/preferences/cpufrequency/da.catkeys
deleted file mode 100644
index 228fa10..0000000
--- a/data/catalogs/preferences/cpufrequency/da.catkeys
+++ /dev/null
@@ -1,19 +0,0 @@
-1 danish x-vnd.Haiku-CPUFrequencyPref 3974849433
-CPU frequency status view CPU Frequency View CPU frekvens
statusoversigt
-CPUFrequency\n\twritten by Clemens Zeidler\n\tCopyright 2009, Haiku, Inc.\n
Status view CPUFrekvens\n\tskrevet af Clemens Zeidler\n\tOphavsret
2009, Haiku, Inc.\n
-Defaults Pref Window Standard indstillinger
-Dynamic performance Status view Dynamisk ydeevne
-Dynamic stepping CPU Frequency View Dynamisk acceleration
-High performance Status view Høj ydeevne
-Install replicant into Deskbar CPU Frequency View Indsæt
replikant i Deskbar
-Integration time [ms]: CPU Frequency View Integrationstid
[ms]:
-Launching the CPU frequency preflet failed.\n\nError: Status view
Det var ikke muligt at starte CPU frekvens indstillings programmet.\n\nFejl:
-Low energy Status view Lavt energiforbrug
-Ok Status view OK
-Open Speedstep preferences… Status view Åben Speedstep
egenskaber…
-Quit Status view Afslut
-Revert Pref Window Tilbagestil
-Set state Status view Sæt tilstand
-Step up by CPU usage Color Step View Acceleration efter CPU
belastning
-Stepping policy CPU Frequency View Accelerationspolitik
-Stepping policy: CPU Frequency View Accelerationspolitik:
diff --git a/data/catalogs/preferences/cpufrequency/de.catkeys
b/data/catalogs/preferences/cpufrequency/de.catkeys
deleted file mode 100644
index 153a6e4..0000000
--- a/data/catalogs/preferences/cpufrequency/de.catkeys
+++ /dev/null
@@ -1,21 +0,0 @@
-1 german x-vnd.Haiku-CPUFrequencyPref 1007318924
-Ok Status view OK
-CPU frequency status view CPU Frequency View CPU-Takt-Anzeige
-OK Status view OK
-Set state Status view Fester Takt
-Defaults Pref Window Standardwerte
-Install replicant into Deskbar CPU Frequency View Replikant in
Deskbar installieren
-Quit Status view Beenden
-High performance Status view Hohe Leistung
-Stepping policy CPU Frequency View Taktungsrichtlinie
-Dynamic performance Status view Dynamische Leistung
-Step up by CPU usage Color Step View Taktänderung ab CPU-Auslastung
von:
-Dynamic stepping CPU Frequency View Dynamische Taktung
-Stepping policy: CPU Frequency View Taktungsrichtlinie:
-Integration time [ms]: CPU Frequency View Messintervall
[ms]:
-Open Speedstep preferences… Status view Speedstep Einstellungen
öffnen…
-Revert Pref Window Anfangswerte
-Low energy Status view Geringer Energieverbrauch
-Launching the CPU frequency preflet failed.\n\nError: Status view
Das CPU-Takt-Preflet konnte nicht gestartet werden.\n\nFehler:
-CPUFrequency\n\twritten by Clemens Zeidler\n\tCopyright 2009, Haiku, Inc.\n
Status view CPU-Takt\n\tGeschrieben von Clemens
Zeidler.\n\tCopyright 2009, Haiku, Inc.\n
-CPUFrequency System name CPU-Takt
diff --git a/data/catalogs/preferences/cpufrequency/el.catkeys
b/data/catalogs/preferences/cpufrequency/el.catkeys
deleted file mode 100644
index 162b3e7..0000000
--- a/data/catalogs/preferences/cpufrequency/el.catkeys
+++ /dev/null
@@ -1,20 +0,0 @@
-1 greek, modern (1453-) x-vnd.Haiku-CPUFrequencyPref 3079996868
-Ok Status view Εντάξει
-CPU frequency status view CPU Frequency View Συχνότητα
επεξεργαστή προβολή κατάστασης
-Set state Status view Ορισμός κατάστασης
-Defaults Pref Window Προεπιλογές
-Install replicant into Deskbar CPU Frequency View Εγκατάσταση
αντίγραφου στη Μπάρα εργασιών
-Quit Status view Έξοδος
-High performance Status view Υψηλή επίδοση
-Stepping policy CPU Frequency View Πολιτική βηματισμού
-Dynamic performance Status view Δυναμική επίδοση
-Step up by CPU usage Color Step View Αύξηση με χρήση της CPU
-Dynamic stepping CPU Frequency View Δυναμικός βηματισμός
-Stepping policy: CPU Frequency View Πολιτική βηματισμού:
-Integration time [ms]: CPU Frequency View Χρόνος
ολοκλήρωσης [ms]:
-Open Speedstep preferences… Status view Άνοιγμα προτιμήσεων
Ταχύτητα βήματος
-Revert Pref Window Επαναφορά
-Low energy Status view Χαμηλή ενέργεια
-Launching the CPU frequency preflet failed.\n\nError: Status view
Απέτυχε η εκκίνηση του preflet Συχνότητα επεξεργαστή.\n\nΣφάλμα:
-CPUFrequency\n\twritten by Clemens Zeidler\n\tCopyright 2009, Haiku, Inc.\n
Status view Συχνότητα Επεξεργαστή\n\tγράφτηκε από τον Clemens
Zeidler\n\tΠνευματικά δικαιώματα 2009, Haiku, Inc.\n
-CPUFrequency System name Συχνότητα της CPU
diff --git a/data/catalogs/preferences/cpufrequency/eo.catkeys
b/data/catalogs/preferences/cpufrequency/eo.catkeys
deleted file mode 100644
index 0d17205..0000000
--- a/data/catalogs/preferences/cpufrequency/eo.catkeys
+++ /dev/null
@@ -1,19 +0,0 @@
-1 esperanto x-vnd.Haiku-CPUFrequencyPref 3974849433
-CPU frequency status view CPU Frequency View Procesorofteca
stato
-CPUFrequency\n\twritten by Clemens Zeidler\n\tCopyright 2009, Haiku, Inc.\n
Status view Procesorofteco\n\tskribita per Clemens
Zeidler\n\tCopyright 2009, Haiku, Inc.\n
-Defaults Pref Window Aprioraj
-Dynamic performance Status view Dinamika rendimento
-Dynamic stepping CPU Frequency View Dinamika akcelo
-High performance Status view Plejbona rendimento
-Install replicant into Deskbar CPU Frequency View Instali la
kopianton en la Deskbar-on
-Integration time [ms]: CPU Frequency View Integralada
tempo [ms]:
-Launching the CPU frequency preflet failed.\n\nError: Status view
Malsukcesis lanĉi la procesorofteca prefileto.\n\nEraro:
-Low energy Status view Malgranda energio
-Ok Status view Bone
-Open Speedstep preferences… Status view Malfermi la
Speedstep-ajn agordojn…
-Quit Status view Eliri
-Revert Pref Window Malfari
-Set state Status view Ŝanĝi staton
-Step up by CPU usage Color Step View Akcelo per procesora uzo:
-Stepping policy CPU Frequency View Akcela reĝimo
-Stepping policy: CPU Frequency View Akcela reĝimo:
diff --git a/data/catalogs/preferences/cpufrequency/fi.catkeys
b/data/catalogs/preferences/cpufrequency/fi.catkeys
deleted file mode 100644
index d75dd8d..0000000
--- a/data/catalogs/preferences/cpufrequency/fi.catkeys
+++ /dev/null
@@ -1,21 +0,0 @@
-1 finnish x-vnd.Haiku-CPUFrequencyPref 1007318924
-Ok Status view Valmis
-CPU frequency status view CPU Frequency View
Suoritintaajuuden tilanäkymä
-OK Status view Valmis
-Set state Status view Aseta tila
-Defaults Pref Window Oletukset
-Install replicant into Deskbar CPU Frequency View Asenna kopio
Työpöytäpalkkiin
-Quit Status view Poistu
-High performance Status view Korkea suorituskyky
-Stepping policy CPU Frequency View Muutostapa
-Dynamic performance Status view Dynaaminen suorituskyky
-Step up by CPU usage Color Step View Muuta ylöspäin tämän
suorittimen käyttömäärän kohdalla:
-Dynamic stepping CPU Frequency View Dynaaminen muutos
-Stepping policy: CPU Frequency View Muutostapa:
-Integration time [ms]: CPU Frequency View Integraatioaika
[ms]:
-Open Speedstep preferences… Status view Avaa
nopeusaskelvalinnat...
-Revert Pref Window Palauta
-Low energy Status view Matala energiankulutus
-Launching the CPU frequency preflet failed.\n\nError: Status view
Suoritintaajuuden asetusohjelman käynnistys epäonnistui.\n\nVirhe:
-CPUFrequency\n\twritten by Clemens Zeidler\n\tCopyright 2009, Haiku, Inc.\n
Status view Suoritintaajuusasetukset\n\t tekijä: Clemens
Zeidler\n\t Copyright 2009, Haiku, Inc.\n
-CPUFrequency System name Suoritintaajuusasetukset
diff --git a/data/catalogs/preferences/cpufrequency/fr.catkeys
b/data/catalogs/preferences/cpufrequency/fr.catkeys
deleted file mode 100644
index b0dbc2f..0000000
--- a/data/catalogs/preferences/cpufrequency/fr.catkeys
+++ /dev/null
@@ -1,21 +0,0 @@
-1 french x-vnd.Haiku-CPUFrequencyPref 1007318924
-Ok Status view Ok
-CPU frequency status view CPU Frequency View Vue de l'état
de la fréquence du CPU
-OK Status view OK
-Set state Status view Changer l'état
-Defaults Pref Window Par défauts
-Install replicant into Deskbar CPU Frequency View Installer le
réplicant dans la Deskbar
-Quit Status view Quitter
-High performance Status view Haute performance
-Stepping policy CPU Frequency View Stratégie d'accélération
-Dynamic performance Status view Performance dynamique
-Step up by CPU usage Color Step View Accélération selon l'activité
CPU
-Dynamic stepping CPU Frequency View Accélération dynamique
-Stepping policy: CPU Frequency View Stratégie
d'accélération :
-Integration time [ms]: CPU Frequency View Temps
d'intégration [ms] :
-Open Speedstep preferences… Status view Ouvrir les préférences
Speestep…
-Revert Pref Window Rétablir
-Low energy Status view Basse consommation
-Launching the CPU frequency preflet failed.\n\nError: Status view
Échec de lancement des préférences de fréquence du CPU.\n\nErreur :
-CPUFrequency\n\twritten by Clemens Zeidler\n\tCopyright 2009, Haiku, Inc.\n
Status view Fréquence CPU\n\tÉcrit par Clemens Zeidler\n\tCopyright
2009, Haiku, Inc.\n
-CPUFrequency System name Fréquence CPU
diff --git a/data/catalogs/preferences/cpufrequency/hi.catkeys
b/data/catalogs/preferences/cpufrequency/hi.catkeys
deleted file mode 100644
index 9911779..0000000
--- a/data/catalogs/preferences/cpufrequency/hi.catkeys
+++ /dev/null
@@ -1,20 +0,0 @@
-1 hindi x-vnd.Haiku-CPUFrequencyPref 3079996868
-Ok Status view ठीक है
-CPU frequency status view CPU Frequency View सीपियु आवृत्ति
स्थिति देखने के लिए
-Set state Status view सेट स्टेट
-Defaults Pref Window डिफ़ॉल्ट्स
-Install replicant into Deskbar CPU Frequency View डेस्कबार में
स्थापित रेप्लिका
-Quit Status view छोड़ना
-High performance Status view उच्च निष्पादन
-Stepping policy CPU Frequency View कदम नीति
-Dynamic performance Status view गतिशील प्रदर्शन
-Step up by CPU usage Color Step View धीरे-धीरे सीपियु का उपयोग
द्वारा चरण होना
-Dynamic stepping CPU Frequency View गतिशील कदम
-Stepping policy: CPU Frequency View कदम नीति:
-Integration time [ms]: CPU Frequency View एकीकरण समय
[एमएस]:
-Open Speedstep preferences… Status view खुला स्पीद्स्तेप वरीयता
...
-Revert Pref Window पलटें
-Low energy Status view कम इनरजी
-Launching the CPU frequency preflet failed.\n\nError: Status view
लौन्चिंग सीपियु आवृत्ति शुभारंभ विफल.\n\nत्रुटि:
-CPUFrequency\n\twritten by Clemens Zeidler\n\tCopyright 2009, Haiku, Inc.\n
Status view सीपियु रेक़ुएन्क्य\n\t क्लेमेंस ज़िल्डर द्वारा
त्व्रित्तें\n\t कोप्य्रिघ्त 2009, हाइकू, Inc.\n
-CPUFrequency System name सीपियु की आवृत्ति
diff --git a/data/catalogs/preferences/cpufrequency/hr.catkeys
b/data/catalogs/preferences/cpufrequency/hr.catkeys
deleted file mode 100644
index aa1f020..0000000
--- a/data/catalogs/preferences/cpufrequency/hr.catkeys
+++ /dev/null
@@ -1,12 +0,0 @@
-1 croatian x-vnd.Haiku-CPUFrequencyPref 2355894194
-CPU frequency status view CPU Frequency View Pogled stanja
frekvencije procesora
-CPUFrequency\n\twritten by Clemens Zeidler\n\tCopyright 2009, Haiku, Inc.\n
Status view Frekvencija procesora\n\tnapisao Clemens
Zeidler\n\tAutoraska prava 2009, Haiku, Inc.\n
-Defaults Pref Window Zadano
-Dynamic performance Status view Dinamične performanse
-High performance Status view Visoke performanse
-Integration time [ms]: CPU Frequency View Vrijeme
integracije [ms]:
-Ok Status view U redu
-Open Speedstep preferences… Status view Otvori Speedstep
osobitosti...
-Quit Status view Isključi
-Revert Pref Window Preokreni
-Set state Status view Postavi stanje
diff --git a/data/catalogs/preferences/cpufrequency/hu.catkeys
b/data/catalogs/preferences/cpufrequency/hu.catkeys
deleted file mode 100644
index da46907..0000000
--- a/data/catalogs/preferences/cpufrequency/hu.catkeys
+++ /dev/null
@@ -1,21 +0,0 @@
-1 hungarian x-vnd.Haiku-CPUFrequencyPref 1007318924
-Ok Status view Rendben
-CPU frequency status view CPU Frequency View
Processzor-frekvencia állapota
-OK Status view Rendben
-Set state Status view Órajel beállítása
-Defaults Pref Window Eredeti
-Install replicant into Deskbar CPU Frequency View Replikáns
telepítése az Asztalsávba
-Quit Status view Kilépés
-High performance Status view Nagy teljesítmény
-Stepping policy CPU Frequency View Fokozatszabályozás
-Dynamic performance Status view Dinamikus teljesítmény
-Step up by CPU usage Color Step View Kiegyensúlyozott teljesítmény
-Dynamic stepping CPU Frequency View Szabadon választható
fokozatok
-Stepping policy: CPU Frequency View Fokozatszabályozás:
-Integration time [ms]: CPU Frequency View Alkalmazkodás
ideje [ms]:
-Open Speedstep preferences… Status view Fokozatszabályozási
beállító megnyitása…
-Revert Pref Window Visszaállít
-Low energy Status view Alacsony energiafogyasztás
-Launching the CPU frequency preflet failed.\n\nError: Status view
Nem sikerült a Processzor-frekvencia elindítása.\n\nHiba:
-CPUFrequency\n\twritten by Clemens Zeidler\n\tCopyright 2009, Haiku, Inc.\n
Status view Processzor-frekvencia\n\tÍrta: Clemens
Zeidler\n\tCopyright 2009, Haiku, Inc.\n
-CPUFrequency System name Processzor-frekvencia
diff --git a/data/catalogs/preferences/cpufrequency/it.catkeys
b/data/catalogs/preferences/cpufrequency/it.catkeys
deleted file mode 100644
index dbbc4b6..0000000
--- a/data/catalogs/preferences/cpufrequency/it.catkeys
+++ /dev/null
@@ -1,19 +0,0 @@
-1 italian x-vnd.Haiku-CPUFrequencyPref 3974849433
-CPU frequency status view CPU Frequency View Stato frequenza
della CPU
-CPUFrequency\n\twritten by Clemens Zeidler\n\tCopyright 2009, Haiku, Inc.\n
Status view Frequenza CPU\n\tscritto da Clemens Zeidler\n\tDiritti
d'autore ©2009, Haiku, Inc.\n
-Defaults Pref Window Predefiniti
-Dynamic performance Status view Prestazioni dinamiche
-Dynamic stepping CPU Frequency View Scalabilità dinamica
-High performance Status view Prestazioni elevate
-Install replicant into Deskbar CPU Frequency View Installa il
replicante nella Deskbar
-Integration time [ms]: CPU Frequency View Tempo di
intervento [ms]:
-Launching the CPU frequency preflet failed.\n\nError: Status view
Impossibile far partire le preferenze frequenza CPU.\n\nErrore:
-Low energy Status view Bassi consumi
-Ok Status view Ok
-Open Speedstep preferences… Status view Apri preferenze
Speedstep…
-Quit Status view Esci
-Revert Pref Window Ripristina
-Set state Status view Imposta stato
-Step up by CPU usage Color Step View Scala in base all'utilizzo
della CPU
-Stepping policy CPU Frequency View Regole di scalabilità
-Stepping policy: CPU Frequency View Regola scalabilità:
diff --git a/data/catalogs/preferences/cpufrequency/ja.catkeys
b/data/catalogs/preferences/cpufrequency/ja.catkeys
deleted file mode 100644
index cd225eb..0000000
--- a/data/catalogs/preferences/cpufrequency/ja.catkeys
+++ /dev/null
@@ -1,21 +0,0 @@
-1 japanese x-vnd.Haiku-CPUFrequencyPref 1007318924
-Ok Status view Ok
-CPU frequency status view CPU Frequency View CPU 周波数ビュー
-OK Status view OK
-Set state Status view 設定
-Defaults Pref Window デフォルト
-Install replicant into Deskbar CPU Frequency View レプリカントを Deskbar
に表示
-Quit Status view 終了
-High performance Status view ハイパフォーマンス
-Stepping policy CPU Frequency View ステッピングポリシー
-Dynamic performance Status view ダイナミックパフォーマンス
-Step up by CPU usage Color Step View CPU 負荷に応じてステップアップ
-Dynamic stepping CPU Frequency View ダイナミックステッピング
-Stepping policy: CPU Frequency View ステッピングポリシー
-Integration time [ms]: CPU Frequency View 積分時間 [ms]:
-Open Speedstep preferences… Status view Open Speedstep の設定…
-Revert Pref Window 元に戻す
-Low energy Status view 省電力モード
-Launching the CPU frequency preflet failed.\n\nError: Status view
CPU 周波数の起動に失敗しました。\n\nエラー:
-CPUFrequency\n\twritten by Clemens Zeidler\n\tCopyright 2009, Haiku, Inc.\n
Status view CPU 周波数\n\tClemens Zeidler 作\n\tCopyright 2009, Haiku,
Inc.\n
-CPUFrequency System name CPU 周波数
diff --git a/data/catalogs/preferences/cpufrequency/ko.catkeys
b/data/catalogs/preferences/cpufrequency/ko.catkeys
deleted file mode 100644
index da3fcad..0000000
--- a/data/catalogs/preferences/cpufrequency/ko.catkeys
+++ /dev/null
@@ -1,19 +0,0 @@
-1 korean x-vnd.Haiku-CPUFrequencyPref 3974849433
-CPU frequency status view CPU Frequency View CPU 주파수 상태 보기
-CPUFrequency\n\twritten by Clemens Zeidler\n\tCopyright 2009, Haiku, Inc.\n
Status view CPU주파수\n\tClemens Zeidler 작성\n\t저작권 2009, Haiku, Inc.\n
-Defaults Pref Window 기본설정
-Dynamic performance Status view 동적 성능
-Dynamic stepping CPU Frequency View 동적 스테핑
-High performance Status view 고성능
-Install replicant into Deskbar CPU Frequency View 데스크바에 복제품 설치
-Integration time [ms]: CPU Frequency View 통합 시간 [ms]:
-Launching the CPU frequency preflet failed.\n\nError: Status view
CPU 주파수 제어판 불러오기 실패.\n\n에러:
-Low energy Status view 저전력
-Ok Status view 확인
-Open Speedstep preferences… Status view 스피드스텝 설정 열기…
-Quit Status view 나가기
-Revert Pref Window 되돌리기
-Set state Status view 상태 설정
-Step up by CPU usage Color Step View CPU 사용량에 따라 증가
-Stepping policy CPU Frequency View 스테핑 정책
-Stepping policy: CPU Frequency View 스테핑 정책:
diff --git a/data/catalogs/preferences/cpufrequency/lt.catkeys
b/data/catalogs/preferences/cpufrequency/lt.catkeys
deleted file mode 100644
index 7e8f754..0000000
--- a/data/catalogs/preferences/cpufrequency/lt.catkeys
+++ /dev/null
@@ -1,21 +0,0 @@
-1 lithuanian x-vnd.Haiku-CPUFrequencyPref 1007318924
-Ok Status view Gerai
-CPU frequency status view CPU Frequency View Centrinio
procesoriaus dažnio indikatorius
-OK Status view Gerai
-Set state Status view Pasirinkta būsena
-Defaults Pref Window Numatytai
-Install replicant into Deskbar CPU Frequency View Patalpinti
indikatorių pranešimų srityje
-Quit Status view Baigti darbą
-High performance Status view Didelis našumas
-Stepping policy CPU Frequency View Centrinio procesoriaus
veiksena
-Dynamic performance Status view Prisitaikantis našumas
-Step up by CPU usage Color Step View Našumo keitimo žingsnis
-Dynamic stepping CPU Frequency View Prisitaikančio našumo
derinimas
-Stepping policy: CPU Frequency View Centrinio procesoriaus
veiksena:
-Integration time [ms]: CPU Frequency View Integravimosi
laikas [ms]:
-Open Speedstep preferences… Status view CP dažnio nuostatos…
-Revert Pref Window Atšaukti pakeitimus
-Low energy Status view Energijos taupymas
-Launching the CPU frequency preflet failed.\n\nError: Status view
Nepavyko atverti Centrinio procesoriaus dažnio nuostatų lango.\n\nKlaida:
-CPUFrequency\n\twritten by Clemens Zeidler\n\tCopyright 2009, Haiku, Inc.\n
Status view Centrinio procesoriaus dažnis\n\tsukurtas Clemens'o
Zeidler'io\n\t© 2009, Haiku, Inc.\n
-CPUFrequency System name Centrinio procesoriaus dažnis
diff --git a/data/catalogs/preferences/cpufrequency/nb.catkeys
b/data/catalogs/preferences/cpufrequency/nb.catkeys
deleted file mode 100644
index 3a594c7..0000000
--- a/data/catalogs/preferences/cpufrequency/nb.catkeys
+++ /dev/null
@@ -1,19 +0,0 @@
-1 bokmål, norwegian; norwegian bokmål x-vnd.Haiku-CPUFrequencyPref
1579805342
-Ok Status view OK
-CPU frequency status view CPU Frequency View Visning av
CPU-status
-Set state Status view Sett tilstand
-Defaults Pref Window Standardinnstillinger
-Install replicant into Deskbar CPU Frequency View Installer
replikanten i Deskbar
-Quit Status view Avslutt
-High performance Status view Høy ytelse
-Stepping policy CPU Frequency View Stepping-policy
-Dynamic performance Status view Dynamisk ytelse
-Dynamic stepping CPU Frequency View Dynamisk stepping
-Stepping policy: CPU Frequency View Stepping-policy
-Integration time [ms]: CPU Frequency View Integrasjonstid
[ms]:
-Open Speedstep preferences… Status view Åpne
Speedstep-innstillinger
-Revert Pref Window Tilbakestill
-Low energy Status view Lavenergi
-Launching the CPU frequency preflet failed.\n\nError: Status view
Feil ved lasting av Prosessorhastighet. \n\nFeil:
-CPUFrequency\n\twritten by Clemens Zeidler\n\tCopyright 2009, Haiku, Inc.\n
Status view CPUFrequency\n\tskrevet av Clemens
Zeidler\n\tOpphavsrett 2009, Haiku, Inc.\n
-CPUFrequency System name Prosessorhastighet
diff --git a/data/catalogs/preferences/cpufrequency/nl.catkeys
b/data/catalogs/preferences/cpufrequency/nl.catkeys
deleted file mode 100644
index 4367c89..0000000
--- a/data/catalogs/preferences/cpufrequency/nl.catkeys
+++ /dev/null
@@ -1,21 +0,0 @@
-1 dutch; flemish x-vnd.Haiku-CPUFrequencyPref 1007318924
-Ok Status view Oké
-CPU frequency status view CPU Frequency View Weergave
CPU-frequentiestatus
-OK Status view Ok
-Set state Status view Toestand instellen
-Defaults Pref Window Standaardwaarden
-Install replicant into Deskbar CPU Frequency View Replicant in
Deskbar installeren
-Quit Status view Afsluiten
-High performance Status view Hoge prestaties
-Stepping policy CPU Frequency View Stapbeleid
-Dynamic performance Status view Dynamische prestaties
-Step up by CPU usage Color Step View Opvoeren door CPU-gebruik
-Dynamic stepping CPU Frequency View Dynamisch opvoeren
-Stepping policy: CPU Frequency View Opvoerbeleid:
-Integration time [ms]: CPU Frequency View Integratietijd
[ms]:
-Open Speedstep preferences… Status view Speedstep-voorkeuren
openen…
-Revert Pref Window Herstellen
-Low energy Status view Lage energie
-Launching the CPU frequency preflet failed.\n\nError: Status view
Starten van de CPU-frequentiepreflet is mislukt.\n\nFout:
-CPUFrequency\n\twritten by Clemens Zeidler\n\tCopyright 2009, Haiku, Inc.\n
Status view CPUFrequency\n\tdoor Clemens Zeidler\n\tCopyright 2009,
Haiku, Inc.\n
-CPUFrequency System name CPUFrequency
diff --git a/data/catalogs/preferences/cpufrequency/pl.catkeys
b/data/catalogs/preferences/cpufrequency/pl.catkeys
deleted file mode 100644
index 1cba588..0000000
--- a/data/catalogs/preferences/cpufrequency/pl.catkeys
+++ /dev/null
@@ -1,21 +0,0 @@
-1 polish x-vnd.Haiku-CPUFrequencyPref 1007318924
-Ok Status view Ok
-CPU frequency status view CPU Frequency View Widok statusu
częstotliwości taktowania procesora
-OK Status view OK
-Set state Status view Ustaw stan
-Defaults Pref Window Przywróć ustawienia domyślne
-Install replicant into Deskbar CPU Frequency View Zainstaluj
replikant na Panelu Pulpitu
-Quit Status view Zamknij
-High performance Status view Wysoka wydajność
-Stepping policy CPU Frequency View Polityka skalowania
procesora
-Dynamic performance Status view Dynamicznie dopasowana wydajność
-Step up by CPU usage Color Step View Ustawiaj taktowanie w
zależności od obciążenia procesora
-Dynamic stepping CPU Frequency View Dynamiczne skalowanie
-Stepping policy: CPU Frequency View Polityka skalowania:
-Integration time [ms]: CPU Frequency View Czas integracji
(w milisekundach):
-Open Speedstep preferences… Status view Otwórz ustawienia
Speedstep…
-Revert Pref Window Przywróć poprzednie ustawienia
-Low energy Status view Oszczędna
-Launching the CPU frequency preflet failed.\n\nError: Status view
Uruchomienie prefletu częstotliwości procesora zakończyło się
niepowodzeniem.\n\nBłąd:
-CPUFrequency\n\twritten by Clemens Zeidler\n\tCopyright 2009, Haiku, Inc.\n
Status view CPUFrequency\n\tnapisane przez Clemensa
Zeidlera\n\tCopyright 2009, Haiku, Inc.\n
-CPUFrequency System name Częstotliwość procesora
diff --git a/data/catalogs/preferences/cpufrequency/pt.catkeys
b/data/catalogs/preferences/cpufrequency/pt.catkeys
deleted file mode 100644
index ae2db82..0000000
--- a/data/catalogs/preferences/cpufrequency/pt.catkeys
+++ /dev/null
@@ -1,12 +0,0 @@
-1 portuguese x-vnd.Haiku-CPUFrequencyPref 2133997991
-Defaults Pref Window Predefenições
-Dynamic stepping CPU Frequency View Aceleração Dinâmica
-Install replicant into Deskbar CPU Frequency View Instalar o
Replicant na Deskbar
-Integration time [ms]: CPU Frequency View Tempo de
integração [ms]:
-Ok Status view OK
-Quit Status view Sair
-Revert Pref Window Reverter
-Set state Status view Defenir estado
-Step up by CPU usage Color Step View Variação de velocidade com base
no uso do CPU
-Stepping policy CPU Frequency View Política de Aceleração
-Stepping policy: CPU Frequency View Política de Aceleração:
diff --git a/data/catalogs/preferences/cpufrequency/pt_BR.catkeys
b/data/catalogs/preferences/cpufrequency/pt_BR.catkeys
deleted file mode 100644
index 6744324..0000000
--- a/data/catalogs/preferences/cpufrequency/pt_BR.catkeys
+++ /dev/null
@@ -1,21 +0,0 @@
-1 portuguese (brazil) x-vnd.Haiku-CPUFrequencyPref 1007318924
-Ok Status view Ok
-CPU frequency status view CPU Frequency View Status da
frequência do CPU
-OK Status view OK
-Set state Status view Definir estado
-Defaults Pref Window Padrões
-Install replicant into Deskbar CPU Frequency View Instalar o
replicante na Mesa de Trabalho
-Quit Status view Sair
-High performance Status view Alto desempenho
-Stepping policy CPU Frequency View Política de stepping
-Dynamic performance Status view Desempenho dinâmico
-Step up by CPU usage Color Step View Aumentar desempenho por uso de
CPU
-Dynamic stepping CPU Frequency View Stepping dinâmico
-Stepping policy: CPU Frequency View Política de stepping:
-Integration time [ms]: CPU Frequency View Tempo de
integração [ms]:
-Open Speedstep preferences… Status view Preferências de Open
Speedstep…
-Revert Pref Window Reverter
-Low energy Status view Baixa energia
-Launching the CPU frequency preflet failed.\n\nError: Status view
Não foi possível abrir a Frequência de CPU.\n\nErro:
-CPUFrequency\n\twritten by Clemens Zeidler\n\tCopyright 2009, Haiku, Inc.\n
Status view A Frequência do CPU\n\tfoi escrito por Clemens
Zeidler\n\tCopyright 2009, Haiku, Inc.\n
-CPUFrequency System name Frequência do CPU
diff --git a/data/catalogs/preferences/cpufrequency/pt_br.catkeys
b/data/catalogs/preferences/cpufrequency/pt_br.catkeys
deleted file mode 100644
index e8d674d..0000000
--- a/data/catalogs/preferences/cpufrequency/pt_br.catkeys
+++ /dev/null
@@ -1,8 +0,0 @@
-1 brazilian_portuguese x-vnd.Haiku-CPUFrequencyPref 1149286520
-CPU frequency status view CPU Frequency View Status da
frequência do CPU
-CPUFrequency\n\twritten by Clemens Zeidler\n\tCopyright 2009, Haiku, Inc.\n
Status view A Frequência do CPU\n\tfoi escrito por Clemens
Zeidler\n\tCopyright 2009, Haiku, Inc.\n
-Defaults Pref Window Padrões
-Install replicant into Deskbar CPU Frequency View Instalar o
replicante na Mesa de Trabalho
-Launching the CPU frequency preflet failed.\n\nError: Status view
Não foi possível abrir a Frequência de CPU.\n\nErro:
-Low energy Status view Baixa energia
-Set state Status view Definir estado
diff --git a/data/catalogs/preferences/cpufrequency/ro.catkeys
b/data/catalogs/preferences/cpufrequency/ro.catkeys
deleted file mode 100644
index 38acfb5..0000000
--- a/data/catalogs/preferences/cpufrequency/ro.catkeys
+++ /dev/null
@@ -1,20 +0,0 @@
-1 romanian x-vnd.Haiku-CPUFrequencyPref 3079996868
-Ok Status view Ok
-CPU frequency status view CPU Frequency View Vizualizare a
stării frecvenței CPU
-Set state Status view Stabilește stare
-Defaults Pref Window Implicite
-Install replicant into Deskbar CPU Frequency View Instalează
copie pe Deskbar
-Quit Status view Părăsește
-High performance Status view Performanță înaltă
-Stepping policy CPU Frequency View Regulă de accelerare
-Dynamic performance Status view Performanță dinamică
-Step up by CPU usage Color Step View Accelerare după utilizarea CPU
-Dynamic stepping CPU Frequency View Accelerare dinamică
-Stepping policy: CPU Frequency View Regulă de accelerare:
-Integration time [ms]: CPU Frequency View Timp de
integrare [ms]:
-Open Speedstep preferences… Status view Deschide preferințe
viteză…
-Revert Pref Window Revenire
-Low energy Status view Energie scăzută
-Launching the CPU frequency preflet failed.\n\nError: Status view
Pornirea prefletului frecvență CPU a eșuat.\n\nEroare:
-CPUFrequency\n\twritten by Clemens Zeidler\n\tCopyright 2009, Haiku, Inc.\n
Status view FrecvențăCPU\n\tscris de Clemens Zeidler\n\tDrept de
autor 2009, Haiku, Inc.\n
-CPUFrequency System name FrecvențăCPU
diff --git a/data/catalogs/preferences/cpufrequency/ru.catkeys
b/data/catalogs/preferences/cpufrequency/ru.catkeys
deleted file mode 100644
index 850cc69..0000000
--- a/data/catalogs/preferences/cpufrequency/ru.catkeys
+++ /dev/null
@@ -1,21 +0,0 @@
-1 russian x-vnd.Haiku-CPUFrequencyPref 1007318924
-Ok Status view ОК
-CPU frequency status view CPU Frequency View Просмотр
состояния частоты ЦП
-OK Status view OK
-Set state Status view Выбрать состояние
-Defaults Pref Window По умолчанию
-Install replicant into Deskbar CPU Frequency View Установить
репликант в Deskbar
-Quit Status view Выход
-High performance Status view Высокая производительность
-Stepping policy CPU Frequency View Настройка шага
изменения частоты ЦП
-Dynamic performance Status view Динамическая производительность
-Step up by CPU usage Color Step View Шаг вверх по производительности
ЦП:
-Dynamic stepping CPU Frequency View Динамическое изменение
-Stepping policy: CPU Frequency View Настройка шага
изменения частоты ЦП:
-Integration time [ms]: CPU Frequency View Время
интеграции [мс]:
-Open Speedstep preferences… Status view Настроить частоту
процессора…
-Revert Pref Window Вернуть
-Low energy Status view Экономия энергии
-Launching the CPU frequency preflet failed.\n\nError: Status view
Не удалось запустить настройки частоты ЦП.\n\nОшибка:
-CPUFrequency\n\twritten by Clemens Zeidler\n\tCopyright 2009, Haiku, Inc.\n
Status view CPUFrequency\n\tразработал Clemens Zeidler\n\tCopyright
2009, Haiku, Inc.\n
-CPUFrequency System name Частота процессора
diff --git a/data/catalogs/preferences/cpufrequency/sk.catkeys
b/data/catalogs/preferences/cpufrequency/sk.catkeys
deleted file mode 100644
index 87f5b35..0000000
--- a/data/catalogs/preferences/cpufrequency/sk.catkeys
+++ /dev/null
@@ -1,21 +0,0 @@
-1 slovak x-vnd.Haiku-CPUFrequencyPref 1007318924
-Ok Status view OK
-CPU frequency status view CPU Frequency View Zobrazenie
stavy frekvencie CPU
-OK Status view OK
-Set state Status view Nastaviť stav
-Defaults Pref Window Predvoľby
-Install replicant into Deskbar CPU Frequency View Nainštalovať
replikant do Panelu
-Quit Status view Ukončiť
-High performance Status view Vysoký výkon
-Stepping policy CPU Frequency View Politika krokovania
-Dynamic performance Status view Dynamický výkon
-Step up by CPU usage Color Step View Krokovať podľa využitia CPU
-Dynamic stepping CPU Frequency View Dynamické krokovanie
-Stepping policy: CPU Frequency View Politika krokovania:
-Integration time [ms]: CPU Frequency View Čas integrácie
[ms]:
-Open Speedstep preferences… Status view Otvoriť nastavenia
Speedstep…
-Revert Pref Window Vrátiť
-Low energy Status view Nízky odber
-Launching the CPU frequency preflet failed.\n\nError: Status view
Spustenie konfiguračného apletu Frekvencia CPU zlyhalo.\n\nChyba:
-CPUFrequency\n\twritten by Clemens Zeidler\n\tCopyright 2009, Haiku, Inc.\n
Status view CPUFrequency\n\tnapísal Clemens Zeidler\n\tCopyright
2009, Haiku, Inc.\n
-CPUFrequency System name Frekvencia CPU
diff --git a/data/catalogs/preferences/cpufrequency/sv.catkeys
b/data/catalogs/preferences/cpufrequency/sv.catkeys
deleted file mode 100644
index 8762227..0000000
--- a/data/catalogs/preferences/cpufrequency/sv.catkeys
+++ /dev/null
@@ -1,21 +0,0 @@
-1 swedish x-vnd.Haiku-CPUFrequencyPref 1007318924
-Ok Status view OK
-CPU frequency status view CPU Frequency View Statusvy för
ProcessorFrekvens
-OK Status view OK
-Set state Status view Ändra läge
-Defaults Pref Window Förval
-Install replicant into Deskbar CPU Frequency View Installera
replikant i Deskbar
-Quit Status view Avsluta
-High performance Status view Hög prestanda
-Stepping policy CPU Frequency View Accelerationspolicy
-Dynamic performance Status view Dynamisk prestanda
-Step up by CPU usage Color Step View Öka vid CPU-belastning
-Dynamic stepping CPU Frequency View Dynamisk acceleration
-Stepping policy: CPU Frequency View Accelerationspolicy:
-Integration time [ms]: CPU Frequency View Integreringstid
-Open Speedstep preferences… Status view Öppna inställningar för
ProcessorFrekvens…
-Revert Pref Window Återgå
-Low energy Status view Lågenergiläge
-Launching the CPU frequency preflet failed.\n\nError: Status view
Misslyckades med att starta inställningsprogrammet ProcessorFrekvens.\n\nFel:
-CPUFrequency\n\twritten by Clemens Zeidler\n\tCopyright 2009, Haiku, Inc.\n
Status view ProcessorFrekvens\n\tskriven av Clemens
Zeidler\n\tCopyright 2009, Haiku, Inc.\n
-CPUFrequency System name ProcessorFrekvens
diff --git a/data/catalogs/preferences/cpufrequency/uk.catkeys
b/data/catalogs/preferences/cpufrequency/uk.catkeys
deleted file mode 100644
index 58dd878..0000000
--- a/data/catalogs/preferences/cpufrequency/uk.catkeys
+++ /dev/null
@@ -1,20 +0,0 @@
-1 ukrainian x-vnd.Haiku-CPUFrequencyPref 3079996868
-Ok Status view Гаразд
-CPU frequency status view CPU Frequency View Статистика
частоти ЦП
-Set state Status view Встановити стан
-Defaults Pref Window По замовчуванню
-Install replicant into Deskbar CPU Frequency View Встановити
реплікант в Deskbar
-Quit Status view Вийти
-High performance Status view Висока продуктивність
-Stepping policy CPU Frequency View Настройка кроку зміни
частоти ЦП
-Dynamic performance Status view Динамічна продуктивність
-Step up by CPU usage Color Step View Крок вгору по продуктивності ЦП:
-Dynamic stepping CPU Frequency View Динамічна зміна
-Stepping policy: CPU Frequency View Настройка кроку зміни
частоти ЦП:
-Integration time [ms]: CPU Frequency View Час інтеграції
[мс]:
-Open Speedstep preferences… Status view Відкриття покрокової
настройки
-Revert Pref Window Повернути
-Low energy Status view Мале споживання
-Launching the CPU frequency preflet failed.\n\nError: Status view
Програму Частота процесора не вдалося запустити.\n\nПомилка:
-CPUFrequency\n\twritten by Clemens Zeidler\n\tCopyright 2009, Haiku, Inc.\n
Status view Частота процесора\n\Автор Клеменс Зейдлер\n\tCopyright
2009, Haiku, Inc.\n
-CPUFrequency System name Частота процесора
diff --git a/data/catalogs/preferences/cpufrequency/zh-Hans.catkeys
b/data/catalogs/preferences/cpufrequency/zh-Hans.catkeys
deleted file mode 100644
index 215219b..0000000
--- a/data/catalogs/preferences/cpufrequency/zh-Hans.catkeys
+++ /dev/null
@@ -1,20 +0,0 @@
-1 english x-vnd.Haiku-CPUFrequencyPref 3079996868
-Ok Status view 确定
-CPU frequency status view CPU Frequency View CPU 状态视图
-Set state Status view 状态设置
-Defaults Pref Window 默认
-Install replicant into Deskbar CPU Frequency View 添加 CPU 监视器到桌面栏
-Quit Status view 退出
-High performance Status view 高性能
-Stepping policy CPU Frequency View 步进策略
-Dynamic performance Status view 动态性能
-Step up by CPU usage Color Step View CPU 步进设置
-Dynamic stepping CPU Frequency View 动态步进
-Stepping policy: CPU Frequency View 步进策略：
-Integration time [ms]: CPU Frequency View 采样时间 [ms]：
-Open Speedstep preferences… Status view 打开省电设置…
-Revert Pref Window 取消
-Low energy Status view 低能耗
-Launching the CPU frequency preflet failed.\n\nError: Status view
启动 CPU 状态通知失败。\n\n错误信息：
-CPUFrequency\n\twritten by Clemens Zeidler\n\tCopyright 2009, Haiku, Inc.\n
Status view CPU 监视器\n\t编写者：Clemens Zeidler\n\tCopyright 2009，Haiku
.Inc。\n
-CPUFrequency System name CPU 监视器
diff --git a/data/catalogs/preferences/cpufrequency/zh_Hans.catkeys
b/data/catalogs/preferences/cpufrequency/zh_Hans.catkeys
deleted file mode 100644
index c93c63c..0000000
--- a/data/catalogs/preferences/cpufrequency/zh_Hans.catkeys
+++ /dev/null
@@ -1,21 +0,0 @@
-1 english x-vnd.Haiku-CPUFrequencyPref 1007318924
-Ok Status view 确定
-CPU frequency status view CPU Frequency View CPU 状态视图
-OK Status view 确定
-Set state Status view 状态设置
-Defaults Pref Window 默认
-Install replicant into Deskbar CPU Frequency View 添加 CPU 监视器到桌面栏
-Quit Status view 退出
-High performance Status view 高性能
-Stepping policy CPU Frequency View 步进策略
-Dynamic performance Status view 动态性能
-Step up by CPU usage Color Step View CPU 步进设置
-Dynamic stepping CPU Frequency View 动态步进
-Stepping policy: CPU Frequency View 步进策略：
-Integration time [ms]: CPU Frequency View 采样时间 [ms]：
-Open Speedstep preferences… Status view 打开省电设置…
-Revert Pref Window 取消
-Low energy Status view 低能耗
-Launching the CPU frequency preflet failed.\n\nError: Status view
启动 CPU 状态通知失败。\n\n错误信息：
-CPUFrequency\n\twritten by Clemens Zeidler\n\tCopyright 2009, Haiku, Inc.\n
Status view CPU 监视器\n\t编写者：Clemens Zeidler\n\tCopyright 2009，Haiku
.Inc。\n
-CPUFrequency System name CPU 监视器
diff --git a/src/preferences/Jamfile b/src/preferences/Jamfile
index 99c59fb..05a3858 100644
--- a/src/preferences/Jamfile
+++ b/src/preferences/Jamfile
@@ -3,7 +3,6 @@ SubDir HAIKU_TOP src preferences ;
SubInclude HAIKU_TOP src preferences appearance ;
SubInclude HAIKU_TOP src preferences backgrounds ;
SubInclude HAIKU_TOP src preferences bluetooth ;
-SubInclude HAIKU_TOP src preferences cpufrequency ;
SubInclude HAIKU_TOP src preferences datatranslations ;
SubInclude HAIKU_TOP src preferences deskbar ;
#SubInclude HAIKU_TOP src preferences dun ;
diff --git a/src/preferences/cpufrequency/CPUFrequencyView.cpp
b/src/preferences/cpufrequency/CPUFrequencyView.cpp
deleted file mode 100644
index b0e1adf..0000000
--- a/src/preferences/cpufrequency/CPUFrequencyView.cpp
+++ /dev/null
@@ -1,252 +0,0 @@
-/*
- * Copyright 2009-2010, Haiku, Inc. All Rights Reserved.
- * Distributed under the terms of the MIT License.
- *
- * Authors:
- * Clemens Zeidler, haiku@xxxxxxxxxxxxxxxxxx
- */
-
-
-#include "CPUFrequencyView.h"
-
-#include "StatusView.h"
-
-#include <Box.h>
-#include <Catalog.h>
-#include <Deskbar.h>
-#include <GroupView.h>
-#include <Locale.h>
-#include <MenuField.h>
-#include <SpaceLayoutItem.h>
-
-
-#undef B_TRANSLATION_CONTEXT
-#define B_TRANSLATION_CONTEXT "CPU Frequency View"
-
-
-const char* kCPUFreqPreferencesFile = "CPUFrequency";
-const char* kPrefSignature = "application/x-vnd.Haiku-CPUFrequencyPref";
-const char* kPreferencesFileName = "CPUFrequency";
-
-const uint32 kInstallIntoDeskbar = '&iid';
-const uint32 kIntegrationTimeChanged = '&itc';
-
-const bigtime_t kMilliSecond = 1000;
-
-
-CPUFrequencyView::CPUFrequencyView(BRect frame,
- PreferencesStorage<freq_preferences>* storage)
- :
- BView(frame, "CPUFrequencyView", B_FOLLOW_NONE, B_WILL_DRAW),
- fStorage(storage)
-{
- BGroupLayout* mainLayout = new BGroupLayout(B_VERTICAL);
- SetLayout(mainLayout);
- mainLayout->SetSpacing(10);
- SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
-
- // stepping policy
- BRect rect = Bounds();
- rect.InsetBy(5, 5);
- BBox *policyBox = new BBox(rect, "policyBox");
- policyBox->SetLabel(B_TRANSLATE("Stepping policy"));
- BGroupLayout* policyLayout = new BGroupLayout(B_VERTICAL);
- policyLayout->SetInsets(10, policyBox->TopBorderOffset() * 2 + 10, 10,
10);
- policyLayout->SetSpacing(10);
- policyBox->SetLayout(policyLayout);
- mainLayout->AddView(policyBox);
-
- fPolicyMenu = new BMenu(B_TRANSLATE("Stepping policy: "));
- BMenuField *menuField = new BMenuField("", fPolicyMenu);
- policyLayout->AddView(menuField);
-
- // dynamic stepping
- BBox *dynamicBox = new BBox(rect, "dynamicBox");
- dynamicBox->SetLabel(B_TRANSLATE("Dynamic stepping"));
- BGroupLayout* dynamicLayout = new BGroupLayout(B_VERTICAL);
- dynamicLayout->SetInsets(B_USE_DEFAULT_SPACING,
- dynamicBox->TopBorderOffset() * 2 + 10,
- B_USE_DEFAULT_SPACING, B_USE_DEFAULT_SPACING);
- dynamicLayout->SetSpacing(B_USE_DEFAULT_SPACING);
- dynamicBox->SetLayout(dynamicLayout);
- mainLayout->AddView(dynamicBox);
-
- fColorStepView = new ColorStepView(frame);
- fColorStepView->SetFrequencys(fDriverInterface.GetCpuFrequencyStates());
-
- fIntegrationTime = new BTextControl(BRect(0, 0, Bounds().Width(), 10),
- "intergal", B_TRANSLATE("Integration time [ms]: "), "",
- new BMessage(kIntegrationTimeChanged));
- fIntegrationTime->SetDivider(Bounds().Width() * 3 / 4);
- fIntegrationTime->SetAlignment(B_ALIGN_RIGHT, B_ALIGN_LEFT);
-
- dynamicLayout->AddView(fColorStepView);
- dynamicLayout->AddView(fIntegrationTime);
-
- // status view
- BBox *statusBox = new BBox(rect, "statusBox");
- statusBox->SetLabel(B_TRANSLATE("CPU frequency status view"));
- BGroupLayout* statusLayout = new BGroupLayout(B_HORIZONTAL);
- statusLayout->SetInsets(10, statusBox->TopBorderOffset() * 2 + 10, 10,
10);
- statusLayout->SetSpacing(10);
- statusBox->SetLayout(statusLayout);
- mainLayout->AddView(statusBox);
-
- fStatusView = new StatusView(BRect(0, 0, 5, 5), false, fStorage);
- fStatusView->ShowPopUpMenu(false);
-
- fInstallButton = new BButton("installButton",
- B_TRANSLATE("Install replicant into Deskbar"),
- new BMessage(kInstallIntoDeskbar));
-
- statusLayout->AddView(fStatusView);
- statusLayout->AddItem(BSpaceLayoutItem::CreateGlue());
- statusLayout->AddView(fInstallButton);
-}
-
-
-void
-CPUFrequencyView::MessageReceived(BMessage* message)
-{
- freq_preferences* pref = fStorage->GetPreferences();
- bool configChanged = false;
-
- switch (message->what) {
- case kUpdatedPreferences:
- fStatusView->MessageReceived(message);
- if (pref->mode == DYNAMIC) {
- fColorStepView->SetEnabled(true);
- fIntegrationTime->SetEnabled(true);
- }
- else {
- fColorStepView->SetEnabled(false);
- fIntegrationTime->SetEnabled(false);
- }
- configChanged = true;
- break;
-
- case kSteppingChanged:
- // from ColorStepView
- pref->stepping_threshold =
fColorStepView->GetSliderPosition();
- fStorage->SavePreferences();
- configChanged = true;
- break;
-
- case kIntegrationTimeChanged:
- _ReadIntegrationTime();
- fStorage->SavePreferences();
- configChanged = true;
- break;
-
- case kInstallIntoDeskbar:
- _InstallReplicantInDeskbar();
- break;
-
- case kRevertMsg:
- case kDefaultMsg:
- fStatusView->UpdateCPUFreqState();
- _UpdateViews();
- break;
- default:
- BView::MessageReceived(message);
[ *** diff truncated: 2384 lines dropped *** ]
############################################################################
Commit: a04b7d9f96772b54819061e3716f1e273526a84c
Author: Pawel Dziepak <pdziepak@xxxxxxxxxxx>
Date: Fri Nov 22 04:30:14 2013 UTC
power: Remove old cpufreq interface
----------------------------------------------------------------------------
Other related posts:
- » [haiku-commits] BRANCH pdziepak-github.scheduler [a04b7d9] src/preferences/cpufrequency src/add-ons/kernel/drivers/power/enhanced_speedstep data/catalogs/preferences/cpufrequency - pdziepak-github . scheduler
