X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fpsensor.h;h=4946b5de7a0a96150a1c6848c062713ba12c2d49;hb=af47d522aa7957879bd87a44a416bb25544ed9f5;hp=c2cb08c989d236badaac62d98dba0dcba366004b;hpb=7d2e20bb6ca3d7cb709bd8eeb000909e1ae25176;p=psensor.git

diff --git a/src/lib/psensor.h b/src/lib/psensor.h
index c2cb08c..4946b5d 100644
--- a/src/lib/psensor.h
+++ b/src/lib/psensor.h
@@ -1,29 +1,33 @@
 /*
-    Copyright (C) 2010-2011 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 published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301 USA
-*/
-
+ * Copyright (C) 2010-2012 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
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ */
 #ifndef _PSENSOR_PSENSOR_H_
 #define _PSENSOR_PSENSOR_H_
 
 #include "config.h"
 #include <sensors/sensors.h>
 
+#ifdef HAVE_ATASMART
+#include <atasmart.h>
+#endif
+
 #include "color.h"
+#include "log.h"
 #include "measure.h"
 
 enum psensor_type {
@@ -31,10 +35,20 @@ enum psensor_type {
 	SENSOR_TYPE_FAN = 0x0002,
 	SENSOR_TYPE_REMOTE = 0x0004,
 
-	SENSOR_TYPE_LMSENSOR_TEMP = 0x0100 | SENSOR_TYPE_TEMP,
-	SENSOR_TYPE_NVIDIA = 0x0200 | SENSOR_TYPE_TEMP,
+	SENSOR_TYPE_LMSENSOR = 0x0100,
+	SENSOR_TYPE_NVIDIA_TEMP = 0x0200 | SENSOR_TYPE_TEMP,
 	SENSOR_TYPE_HDD_TEMP = 0x0400 | SENSOR_TYPE_TEMP,
-	SENSOR_TYPE_LMSENSOR_FAN = 0x0800 | SENSOR_TYPE_FAN
+	SENSOR_TYPE_CPU_USAGE = 0x0800,
+	SENSOR_TYPE_AMD = 0x1000,
+
+	SENSOR_TYPE_HDD_TEMP_ATASMART = 0x2000 | SENSOR_TYPE_HDD_TEMP,
+	SENSOR_TYPE_HDD_TEMP_HDDTEMP = 0x4000 | SENSOR_TYPE_HDD_TEMP,
+
+	SENSOR_TYPE_AMD_TEMP = SENSOR_TYPE_AMD | SENSOR_TYPE_TEMP,
+	SENSOR_TYPE_AMD_FAN = SENSOR_TYPE_AMD | SENSOR_TYPE_FAN,
+
+	SENSOR_TYPE_LMSENSOR_TEMP = SENSOR_TYPE_LMSENSOR | SENSOR_TYPE_TEMP,
+	SENSOR_TYPE_LMSENSOR_FAN = SENSOR_TYPE_LMSENSOR | SENSOR_TYPE_FAN
 };
 
 struct psensor {
@@ -91,9 +105,15 @@ struct psensor {
 	/* Nvidia id for the nvctrl */
 	int nvidia_id;
 #endif
+#ifdef HAVE_LIBATIADL
+	/* AMD id for the aticonfig */
+	int amd_id;
+#endif
+#ifdef HAVE_ATASMART
+	SkDisk *disk;
+#endif
 
 	char *url;
-
 };
 
 struct psensor *psensor_create(char *id,
@@ -160,4 +180,10 @@ const char *psensor_type_to_unit_str(unsigned int type);
 
 void psensor_list_update_measures(struct psensor **sensors);
 
+void psensor_init();
+
+void psensor_cleanup();
+
+double get_max_value(struct psensor **sensors, int type);
+
 #endif