projects
/
psensor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merged from plib
[psensor.git]
/
src
/
lib
/
hdd_atasmart.c
diff --git
a/src/lib/hdd_atasmart.c
b/src/lib/hdd_atasmart.c
index
3943fa3
..
3606c8e
100644
(file)
--- a/
src/lib/hdd_atasmart.c
+++ b/
src/lib/hdd_atasmart.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2010-201
2
jeanfi@gmail.com
+ * Copyright (C) 2010-201
4
jeanfi@gmail.com
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
@@
-16,6
+16,9
@@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301 USA
*/
+#define _LARGEFILE_SOURCE 1
+#include "config.h"
+
#include <locale.h>
#include <libintl.h>
#define _(str) gettext(str)
#include <locale.h>
#include <libintl.h>
#define _(str) gettext(str)
@@
-34,7
+37,7
@@
#include "pio.h"
#include "hdd.h"
#include "pio.h"
#include "hdd.h"
-#include
"log.h"
+#include
<plog.h>
static int filter_sd(const char *p)
{
static int filter_sd(const char *p)
{
@@
-45,9
+48,14
@@
static struct psensor *
create_sensor(char *id, char *name, SkDisk *disk, int values_max_length)
{
struct psensor *s;
create_sensor(char *id, char *name, SkDisk *disk, int values_max_length)
{
struct psensor *s;
+ int t;
+
+ t = SENSOR_TYPE_ATASMART | SENSOR_TYPE_HDD | SENSOR_TYPE_TEMP;
+
s = psensor_create(id,
strdup(name),
s = psensor_create(id,
strdup(name),
- SENSOR_TYPE_HDD_TEMP_ATASMART,
+ strdup("HDD"),
+ t,
values_max_length);
s->disk = disk;
values_max_length);
s->disk = disk;
@@
-164,7
+172,8
@@
void hdd_psensor_list_update(struct psensor **sensors)
cur = sensors;
while (*cur) {
s = *cur;
cur = sensors;
while (*cur) {
s = *cur;
- if (s->type == SENSOR_TYPE_HDD_TEMP_ATASMART) {
+ if (!(s->type & SENSOR_TYPE_REMOTE)
+ && s->type & SENSOR_TYPE_ATASMART) {
ret = sk_disk_smart_read_data(s->disk);
if (!ret) {
ret = sk_disk_smart_read_data(s->disk);
if (!ret) {