em/slstatus
1
0
Fork 0
Code Releases Activity

temperature: OS split

Browse Source
This commit is contained in:
Quentin Rameau 2018-04-30 15:14:37 +02:00 committed by Aaron Marcher
parent 72f5a0d69a
commit 71eb1d321d
3 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -21,7 +21,7 @@ COM =\
components/$(OS)/ram \ components/$(OS)/ram \
components/run_command\ components/run_command\
components/$(OS)/swap \ components/$(OS)/swap \
components/temperature\ components/$(OS)/temperature \
components/uptime\ components/uptime\
components/user\ components/user\
components/volume\ components/volume\

15
components/Linux/temperature.c Normal file
View File

@ -0,0 +1,15 @@
/* See LICENSE file for copyright and license details. */
#include <errno.h>
#include <stdio.h>
#include <string.h>
#include "../../util.h"
const char *
temp(const char *file)
{
int temp;
return (pscanf(file, "%d", &temp) == 1) ?
bprintf("%d", temp / 1000) : NULL;
}

15
components/temperature.c → components/OpenBSD/temperature.c
View File

@ -2,24 +2,12 @@
#include <errno.h> #include <errno.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#if defined(__OpenBSD__)
#include <sys/sysctl.h> #include <sys/sysctl.h>
#include <sys/time.h> #include <sys/time.h>
#include <sys/sensors.h> #include <sys/sensors.h>
#endif
#include "../util.h" #include "../../util.h"
#if defined(__linux__)
const char *
temp(const char *file)
{
int temp;
return (pscanf(file, "%d", &temp) == 1) ?
bprintf("%d", temp / 1000) : NULL;
}
#elif defined(__OpenBSD__)
const char * const char *
temp(const char *null) temp(const char *null)
{ {
@ -42,4 +30,3 @@ temp(const char *null)
return bprintf("%d", (temp.value - 273150000) / 1000000); /* kelvin to celsius */ return bprintf("%d", (temp.value - 273150000) / 1000000); /* kelvin to celsius */
} }
#endif