diff options
Diffstat (limited to 'cpufreq/src/cpufreq-monitor-factory.c')
| -rw-r--r-- | cpufreq/src/cpufreq-monitor-factory.c | 42 |
1 files changed, 20 insertions, 22 deletions
diff --git a/cpufreq/src/cpufreq-monitor-factory.c b/cpufreq/src/cpufreq-monitor-factory.c index c7942cba..0c809671 100644 --- a/cpufreq/src/cpufreq-monitor-factory.c +++ b/cpufreq/src/cpufreq-monitor-factory.c @@ -28,41 +28,39 @@ #include "cpufreq-applet.h" #include "cpufreq-utils.h" -#include "cpufreq-monitor-sysfs.h" -#include "cpufreq-monitor-procfs.h" -#include "cpufreq-monitor-cpuinfo.h" +#include "cpufreq-monitor-factory.h" #ifdef HAVE_LIBCPUFREQ #include "cpufreq-monitor-libcpufreq.h" +#else +#include "cpufreq-monitor-sysfs.h" +#include "cpufreq-monitor-cpuinfo.h" #endif -#include "cpufreq-monitor-factory.h" CPUFreqMonitor * cpufreq_monitor_factory_create_monitor (guint cpu) { #ifdef HAVE_LIBCPUFREQ - return cpufreq_monitor_libcpufreq_new (cpu); + return cpufreq_monitor_libcpufreq_new (cpu); #else - CPUFreqMonitor *monitor = NULL; + CPUFreqMonitor *monitor = NULL; - if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.6 kernel */ - monitor = cpufreq_monitor_sysfs_new (cpu); - } else if (g_file_test ("/proc/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.4 kernel (Deprecated)*/ - monitor = cpufreq_monitor_procfs_new (cpu); - } else if (g_file_test ("/proc/cpuinfo", G_FILE_TEST_EXISTS)) { - /* If there is no cpufreq support it shows only the cpu frequency, - * I think is better than do nothing. I have to notify it to the user, because - * he could think that cpufreq is supported but it doesn't work succesfully - */ + if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { + monitor = cpufreq_monitor_sysfs_new (cpu); + } else if (g_file_test ("/proc/cpuinfo", G_FILE_TEST_EXISTS)) { + /* If there is no cpufreq support it shows only the cpu frequency, + * I think is better than do nothing. I have to notify it to the user, because + * he could think that cpufreq is supported but it doesn't work succesfully + */ - cpufreq_utils_display_error (_("CPU frequency scaling unsupported"), - _("You will not be able to modify the frequency of your machine. " - "Your machine may be misconfigured or not have hardware support " - "for CPU frequency scaling.")); + cpufreq_utils_display_error (_("CPU frequency scaling unsupported"), + _("You will not be able to modify the frequency of your machine. " + "Your machine may be misconfigured or not have hardware support " + "for CPU frequency scaling.")); - monitor = cpufreq_monitor_cpuinfo_new (cpu); - } + monitor = cpufreq_monitor_cpuinfo_new (cpu); + } - return monitor; + return monitor; #endif } |