Changeset 1705 for lm-sensors/trunk/kernel/chips/fscscy.c

Timestamp:

01/21/03 21:01:27 (10 years ago)

Author:

kmalkki

Message:

(Kyösti) Cleanups

Copy sysctl enums to chip drivers from sensors.h for now,
as seen in drivers included in 2.5 tree. File no longer included
from kernel side.

Apply i2c-proc change in CVS tagged -km2.

Partial clean and sort of includes everywhere.

Add i2c-dev.h, as a partial copy from i2c.
Add to sensors.h from i2c-proc.h to compile things.
Remove i2c-isa.h.

Reflect header file changes to lib/ and prog/.

Files:

• lm-sensors/trunk/kernel/chips/fscscy.c (modified) (6 diffs)

lm-sensors/trunk/kernel/chips/fscscy.c

@@ -26 +26 @@
 */
 
-#include <linux/version.h>
 #include <linux/module.h>
 #include <linux/slab.h>
@@ -32 +31 @@
 #include <linux/ioport.h>
 #include <linux/sysctl.h>
+#include <linux/types.h>
+#include <linux/i2c.h>
+#include <linux/i2c-proc.h>
+#include <linux/init.h>
 #include <asm/errno.h>
 #include <asm/io.h>
-#include <linux/types.h>
-#include <linux/i2c.h>
 #include "version.h"
-#include "sensors.h"
-#include <linux/init.h>
 
 MODULE_LICENSE("GPL");
@@ -198 +197 @@
                        unsigned short flags, int kind);
 static int fscscy_detach_client(struct i2c_client *client);
-static int fscscy_command(struct i2c_client *client, unsigned int cmd,
-                        void *arg);
 
 static int fscscy_read_value(struct i2c_client *client, u8 register);
@@ -235 +232 @@
         .attach_adapter = fscscy_attach_adapter,
         .detach_client  = fscscy_detach_client,
-        .command        = fscscy_command,
 };
 
 /* The /proc/sys entries */
+
+/* -- SENSORS SYSCTL START -- */
+#define FSCSCY_SYSCTL_VOLT0    1000       /* 12 volt supply */
+#define FSCSCY_SYSCTL_VOLT1    1001       /* 5 volt supply */
+#define FSCSCY_SYSCTL_VOLT2    1002       /* batterie voltage*/
+#define FSCSCY_SYSCTL_FAN0     1101       /* state, min, ripple, actual value fan 0 */
+#define FSCSCY_SYSCTL_FAN1     1102       /* state, min, ripple, actual value fan 1 */
+#define FSCSCY_SYSCTL_FAN2     1103       /* state, min, ripple, actual value fan 2 */
+#define FSCSCY_SYSCTL_FAN3     1104       /* state, min, ripple, actual value fan 3 */
+#define FSCSCY_SYSCTL_FAN4     1105       /* state, min, ripple, actual value fan 4 */
+#define FSCSCY_SYSCTL_FAN5     1106       /* state, min, ripple, actual value fan 5 */
+#define FSCSCY_SYSCTL_TEMP0    1201       /* state and value of sensor 0, cpu die */
+#define FSCSCY_SYSCTL_TEMP1    1202       /* state and value of sensor 1, motherboard */
+#define FSCSCY_SYSCTL_TEMP2    1203       /* state and value of sensor 2, chassis */
+#define FSCSCY_SYSCTL_TEMP3    1204       /* state and value of sensor 3, chassis */
+#define FSCSCY_SYSCTL_REV     2000        /* Revision */
+#define FSCSCY_SYSCTL_EVENT   2001        /* global event status */
+#define FSCSCY_SYSCTL_CONTROL 2002        /* global control byte */
+#define FSCSCY_SYSCTL_WDOG     2003       /* state, min, ripple, actual value fan 2 */
+#define FSCSCY_SYSCTL_PCILOAD  2004       /* PCILoad value */
+#define FSCSCY_SYSCTL_INTRUSION 2005      /* state, control for intrusion sensor */
+
+/* -- SENSORS SYSCTL END -- */
+
 /* These files are created for each detected FSCSCY. This is just a template;
    though at first sight, you might think we could use a statically
@@ -358 +378 @@
         /* Register a new directory entry with module sensors */
         if ((i = i2c_register_entry(new_client, type_name,
-                                        fscscy_dir_table_template,
-                                        THIS_MODULE)) < 0) {
+                                        fscscy_dir_table_template)) < 0) {
                 err = i;
                 goto ERROR4;
@@ -396 +415 @@
         return 0;
 }
-
-/* No commands defined yet */
-static int fscscy_command(struct i2c_client *client, unsigned int cmd, void *arg)
-{
-        return 0;
-}
-
 
 static int fscscy_read_value(struct i2c_client *client, u8 reg)