Changeset 5879

Timestamp:

11/03/10 14:00:59 (19 months ago)

Author:

khali

Message:

libsensors: Add support for intrusion detection.

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• doc/libsensors-API.txt (modified) (1 diff)
• lib/Module.mk (modified) (1 diff)
• lib/sensors.h (modified) (3 diffs)
• lib/sysfs.c (modified) (7 diffs)

lm-sensors/trunk/CHANGES

@@ -4 +4 @@
 SVN HEAD
   Makefile: Check for bison and flex
+  libsensors: Add support for intrusion detection
   sensors: Display 3 decimal places in raw output
   sensors-detect: Improve LM90 and W83L771 detection

lm-sensors/trunk/doc/libsensors-API.txt

@@ -6 +6 @@
 authors can quickly figure out how to test for the availability of a
 given new feature.
+
+0x431   lm-sensors SVN
+* Added support for intrusion detection
+  enum sensors_feature_type SENSORS_FEATURE_INTRUSION
+  enum sensors_subfeature_type SENSORS_SUBFEATURE_INTRUSION_ALARM
+  enum sensors_subfeature_type SENSORS_SUBFEATURE_INTRUSION_BEEP
 
 0x430   lm-sensors 3.2.0

lm-sensors/trunk/lib/Module.mk

@@ -34 +34 @@
 # the public header files - in this case they are error.h and sensors.h.
 LIBMAINVER := 4
-LIBMINORVER := 3.0
+LIBMINORVER := 3.1
 LIBVER := $(LIBMAINVER).$(LIBMINORVER)
 

lm-sensors/trunk/lib/sensors.h

@@ -2 +2 @@
     sensors.h - Part of libsensors, a Linux library for reading sensor data.
     Copyright (c) 1998, 1999  Frodo Looijaard <frodol@dds.nl>
-    Copyright (C) 2007        Jean Delvare <khali@linux-fr.org>
+    Copyright (C) 2007, 2010  Jean Delvare <khali@linux-fr.org>
 
     This library is free software; you can redistribute it and/or
@@ -142 +142 @@
         SENSORS_FEATURE_CURR            = 0x05,
         SENSORS_FEATURE_VID             = 0x10,
+        SENSORS_FEATURE_INTRUSION       = 0x11,
         SENSORS_FEATURE_BEEP_ENABLE     = 0x18,
         SENSORS_FEATURE_UNKNOWN         = INT_MAX,
@@ -198 +199 @@
 
         SENSORS_SUBFEATURE_VID = SENSORS_FEATURE_VID << 8,
+
+        SENSORS_SUBFEATURE_INTRUSION_ALARM = SENSORS_FEATURE_INTRUSION << 8,
+        SENSORS_SUBFEATURE_INTRUSION_BEEP,
 
         SENSORS_SUBFEATURE_BEEP_ENABLE = SENSORS_FEATURE_BEEP_ENABLE << 8,

lm-sensors/trunk/lib/sysfs.c

@@ -2 +2 @@
     sysfs.c - Part of libsensors, a library for reading Linux sensor data
     Copyright (c) 2005 Mark M. Hoffman <mhoffman@lightlink.com>
-    Copyright (C) 2007-2008 Jean Delvare <khali@linux-fr.org>
+    Copyright (C) 2007-2010 Jean Delvare <khali@linux-fr.org>
 
     This library is free software; you can redistribute it and/or
@@ -138 +138 @@
 
 #define MAX_MAIN_SENSOR_TYPES   6
-#define MAX_OTHER_SENSOR_TYPES  1
+#define MAX_OTHER_SENSOR_TYPES  2
 #define MAX_SENSORS_PER_TYPE    24
 #define MAX_SUBFEATURES         8
@@ -144 +144 @@
 #define FEATURE_TYPE_SIZE       (MAX_SENSORS_PER_TYPE * FEATURE_SIZE)
 
-/* Room for all 6 main types (in, fan, temp, power, energy, current) and 1
-   other type (VID) with all their subfeatures + misc features */
+/* Room for all 6 main types (in, fan, temp, power, energy, current) and 2
+   other types (VID, intrusion) with all their subfeatures + misc features */
 #define SUB_OFFSET_OTHER        (MAX_MAIN_SENSOR_TYPES * FEATURE_TYPE_SIZE)
 #define SUB_OFFSET_MISC         (SUB_OFFSET_OTHER + \
@@ -191 +191 @@
         case SENSORS_FEATURE_ENERGY:
         case SENSORS_FEATURE_CURR:
+        case SENSORS_FEATURE_INTRUSION:
                 underscore = strchr(sfname, '_');
                 name = strndup(sfname, underscore - sfname);
@@ -290 +291 @@
 };
 
+static const struct subfeature_type_match intrusion_matches[] = {
+        { "alarm", SENSORS_SUBFEATURE_INTRUSION_ALARM },
+        { "beep", SENSORS_SUBFEATURE_INTRUSION_BEEP },
+        { NULL, 0 }
+};
 static struct feature_type_match matches[] = {
         { "temp%d%c", temp_matches },
@@ -298 +304 @@
         { "curr%d%c", curr_matches },
         { "energy%d%c", energy_matches },
+        { "intrusion%d%c", intrusion_matches },
 };
 
@@ -412 +419 @@
                 switch (ftype) {
                 case SENSORS_FEATURE_VID:
+                case SENSORS_FEATURE_INTRUSION:
                         i = SUB_OFFSET_OTHER +
                             (ftype - SENSORS_FEATURE_VID) * FEATURE_TYPE_SIZE +