Changeset 1243

Timestamp:

11/19/01 21:29:27 (7 years ago)

Author:

mds

Message:

new pcf8591 driver, patch from

Aurelien Jarno <aurelien.jarno@insa-lyon.fr>

Files:

• lm-sensors/trunk/CHANGES (modified) (1 diff)
• lm-sensors/trunk/CONTRIBUTORS (modified) (1 diff)
• lm-sensors/trunk/README (modified) (4 diffs)
• lm-sensors/trunk/doc/chips/SUMMARY (modified) (1 diff)
• lm-sensors/trunk/doc/chips/pcf8591 (added)
• lm-sensors/trunk/etc/sensors.conf.eg (modified) (1 diff)
• lm-sensors/trunk/kernel/chips/Module.mk (modified) (1 diff)
• lm-sensors/trunk/kernel/chips/pcf8591.c (added)
• lm-sensors/trunk/lib/chips.c (modified) (2 diffs)
• lm-sensors/trunk/lib/chips.h (modified) (1 diff)
• lm-sensors/trunk/prog/detect/sensors-detect (modified) (3 diffs)
• lm-sensors/trunk/prog/sensors/chips.c (modified) (1 diff)
• lm-sensors/trunk/prog/sensors/chips.h (modified) (1 diff)
• lm-sensors/trunk/prog/sensors/main.c (modified) (1 diff)

lm-sensors/trunk/CHANGES

@@ -17 +17 @@
-
------------------------------------------------------------------------------
+
+2.6.3 (2001????)
+  Library: Add PCF8591 support
+  Module pcf8591: new
+  Program sensors: Add PCF8591 support
+  Program sensors-detect: Add several Nvidia chips, add PCF8591
+
-
-2.6.2 (20011118)

lm-sensors/trunk/CONTRIBUTORS

@@ -65 +65 @@
-* Hermann Jung <hej@odn.de>
-  Author of the fscpos driver.
+* Aurelien Jarno <aurelien.jarno@laposte.net>
+  Author of the pcf8591 driver.

lm-sensors/trunk/README

