(mds) patch from Steffen Persvold <sp@scali.no>. Change function names,

etc. from LM87... to lm87...; rename /proc entries to standard
      in[0-5], etc.; also column 80 cleanup.


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@952 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Mark D. Studebaker committed 2000-12-16 15:42:02 +00:00
1 parent baf3d7fbdd
commit 6b26ed4118
1 file changed
+185 -178
+185 -178
View File
@@ -1,5 +1,5 @@
/*
LM87.c - Part of lm_sensors, Linux kernel modules for hardware
lm87.c - Part of lm_sensors, Linux kernel modules for hardware
monitoring
Copyright (c) 2000 Frodo Looijaard <frodol@dds.nl>
Philip Edelbrock <phil@netroedge.com>
@@ -53,7 +53,7 @@ static unsigned int normal_isa[] = { SENSORS_ISA_END };
static unsigned int normal_isa_range[] = { SENSORS_ISA_END };
/* Insmod parameters */
SENSORS_INSMOD_1(LM87);
SENSORS_INSMOD_1(lm87);
/* The following is the calculation for the register offset
* for the monitored items minimum and maximum locations.
@@ -84,7 +84,7 @@ SENSORS_INSMOD_1(LM87);
/* These are all read-only */
#define LM87_REG_2_5V_EXT_TEMP_2 0x20 /* front ambient for us */
#define LM87_REG_VCCP1 0x21 /* this will be CPU core voltage */
#define LM87_REG_VCCP1 0x21 /* CPU core voltage */
#define LM87_REG_3_3V 0x22
#define LM87_REG_5V 0x23
#define LM87_REG_12V 0x24
@@ -238,7 +238,7 @@ extern int cleanup_module(void);
data is pointed to by LM87_list[NR]->data. The structure itself is
dynamically allocated, at the same time when a new LM87 client is
allocated. */
struct LM87_data {
struct lm87_data {
int sysctl_id;
enum chips type;
@@ -272,59 +272,59 @@ static
#else
extern
#endif
int __init sensors_LM87_init(void);
static int __init LM87_cleanup(void);
int __init sensors_lm87_init(void);
static int __init lm87_cleanup(void);
static int LM87_attach_adapter(struct i2c_adapter *adapter);
static int LM87_detect(struct i2c_adapter *adapter, int address,
static int lm87_attach_adapter(struct i2c_adapter *adapter);
static int lm87_detect(struct i2c_adapter *adapter, int address,
unsigned short flags, int kind);
static int LM87_detach_client(struct i2c_client *client);
static int LM87_command(struct i2c_client *client, unsigned int cmd,
static int lm87_detach_client(struct i2c_client *client);
static int lm87_command(struct i2c_client *client, unsigned int cmd,
void *arg);
static void LM87_inc_use(struct i2c_client *client);
static void LM87_dec_use(struct i2c_client *client);
static void lm87_inc_use(struct i2c_client *client);
static void lm87_dec_use(struct i2c_client *client);
static int LM87_read_value(struct i2c_client *client, u8 register);
static int LM87_write_value(struct i2c_client *client, u8 register,
static int lm87_read_value(struct i2c_client *client, u8 register);
static int lm87_write_value(struct i2c_client *client, u8 register,
u8 value);
static void LM87_update_client(struct i2c_client *client);
static void LM87_init_client(struct i2c_client *client);
static void lm87_update_client(struct i2c_client *client);
static void lm87_init_client(struct i2c_client *client);
static void LM87_in(struct i2c_client *client, int operation,
static void lm87_in(struct i2c_client *client, int operation,
int ctl_name, int *nrels_mag, long *results);
static void LM87_fan(struct i2c_client *client, int operation,
static void lm87_fan(struct i2c_client *client, int operation,
int ctl_name, int *nrels_mag, long *results);
static void LM87_temp(struct i2c_client *client, int operation,
static void lm87_temp(struct i2c_client *client, int operation,
int ctl_name, int *nrels_mag, long *results);
static void LM87_alarms(struct i2c_client *client, int operation,
static void lm87_alarms(struct i2c_client *client, int operation,
int ctl_name, int *nrels_mag, long *results);
static void LM87_fan_div(struct i2c_client *client, int operation,
static void lm87_fan_div(struct i2c_client *client, int operation,
int ctl_name, int *nrels_mag, long *results);
static void LM87_analog_out(struct i2c_client *client, int operation,
static void lm87_analog_out(struct i2c_client *client, int operation,
int ctl_name, int *nrels_mag,
long *results);
static void LM87_vid(struct i2c_client *client, int operation,
static void lm87_vid(struct i2c_client *client, int operation,
int ctl_name, int *nrels_mag, long *results);
/* I choose here for semi-static LM87 allocation. Complete dynamic
allocation could also be used; the code needed for this would probably
take more memory than the datastructure takes now. */
static int LM87_id = 0;
static int lm87_id = 0;
static struct i2c_driver LM87_driver = {
static struct i2c_driver lm87_driver = {
/* name */ "LM87 sensor driver",
/* id */ I2C_DRIVERID_LM87,
/* flags */ I2C_DF_NOTIFY,
/* attach_adapter */ &LM87_attach_adapter,
/* detach_client */ &LM87_detach_client,
/* command */ &LM87_command,
/* inc_use */ &LM87_inc_use,
/* dec_use */ &LM87_dec_use
/* attach_adapter */ &lm87_attach_adapter,
/* detach_client */ &lm87_detach_client,
/* command */ &lm87_command,
/* inc_use */ &lm87_inc_use,
/* dec_use */ &lm87_dec_use
};
/* Used by LM87_init/cleanup */
static int __initdata LM87_initialized = 0;
/* Used by lm87_init/cleanup */
static int __initdata lm87_initialized = 0;
/* The /proc/sys entries */
/* These files are created for each detected LM87. This is just a template;
@@ -333,39 +333,42 @@ static int __initdata LM87_initialized = 0;
is done through one of the 'extra' fields which are initialized
when a new copy is allocated. */
static ctl_table LM87_dir_table_template[] = {
{LM87_SYSCTL_IN0, "2.5V", NULL, 0, 0644, NULL, &sensors_proc_real,
&sensors_sysctl_real, NULL, &LM87_in},
{LM87_SYSCTL_IN1, "cpu_volt", NULL, 0, 0644, NULL, &sensors_proc_real,
&sensors_sysctl_real, NULL, &LM87_in},
{LM87_SYSCTL_IN2, "3.3V", NULL, 0, 0644, NULL, &sensors_proc_real,
&sensors_sysctl_real, NULL, &LM87_in},
{LM87_SYSCTL_IN3, "5V", NULL, 0, 0644, NULL, &sensors_proc_real,
&sensors_sysctl_real, NULL, &LM87_in},
{LM87_SYSCTL_IN4, "12V", NULL, 0, 0644, NULL, &sensors_proc_real,
&sensors_sysctl_real, NULL, &LM87_in},
{LM87_SYSCTL_IN5, "Vccp2", NULL, 0, 0644, NULL, &sensors_proc_real,
&sensors_sysctl_real, NULL, &LM87_in},
{LM87_SYSCTL_FAN, "fan", NULL, 0, 0644, NULL, &sensors_proc_real,
&sensors_sysctl_real, NULL, &LM87_fan},
{LM87_SYSCTL_FRNT_TEMP, "front_amb_temp", NULL, 0, 0644, NULL, &sensors_proc_real,
&sensors_sysctl_real, NULL, &LM87_temp},
{LM87_SYSCTL_CPU_TEMP, "cpu_temp", NULL, 0, 0644, NULL, &sensors_proc_real,
&sensors_sysctl_real, NULL, &LM87_temp},
{LM87_SYSCTL_INT_TEMP, "int_temp", NULL, 0, 0644, NULL, &sensors_proc_real,
&sensors_sysctl_real, NULL, &LM87_temp},
{LM87_SYSCTL_FAN_DIV, "fan_div", NULL, 0, 0644, NULL, &sensors_proc_real,
&sensors_sysctl_real, NULL, &LM87_fan_div},
static ctl_table lm87_dir_table_template[] = {
{LM87_SYSCTL_IN0, "in0", NULL, 0, 0644, NULL, &sensors_proc_real,
&sensors_sysctl_real, NULL, &lm87_in},
{LM87_SYSCTL_IN1, "in1", NULL, 0, 0644, NULL, &sensors_proc_real,
&sensors_sysctl_real, NULL, &lm87_in},
{LM87_SYSCTL_IN2, "in2", NULL, 0, 0644, NULL, &sensors_proc_real,
&sensors_sysctl_real, NULL, &lm87_in},
{LM87_SYSCTL_IN3, "in3", NULL, 0, 0644, NULL, &sensors_proc_real,
&sensors_sysctl_real, NULL, &lm87_in},
{LM87_SYSCTL_IN4, "in4", NULL, 0, 0644, NULL, &sensors_proc_real,
&sensors_sysctl_real, NULL, &lm87_in},
{LM87_SYSCTL_IN5, "in5", NULL, 0, 0644, NULL, &sensors_proc_real,
&sensors_sysctl_real, NULL, &lm87_in},
{LM87_SYSCTL_FAN, "fan1", NULL, 0, 0644, NULL, &sensors_proc_real,
&sensors_sysctl_real, NULL, &lm87_fan},
{LM87_SYSCTL_FRNT_TEMP, "temp1", NULL,
0, 0644, NULL, &sensors_proc_real,
&sensors_sysctl_real, NULL, &lm87_temp},
{LM87_SYSCTL_CPU_TEMP, "temp2", NULL, 0, 0644, NULL, &sensors_proc_real,
&sensors_sysctl_real, NULL, &lm87_temp},
{LM87_SYSCTL_INT_TEMP, "temp3", NULL, 0, 0644, NULL, &sensors_proc_real,
&sensors_sysctl_real, NULL, &lm87_temp},
{LM87_SYSCTL_FAN_DIV, "fan_div", NULL,
0, 0644, NULL, &sensors_proc_real,
&sensors_sysctl_real, NULL, &lm87_fan_div},
{LM87_SYSCTL_ALARMS, "alarms", NULL, 0, 0444, NULL, &sensors_proc_real,
&sensors_sysctl_real, NULL, &LM87_alarms},
{LM87_SYSCTL_ANALOG_OUT, "analog_out", NULL, 0, 0644, NULL, &sensors_proc_real,
&sensors_sysctl_real, NULL, &LM87_analog_out},
&sensors_sysctl_real, NULL, &lm87_alarms},
{LM87_SYSCTL_ANALOG_OUT, "analog_out", NULL,
0, 0644, NULL, &sensors_proc_real,
&sensors_sysctl_real, NULL, &lm87_analog_out},
{LM87_SYSCTL_VID, "vid", NULL, 0, 0444, NULL, &sensors_proc_real,
&sensors_sysctl_real, NULL, &LM87_vid},
&sensors_sysctl_real, NULL, &lm87_vid},
{0}
};
int LM87_attach_adapter(struct i2c_adapter *adapter)
int lm87_attach_adapter(struct i2c_adapter *adapter)
{
int error;
struct i2c_client_address_data lm87_client_data;
@@ -378,18 +381,18 @@ int LM87_attach_adapter(struct i2c_adapter *adapter)
lm87_client_data.ignore_range = addr_data.ignore_range;
lm87_client_data.force = addr_data.forces->force;
error = i2c_probe(adapter, &lm87_client_data, LM87_detect);
sensors_detect(adapter, &addr_data, LM87_detect);
error = i2c_probe(adapter, &lm87_client_data, lm87_detect);
sensors_detect(adapter, &addr_data, lm87_detect);
return error;
}
static int LM87_detect(struct i2c_adapter *adapter, int address,
static int lm87_detect(struct i2c_adapter *adapter, int address,
unsigned short flags, int kind)
{
int i;
struct i2c_client *new_client;
struct LM87_data *data;
struct lm87_data *data;
int err = 0;
const char *type_name = "";
const char *client_name = "";
@@ -402,33 +405,33 @@ static int LM87_detect(struct i2c_adapter *adapter, int address,
But it allows us to access LM87_{read,write}_value. */
if (!(new_client = kmalloc(sizeof(struct i2c_client) +
sizeof(struct LM87_data),
sizeof(struct lm87_data),
GFP_KERNEL))) {
err = -ENOMEM;
goto ERROR0;
}
data = (struct LM87_data *) (new_client + 1);
data = (struct lm87_data *) (new_client + 1);
new_client->addr = address;
new_client->data = data;
new_client->adapter = adapter;
new_client->driver = &LM87_driver;
new_client->driver = &lm87_driver;
new_client->flags = 0;
/* Now, we do the remaining detection. */
if (kind < 0) {
if ((LM87_read_value(new_client, LM87_REG_CONFIG) & 0x80) != 0x00)
if ((lm87_read_value(new_client, LM87_REG_CONFIG) & 0x80) != 0x00)
goto ERROR1;
}
/* Fill in the remaining client fields and put it into the global list */
type_name = "LM87";
/* Fill in the remaining client fields and put into the global list */
type_name = "lm87";
client_name = "LM87 chip";
strcpy(new_client->name, client_name);
data->type = kind;
new_client->id = LM87_id++;
new_client->id = lm87_id++;
data->valid = 0;
init_MUTEX(&data->update_lock);
@@ -439,7 +442,7 @@ static int LM87_detect(struct i2c_adapter *adapter, int address,
/* Register a new directory entry with module sensors */
if ((i = sensors_register_entry(new_client,
type_name,
LM87_dir_table_template,
lm87_dir_table_template,
THIS_MODULE)) < 0) {
err = i;
goto ERROR4;
@@ -447,7 +450,7 @@ static int LM87_detect(struct i2c_adapter *adapter, int address,
data->sysctl_id = i;
/* Initialize the LM87 chip */
LM87_init_client(new_client);
lm87_init_client(new_client);
return 0;
/* OK, this is not exactly good programming practice, usually. But it is
@@ -462,16 +465,16 @@ static int LM87_detect(struct i2c_adapter *adapter, int address,
return err;
}
int LM87_detach_client(struct i2c_client *client)
int lm87_detach_client(struct i2c_client *client)
{
int err;
sensors_deregister_entry(((struct LM87_data *) (client->data))->
sensors_deregister_entry(((struct lm87_data *) (client->data))->
sysctl_id);
if ((err = i2c_detach_client(client))) {
printk
("LM87.o: Client deregistration failed, client not detached.\n");
("lm87.o: Client deregistration failed, client not detached.\n");
return err;
}
@@ -482,97 +485,97 @@ int LM87_detach_client(struct i2c_client *client)
}
/* No commands defined yet */
int LM87_command(struct i2c_client *client, unsigned int cmd, void *arg)
int lm87_command(struct i2c_client *client, unsigned int cmd, void *arg)
{
return 0;
}
void LM87_inc_use(struct i2c_client *client)
void lm87_inc_use(struct i2c_client *client)
{
#ifdef MODULE
MOD_INC_USE_COUNT;
#endif
}
void LM87_dec_use(struct i2c_client *client)
void lm87_dec_use(struct i2c_client *client)
{
#ifdef MODULE
MOD_DEC_USE_COUNT;
#endif
}
int LM87_read_value(struct i2c_client *client, u8 reg)
int lm87_read_value(struct i2c_client *client, u8 reg)
{
return 0xFF & i2c_smbus_read_byte_data(client, reg);
}
int LM87_write_value(struct i2c_client *client, u8 reg, u8 value)
int lm87_write_value(struct i2c_client *client, u8 reg, u8 value)
{
return i2c_smbus_write_byte_data(client, reg, value);
}
/* Called when we have found a new LM87. It should set limits, etc. */
void LM87_init_client(struct i2c_client *client)
void lm87_init_client(struct i2c_client *client)
{
/* Reset all except Watchdog values and last conversion values
This sets fan-divs to 2, among others. This makes most other
initializations unnecessary */
LM87_write_value(client, LM87_REG_CONFIG, 0x80);
lm87_write_value(client, LM87_REG_CONFIG, 0x80);
/* Setup Channel Mode register for configuration of monitoring
* bit 0 - Configures Fan 1/AIN 1 input (1 = AIN)
* bit 2 - Configures 2.5V/D2 input (1 = 2nd Therm.)
*/
LM87_write_value(client, LM87_REG_CHANNEL_MODE, 0x05);
lm87_write_value(client, LM87_REG_CHANNEL_MODE, 0x05);
LM87_write_value(client, LM87_REG_IN_MIN(1),
lm87_write_value(client, LM87_REG_IN_MIN(1),
IN_TO_REG(LM87_INIT_IN_MIN_1, 1));
LM87_write_value(client, LM87_REG_IN_MAX(1),
lm87_write_value(client, LM87_REG_IN_MAX(1),
IN_TO_REG(LM87_INIT_IN_MAX_1, 1));
LM87_write_value(client, LM87_REG_IN_MIN(2),
lm87_write_value(client, LM87_REG_IN_MIN(2),
IN_TO_REG(LM87_INIT_IN_MIN_2, 2));
LM87_write_value(client, LM87_REG_IN_MAX(2),
lm87_write_value(client, LM87_REG_IN_MAX(2),
IN_TO_REG(LM87_INIT_IN_MAX_2, 2));
LM87_write_value(client, LM87_REG_IN_MIN(3),
lm87_write_value(client, LM87_REG_IN_MIN(3),
IN_TO_REG(LM87_INIT_IN_MIN_3, 3));
LM87_write_value(client, LM87_REG_IN_MAX(3),
lm87_write_value(client, LM87_REG_IN_MAX(3),
IN_TO_REG(LM87_INIT_IN_MAX_3, 3));
LM87_write_value(client, LM87_REG_IN_MIN(4),
lm87_write_value(client, LM87_REG_IN_MIN(4),
IN_TO_REG(LM87_INIT_IN_MIN_4, 4));
LM87_write_value(client, LM87_REG_IN_MAX(4),
lm87_write_value(client, LM87_REG_IN_MAX(4),
IN_TO_REG(LM87_INIT_IN_MAX_4, 4));
LM87_write_value(client, LM87_REG_IN_MIN(5),
lm87_write_value(client, LM87_REG_IN_MIN(5),
IN_TO_REG(LM87_INIT_IN_MIN_5, 5));
LM87_write_value(client, LM87_REG_IN_MAX(5),
lm87_write_value(client, LM87_REG_IN_MAX(5),
IN_TO_REG(LM87_INIT_IN_MAX_5, 5));
LM87_write_value(client, LM87_REG_EXT_TEMP_1_HIGH,
lm87_write_value(client, LM87_REG_EXT_TEMP_1_HIGH,
TEMP_LIMIT_TO_REG(LM87_INIT_EXT_TEMP_MAX));
LM87_write_value(client, LM87_REG_EXT_TEMP_1_LOW,
lm87_write_value(client, LM87_REG_EXT_TEMP_1_LOW,
TEMP_LIMIT_TO_REG(LM87_INIT_EXT_TEMP_MIN));
LM87_write_value(client, LM87_REG_2_5V_EXT_TEMP_2_HIGH,
lm87_write_value(client, LM87_REG_2_5V_EXT_TEMP_2_HIGH,
TEMP_LIMIT_TO_REG(LM87_INIT_EXT_TEMP_MAX));
LM87_write_value(client, LM87_REG_2_5V_EXT_TEMP_2_LOW,
lm87_write_value(client, LM87_REG_2_5V_EXT_TEMP_2_LOW,
TEMP_LIMIT_TO_REG(LM87_INIT_EXT_TEMP_MIN));
LM87_write_value(client, LM87_REG_INT_TEMP_HIGH,
lm87_write_value(client, LM87_REG_INT_TEMP_HIGH,
TEMP_LIMIT_TO_REG(LM87_INIT_INT_TEMP_MAX));
LM87_write_value(client, LM87_REG_INT_TEMP_LOW,
lm87_write_value(client, LM87_REG_INT_TEMP_LOW,
TEMP_LIMIT_TO_REG(LM87_INIT_INT_TEMP_MIN));
LM87_write_value(client, LM87_REG_FAN1_AIN1_LIMIT,
lm87_write_value(client, LM87_REG_FAN1_AIN1_LIMIT,
IN_TO_REG(LM87_INIT_IN_MAX_0, 0));
LM87_write_value(client, LM87_REG_FAN2_AIN2_LIMIT,
lm87_write_value(client, LM87_REG_FAN2_AIN2_LIMIT,
FAN_TO_REG(LM87_INIT_FAN_MIN, 2));
/* Start monitoring */
LM87_write_value(client, LM87_REG_CONFIG, 0x01);
lm87_write_value(client, LM87_REG_CONFIG, 0x01);
}
void LM87_update_client(struct i2c_client *client)
void lm87_update_client(struct i2c_client *client)
{
struct LM87_data *data = client->data;
struct lm87_data *data = client->data;
u8 i;
down(&data->update_lock);
@@ -586,69 +589,70 @@ void LM87_update_client(struct i2c_client *client)
#endif
for (i = 0; i <= 5; i++) {
/* Since we are using AIN 1 as our 2.5V monitoring, need to
* accomodate with a hardcode register address and we only get
* accomodate with a hardcode
* register address and we only get
* to look at one threshold.
*/
if (i == 0) {
data->in[i] =
LM87_read_value(client, LM87_REG_FAN1_AIN1);
lm87_read_value(client, LM87_REG_FAN1_AIN1);
data->in_min[i] = 0;
data->in_max[i] =
LM87_read_value(client, LM87_REG_FAN1_AIN1_LIMIT);
lm87_read_value(client, LM87_REG_FAN1_AIN1_LIMIT);
}
else {
data->in[i] =
LM87_read_value(client, LM87_REG_IN(i));
lm87_read_value(client, LM87_REG_IN(i));
data->in_min[i] =
LM87_read_value(client,
lm87_read_value(client,
LM87_REG_IN_MIN(i));
data->in_max[i] =
LM87_read_value(client,
lm87_read_value(client,
LM87_REG_IN_MAX(i));
}
}
data->fan =
LM87_read_value(client, LM87_REG_FAN2_AIN2);
lm87_read_value(client, LM87_REG_FAN2_AIN2);
data->fan_min =
LM87_read_value(client, LM87_REG_FAN2_AIN2_LIMIT);
lm87_read_value(client, LM87_REG_FAN2_AIN2_LIMIT);
data->front_amb_temp =
LM87_read_value(client, LM87_REG_2_5V_EXT_TEMP_2);
lm87_read_value(client, LM87_REG_2_5V_EXT_TEMP_2);
data->cpu_temp =
LM87_read_value(client, LM87_REG_EXT_TEMP_1);
lm87_read_value(client, LM87_REG_EXT_TEMP_1);
data->int_temp =
LM87_read_value(client, LM87_REG_INT_TEMP);
lm87_read_value(client, LM87_REG_INT_TEMP);
data->front_amb_temp_max =
LM87_read_value(client, LM87_REG_2_5V_EXT_TEMP_2_HIGH);
lm87_read_value(client, LM87_REG_2_5V_EXT_TEMP_2_HIGH);
data->front_amb_temp_min =
LM87_read_value(client, LM87_REG_2_5V_EXT_TEMP_2_LOW);
lm87_read_value(client, LM87_REG_2_5V_EXT_TEMP_2_LOW);
data->cpu_temp_max =
LM87_read_value(client, LM87_REG_EXT_TEMP_1_HIGH);
lm87_read_value(client, LM87_REG_EXT_TEMP_1_HIGH);
data->cpu_temp_min =
LM87_read_value(client, LM87_REG_EXT_TEMP_1_LOW);
lm87_read_value(client, LM87_REG_EXT_TEMP_1_LOW);
data->int_temp_max =
LM87_read_value(client, LM87_REG_INT_TEMP_HIGH);
lm87_read_value(client, LM87_REG_INT_TEMP_HIGH);
data->int_temp_min =
LM87_read_value(client, LM87_REG_INT_TEMP_LOW);
lm87_read_value(client, LM87_REG_INT_TEMP_LOW);
i = LM87_read_value(client, LM87_REG_VID_FAN_DIV);
i = lm87_read_value(client, LM87_REG_VID_FAN_DIV);
data->fan_div = (i >> 4) & 0x03;
data->vid = i & 0x0f;
data->vid |=
(LM87_read_value(client, LM87_REG_VID4) & 0x01)
(lm87_read_value(client, LM87_REG_VID4) & 0x01)
<< 4;
data->alarms =
LM87_read_value(client,
lm87_read_value(client,
LM87_REG_INT1_STAT) +
(LM87_read_value(client, LM87_REG_INT2_STAT) <<
(lm87_read_value(client, LM87_REG_INT2_STAT) <<
8);
data->analog_out =
LM87_read_value(client, LM87_REG_ANALOG_OUT);
lm87_read_value(client, LM87_REG_ANALOG_OUT);
data->last_updated = jiffies;
data->valid = 1;
}
@@ -670,7 +674,7 @@ void LM87_update_client(struct i2c_client *client)
large enough (by checking the incoming value of *nrels). This is not very
good practice, but as long as you put less than about 5 values in results,
you can assume it is large enough. */
void LM87_in(struct i2c_client *client, int operation, int ctl_name,
void lm87_in(struct i2c_client *client, int operation, int ctl_name,
int *nrels_mag, long *results)
{
@@ -681,13 +685,13 @@ void LM87_in(struct i2c_client *client, int operation, int ctl_name,
************************************************************/
int scales[6] = { 260, 200, 344, 520, 1250, 260 };
struct LM87_data *data = client->data;
struct lm87_data *data = client->data;
int nr = ctl_name - LM87_SYSCTL_IN0;
if (operation == SENSORS_PROC_REAL_INFO)
*nrels_mag = 2;
else if (operation == SENSORS_PROC_REAL_READ) {
LM87_update_client(client);
lm87_update_client(client);
results[0] =
IN_FROM_REG(data->in_min[nr], nr) * scales[nr] / 192;
@@ -710,28 +714,28 @@ void LM87_in(struct i2c_client *client, int operation, int ctl_name,
if (*nrels_mag >= 1) {
data->in_min[nr] =
IN_TO_REG((results[0] * 192) / scales[nr], nr);
LM87_write_value(client, LM87_REG_IN_MIN(nr),
lm87_write_value(client, LM87_REG_IN_MIN(nr),
data->in_min[nr]);
}
if (*nrels_mag >= 2) {
data->in_max[nr] =
IN_TO_REG((results[1] * 192) / scales[nr], nr);
LM87_write_value(client, LM87_REG_IN_MAX(nr),
lm87_write_value(client, LM87_REG_IN_MAX(nr),
data->in_max[nr]);
}
}
}
void LM87_fan(struct i2c_client *client, int operation, int ctl_name,
void lm87_fan(struct i2c_client *client, int operation, int ctl_name,
int *nrels_mag, long *results)
{
struct LM87_data *data = client->data;
struct lm87_data *data = client->data;
int nr = ctl_name - LM87_SYSCTL_FAN + 1; /* not sure +1 needed */
if (operation == SENSORS_PROC_REAL_INFO)
*nrels_mag = 0;
else if (operation == SENSORS_PROC_REAL_READ) {
LM87_update_client(client);
lm87_update_client(client);
results[0] = FAN_FROM_REG(data->fan_min,
DIV_FROM_REG(data->fan_div));
results[1] = FAN_FROM_REG(data->fan,
@@ -742,23 +746,23 @@ void LM87_fan(struct i2c_client *client, int operation, int ctl_name,
data->fan_min = FAN_TO_REG(results[0],
DIV_FROM_REG
(data->fan_div));
LM87_write_value(client, LM87_REG_FAN2_AIN2_LIMIT,
lm87_write_value(client, LM87_REG_FAN2_AIN2_LIMIT,
data->fan_min);
}
}
}
void LM87_temp(struct i2c_client *client, int operation, int ctl_name,
void lm87_temp(struct i2c_client *client, int operation, int ctl_name,
int *nrels_mag, long *results)
{
struct LM87_data *data = client->data;
struct lm87_data *data = client->data;
if (operation == SENSORS_PROC_REAL_INFO)
*nrels_mag = 1;
else if (operation == SENSORS_PROC_REAL_READ)
{
LM87_update_client(client);
lm87_update_client(client);
/* find out which temp. is being requested */
if (ctl_name == LM87_SYSCTL_FRNT_TEMP)
@@ -783,68 +787,70 @@ void LM87_temp(struct i2c_client *client, int operation, int ctl_name,
} else if (operation == SENSORS_PROC_REAL_WRITE) {
if (*nrels_mag >= 1) {
if (ctl_name == LM87_SYSCTL_FRNT_TEMP) {
data->front_amb_temp_max = TEMP_LIMIT_TO_REG(results[0]);
LM87_write_value(client, LM87_REG_2_5V_EXT_TEMP_2_HIGH,
data->front_amb_temp_max =
TEMP_LIMIT_TO_REG(results[0]);
lm87_write_value(client, LM87_REG_2_5V_EXT_TEMP_2_HIGH,
data->front_amb_temp_max);
}
if (ctl_name == LM87_SYSCTL_CPU_TEMP) {
data->cpu_temp_max = TEMP_LIMIT_TO_REG(results[0]);
LM87_write_value(client, LM87_REG_EXT_TEMP_1_HIGH,
lm87_write_value(client, LM87_REG_EXT_TEMP_1_HIGH,
data->int_temp_max);
}
if (ctl_name == LM87_SYSCTL_INT_TEMP) {
data->int_temp_max = TEMP_LIMIT_TO_REG(results[0]);
LM87_write_value(client, LM87_REG_INT_TEMP_HIGH,
lm87_write_value(client, LM87_REG_INT_TEMP_HIGH,
data->int_temp_max);
}
}
if (*nrels_mag >= 2) {
if (ctl_name == LM87_SYSCTL_FRNT_TEMP) {
data->front_amb_temp_min = TEMP_LIMIT_TO_REG(results[0]);
LM87_write_value(client, LM87_REG_2_5V_EXT_TEMP_2_LOW,
data->front_amb_temp_min =
TEMP_LIMIT_TO_REG(results[0]);
lm87_write_value(client, LM87_REG_2_5V_EXT_TEMP_2_LOW,
data->front_amb_temp_min);
}
if (ctl_name == LM87_SYSCTL_CPU_TEMP) {
data->cpu_temp_min = TEMP_LIMIT_TO_REG(results[0]);
LM87_write_value(client, LM87_REG_EXT_TEMP_1_LOW,
lm87_write_value(client, LM87_REG_EXT_TEMP_1_LOW,
data->int_temp_min);
}
if (ctl_name == LM87_SYSCTL_INT_TEMP) {
data->int_temp_min = TEMP_LIMIT_TO_REG(results[1]);
LM87_write_value(client, LM87_REG_INT_TEMP_LOW,
lm87_write_value(client, LM87_REG_INT_TEMP_LOW,
data->int_temp_min);
}
}
}
}
void LM87_alarms(struct i2c_client *client, int operation, int ctl_name,
void lm87_alarms(struct i2c_client *client, int operation, int ctl_name,
int *nrels_mag, long *results)
{
struct LM87_data *data = client->data;
struct lm87_data *data = client->data;
if (operation == SENSORS_PROC_REAL_INFO)
*nrels_mag = 0;
else if (operation == SENSORS_PROC_REAL_READ) {
LM87_update_client(client);
lm87_update_client(client);
results[0] = ALARMS_FROM_REG(data->alarms);
*nrels_mag = 1;
}
}
void LM87_fan_div(struct i2c_client *client, int operation,
void lm87_fan_div(struct i2c_client *client, int operation,
int ctl_name, int *nrels_mag, long *results)
{
struct LM87_data *data = client->data;
struct lm87_data *data = client->data;
int old;
if (operation == SENSORS_PROC_REAL_INFO)
*nrels_mag = 0;
else if (operation == SENSORS_PROC_REAL_READ) {
LM87_update_client(client);
lm87_update_client(client);
results[0] = DIV_FROM_REG(data->fan_div);
*nrels_mag = 1;
} else if (operation == SENSORS_PROC_REAL_WRITE) {
old = LM87_read_value(client, LM87_REG_VID_FAN_DIV);
old = lm87_read_value(client, LM87_REG_VID_FAN_DIV);
if (*nrels_mag >= 2) {
data->fan_div = DIV_TO_REG(results[1]);
old = (old & 0x3f) | (data->fan_div << 6);
@@ -852,47 +858,48 @@ void LM87_fan_div(struct i2c_client *client, int operation,
if (*nrels_mag >= 1) {
data->fan_div = DIV_TO_REG(results[0]);
old = (old & 0xcf) | (data->fan_div << 4);
LM87_write_value(client, LM87_REG_VID_FAN_DIV, old);
lm87_write_value(client, LM87_REG_VID_FAN_DIV, old);
}
}
}
void LM87_analog_out(struct i2c_client *client, int operation,
void lm87_analog_out(struct i2c_client *client, int operation,
int ctl_name, int *nrels_mag, long *results)
{
struct LM87_data *data = client->data;
struct lm87_data *data = client->data;
if (operation == SENSORS_PROC_REAL_INFO)
*nrels_mag = 0;
else if (operation == SENSORS_PROC_REAL_READ) {
LM87_update_client(client);
lm87_update_client(client);
results[0] = data->analog_out;
*nrels_mag = 1;
} else if (operation == SENSORS_PROC_REAL_WRITE) {
if (*nrels_mag >= 1) {
data->analog_out = results[0];
LM87_write_value(client, LM87_REG_ANALOG_OUT,
lm87_write_value(client, LM87_REG_ANALOG_OUT,
data->analog_out);
}
}
}
void LM87_vid(struct i2c_client *client, int operation, int ctl_name,
void lm87_vid(struct i2c_client *client, int operation, int ctl_name,
int *nrels_mag, long *results)
{
struct LM87_data *data = client->data;
struct lm87_data *data = client->data;
if (operation == SENSORS_PROC_REAL_INFO)
*nrels_mag = 2;
else if (operation == SENSORS_PROC_REAL_READ) {
LM87_update_client(client);
lm87_update_client(client);
if ((data->vid == 0x1f) || (data->vid == 0x0f)) {
results[0] = 0;
}
else if (data->vid > 0x0f) {
results[0] = (1275 - (((data->vid - 0x10) * 1000) * 0.025))/10;
results[0] = (1275 -
(((data->vid - 0x10) * 1000) * 0.025))/10;
}
else {
results[0] = 200 - ((data->vid * 100) * 0.05);
@@ -902,34 +909,34 @@ void LM87_vid(struct i2c_client *client, int operation, int ctl_name,
}
}
int __init sensors_LM87_init(void)
int __init sensors_lm87_init(void)
{
int res;
printk("LM87.o version %s (%s)\n", LM_VERSION, LM_DATE);
LM87_initialized = 0;
printk("lm87.o version %s (%s)\n", LM_VERSION, LM_DATE);
lm87_initialized = 0;
if ((res = i2c_add_driver(&LM87_driver))) {
if ((res = i2c_add_driver(&lm87_driver))) {
printk
("LM87.o: Driver registration failed, module not inserted.\n");
LM87_cleanup();
("lm87.o: Driver registration failed, module not inserted.\n");
lm87_cleanup();
return res;
}
LM87_initialized++;
lm87_initialized++;
return 0;
}
int __init LM87_cleanup(void)
int __init lm87_cleanup(void)
{
int res;
if (LM87_initialized >= 1) {
if ((res = i2c_del_driver(&LM87_driver))) {
if (lm87_initialized >= 1) {
if ((res = i2c_del_driver(&lm87_driver))) {
printk
("LM87.o: Driver deregistration failed, module not removed.\n");
("lm87.o: Driver deregistration failed, module not removed.\n");
return res;
}
LM87_initialized--;
lm87_initialized--;
}
return 0;
}
@@ -942,16 +949,16 @@ MODULE_AUTHOR
("Frodo Looijaard <frodol@dds.nl>, Philip Edelbrock <phil@netroedge.com>,
and Stephen Rousset <stephen.rousset@rocketlogix.com>");
MODULE_DESCRIPTION("LM87 driver");
MODULE_DESCRIPTION("lm87 driver");
int init_module(void)
{
return sensors_LM87_init();
return sensors_lm87_init();
}
int cleanup_module(void)
{
return LM87_cleanup();
return lm87_cleanup();
}
#endif /* MODULE */