cpu: OS split

diff --git a/Makefile b/Makefile
index 85eeabae4d1e47ada2bb09c66b265a54dd5f2ec1..dee5a4baf3951cb772ec9f4771dad4e60985fa95 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ include config.mk
 REQ = util
 COM =\
        components/$(OS)/battery \
-       components/cpu\
+       components/$(OS)/cpu \
        components/datetime\
        components/disk\
        components/entropy\

diff --git a/components/cpu.c b/components/Linux/cpu.c
similarity index 75%
rename from components/cpu.c
rename to components/Linux/cpu.c
index 11e2e984469013dc6dc7da58e33a2ac922312768..bfc204cd911697e131b2bc14ff54fd812fe951be 100644 (file)
--- a/components/cpu.c
+++ b/components/Linux/cpu.c
@@ -2,13 +2,9 @@
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
-#if defined(__OpenBSD__)
-#include <sys/sysctl.h>
-#endif
 
-#include "../util.h"
+#include "../../util.h"
 
-#if defined(__linux__)
 const char *
 cpu_freq(void)
 {
@@ -66,23 +62,3 @@ cpu_iowait(void)
 
        return bprintf("%d", perc);
 }
-#elif defined(__OpenBSD__)
-const char *
-cpu_freq(void)
-{
-       int freq, mib[2];
-       size_t size;
-
-       mib[0] = CTL_HW;
-       mib[1] = HW_CPUSPEED;
-
-       size = sizeof(freq);
-
-       if (sysctl(mib, 2, &freq, &size, NULL, 0) == -1) {
-               fprintf(stderr, "sysctl 'HW_CPUSPEED': %s\n", strerror(errno));
-               return NULL;
-       }
-
-       return bprintf("%d", freq);
-}
-#endif

diff --git a/components/OpenBSD/cpu.c b/components/OpenBSD/cpu.c
new file mode 100644 (file)
index 0000000..11f1812
--- /dev/null
+++ b/components/OpenBSD/cpu.c
@@ -0,0 +1,26 @@
+/* See LICENSE file for copyright and license details. */
+#include <errno.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/sysctl.h>
+
+#include "../../util.h"
+
+const char *
+cpu_freq(void)
+{
+       int freq, mib[2];
+       size_t size;
+
+       mib[0] = CTL_HW;
+       mib[1] = HW_CPUSPEED;
+
+       size = sizeof(freq);
+
+       if (sysctl(mib, 2, &freq, &size, NULL, 0) == -1) {
+               fprintf(stderr, "sysctl 'HW_CPUSPEED': %s\n", strerror(errno));
+               return NULL;
+       }
+
+       return bprintf("%d", freq);
+}