@@ -19 +19 @@
-be the first to profit from new drivers and other changes. Have fun!
-
-
+may 
-EVEN IF your kernel does contain i2c support!!!!!!!!!,
-unless i2c came bundled with lm_sensors.
-
-Kernels 2.3.34 and later, and all 2.4.x kernels, contain the
-
-
+
+
+
-
-See the lm_sensors download page for guidance:
@@ -53 +54 @@
-  Dallas Semiconductor DS75, DS1621, DS1625, DS1775, and DS1780
-  Hewlett Packard Maxilife (several revisions including '99 NBA)
- Chip
+, Scylla
-  Genesys Logic GL518SM (rev 00, 80), GL520SM, GL523SM
-  Intel Xeon processor embedded sensors
@@ -74 +75 @@
-  Intel Xeon processor embedded EEPROMs
-  DDC Monitor embedded EEPROMs
+  Philips Semiconductors PCF8591  
+
+
+See our New Drivers page http://www.lm-sensors.nu/~lm78/newdrivers.html
+for the latest information on supported devices.
-
-
@@ -79 +85 @@
-chip listed on our 'new drivers' page, and are willing to help us out,
-please contact us. Even if you have no programming knowledge, you could
- 
+
-If you want to offer more substantial help, this is very welcome too, of
-course.

lm-sensors/trunk/doc/chips/SUMMARY

@@ -162 +162 @@
-        Simple eight-bit parallel I/O
-
+pcf8591
+        Quad A/D + one D/A
+
-
------------------------------------------------------------------------------

lm-sensors/trunk/etc/sensors.conf.eg

@@ -1175 +1175 @@
-    label voltbatt    "+3.3V"
-
+
+chip "pcf8591-*"
+#
+#    values for the Philips PCF8574 chip
+#
+# Analog inputs
+
+   ignore ain_conf
+   set    ain_conf    0
+   label  ch0         "Chan. 0"
+   label  ch1         "Chan. 1"
+   label  ch2         "Chan. 2"
+   label  ch3         "Chan. 3"
+
+# Analog output
+
+   ignore aout_enable
+   set    aout_enable 1
+   label  aout        "Output"
+   set    aout        0
+

lm-sensors/trunk/kernel/chips/Module.mk

@@ -25 +25 @@
-# defined value verbatim into the command-list of rules...
-# These targets are NOT included in 'mkpatch' ...
-
+$(MODULE_DIR)/pcf8591.o
-
-# These targets ARE included in 'mkpatch', except for LTC1710, which we

lm-sensors/trunk/lib/chips.c

@@ -2454 +2454 @@
-  };
-
+  static sensors_chip_feature pcf8591_features[] =
+  {
+    { SENSORS_PCF8591_AIN_CONF, "ain_conf", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,
+                              SENSORS_MODE_RW, PCF8591_SYSCTL_AIN_CONF, VALUE(1), 0 },
+    { SENSORS_PCF8591_CH0, "ch0", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,
+                         SENSORS_MODE_R, PCF8591_SYSCTL_CH0, VALUE(1), 0 },
+    { SENSORS_PCF8591_CH1, "ch1", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,
+                         SENSORS_MODE_R, PCF8591_SYSCTL_CH1, VALUE(1), 0 },
+    { SENSORS_PCF8591_CH2, "ch2", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,
+                         SENSORS_MODE_R, PCF8591_SYSCTL_CH2, VALUE(1), 0 },
+    { SENSORS_PCF8591_CH3, "ch3", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,
+                         SENSORS_MODE_R, PCF8591_SYSCTL_CH3, VALUE(1), 0 },
+    { SENSORS_PCF8591_AOUT_ENABLE, "aout_enable", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,
+                                 SENSORS_MODE_RW, PCF8591_SYSCTL_AOUT_ENABLE, VALUE(1), 0 },
+    { SENSORS_PCF8591_AOUT, "aout", SENSORS_NO_MAPPING, SENSORS_NO_MAPPING,
+                          SENSORS_MODE_RW, PCF8591_SYSCTL_AOUT, VALUE(1), 0 },
+    { 0 }
+  };
+
+
-sensors_chip_features sensors_chip_features_list[] =
-{
@@ -2503 +2523 @@
- { SENSORS_FSCPOS_PREFIX, fscpos_features },
- { SENSORS_FSCSCY_PREFIX, fscscy_features },
+ { SENSORS_PCF8591_PREFIX, pcf8591_features }, 
- { 0 }
-};

lm-sensors/trunk/lib/chips.h

@@ -1114 +1114 @@
-#define SENSORS_FSCSCY_WDOG_CONTROL 52 /* RW */
-
+/* PCF8591 chip. */
+
+#define SENSORS_PCF8591_PREFIX "pcf8591"
+
+#define SENSORS_PCF8591_AIN_CONF 1 /* RW */
+#define SENSORS_PCF8591_CH0 2 /* R */
+#define SENSORS_PCF8591_CH1 3 /* R */
+#define SENSORS_PCF8591_CH2 4 /* R */
+#define SENSORS_PCF8591_CH3 5 /* R */
+#define SENSORS_PCF8591_AOUT_ENABLE 6 /* RW */
+#define SENSORS_PCF8591_AOUT 7 /* RW */
-
-

lm-sensors/trunk/prog/detect/sensors-detect

@@ -519 +519 @@
-            via686a_isa_detect adm1022_detect ltc1710_detect gl525sm_detect
-            lm87_detect ite_detect ite_isa_detect ite_alias_detect
-
+
+
-
-# This is a list of all recognized chips. 
@@ -806 +807 @@
-       i2c_addrs => [0x73],
-       i2c_detect => sub { fscscy_detect @_ },
+     },
+     {
+       name => "Philips Semiconductors PCF8591",
+       driver => "pcf8591",
+       i2c_addrs => [0x48..0x4f],
+       i2c_detect => sub { pcf8591_detect @_},
-     },
-);
@@ -2329 +2336 @@
-}
-
+# $_[0]: A reference to the file descriptor to access this chip.
+#        We may assume an i2c_set_slave_addr was already done.
+# $_[1]: Address
+# Returns: undef if not detected, (1) if detected.
+# Detection is impossible!
+sub pcf8591_detect
+{
+  return (1);
+}
+
+
-################
-# MAIN PROGRAM #

lm-sensors/trunk/prog/sensors/chips.c

@@ -2928 +2928 @@
-}
-
+void print_pcf8591(const sensors_chip_name *name)
+{
+  char *label;
+  double ain_conf, ch0, ch1, ch2, ch3;
+  double aout_enable, aout;
+  int valid;
+
+  if (!sensors_get_label_and_valid(*name,SENSORS_PCF8591_AIN_CONF,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_PCF8591_AIN_CONF,&ain_conf)) {
+        if (valid) {
+          print_label(label,10);
+          switch ((int)ain_conf)
+          {
+            case 0: printf("four single ended inputs\n");
+                    break;
+            case 1: printf("three differential inputs\n");
+                    break;
+            case 2: printf("single ended and differential mixed\n");
+                    break;
+            case 3: printf("two differential inputs\n");
+                    break;
+          }
+        }
+      }
+  else printf("ERROR: Can't read analog inputs configuration!\n");
+  free_the_label(&label);
+
+  if (!sensors_get_label_and_valid(*name,SENSORS_PCF8591_CH0,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_PCF8591_CH0,&ch0)) {
+        if (valid) {
+          print_label(label,10);
+          printf("%0.0f\n", ch0);
+        }
+      }
+  else printf("ERROR: Can't read ch0!\n");
+  free_the_label(&label);
+
+  if (!sensors_get_label_and_valid(*name,SENSORS_PCF8591_CH1,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_PCF8591_CH1,&ch1)) {
+        if (valid) {
+          print_label(label,10);
+          printf("%0.0f\n", ch1);
+        }
+      }
+  else printf("ERROR: Can't read ch1!\n");
+  free_the_label(&label);
+
+  if (ain_conf != 3) {
+    if (!sensors_get_label_and_valid(*name,SENSORS_PCF8591_CH2,&label,&valid) &&
+        !sensors_get_feature(*name,SENSORS_PCF8591_CH2,&ch2)) {
+          if (valid) {
+            print_label(label,10);
+            printf("%0.0f\n", ch2);
+          }
+        }
+    else printf("ERROR: Can't read ch2!\n");
+    free_the_label(&label);
+  }
+
+  if (ain_conf == 0) {
+    if (!sensors_get_label_and_valid(*name,SENSORS_PCF8591_CH3,&label,&valid) &&
+        !sensors_get_feature(*name,SENSORS_PCF8591_CH3,&ch3)) {
+          if (valid) {
+            print_label(label,10);
+            printf("%0.0f\n", ch3);
+          }
+        }
+    else printf("ERROR: Can't read ch3!\n");
+    free_the_label(&label);
+  }
+
+  if (!sensors_get_label_and_valid(*name,SENSORS_PCF8591_AOUT,&label,&valid) &&
+      !sensors_get_feature(*name,SENSORS_PCF8591_AOUT,&aout) &&
+      !sensors_get_feature(*name,SENSORS_PCF8591_AOUT_ENABLE,&aout_enable)) {
+        if (valid) {
+          print_label(label,10);
+          printf("%0.0f (%s)\n", aout, aout_enable?"enabled":"disabled");
+        }
+      }
+  else printf("ERROR: Can't read aout!\n");
+  free_the_label(&label);
+
+}
+
+
-void print_unknown_chip(const sensors_chip_name *name)
-{

lm-sensors/trunk/prog/sensors/chips.h

@@ -45 +45 @@
-extern void print_fscpos(const sensors_chip_name *name);
-extern void print_fscscy(const sensors_chip_name *name);
+extern void print_pcf8591(const sensors_chip_name *name);
-
-#endif /* def PROG_SENSORS_CHIPS_H */

lm-sensors/trunk/prog/sensors/main.c

@@ -338 +338 @@
-  else if (!strcmp(name.prefix,"fscscy"))
-    print_fscscy(&name);
+  else if (!strcmp(name.prefix,"pcf8591"))
+    print_pcf8591(&name);
-  else
-    print_unknown_chip(&name);