From 70677ba796152b56926312db7b9c7894a5e15436 Mon Sep 17 00:00:00 2001 From: Abraham van der Merwe Date: Wed, 10 Jul 2002 11:57:13 +0000 Subject: [PATCH] libsensors support (untested). also, I haven't added anything to sensors-detect yet. git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@1441 7894878c-1315-0410-8ee3-d5d059ff63e0 --- kernel/chips/lm92.c | 10 +++--- lib/chips.c | 37 +++++++++++++++++++++ lib/chips.h | 11 +++++++ prog/sensors/chips.c | 78 ++++++++++++++++++++++++++++++++++++++++++++ prog/sensors/chips.h | 1 + prog/sensors/main.c | 2 ++ 6 files changed, 134 insertions(+), 5 deletions(-) diff --git a/kernel/chips/lm92.c b/kernel/chips/lm92.c index 45b1d42b..77c900df 100644 --- a/kernel/chips/lm92.c +++ b/kernel/chips/lm92.c @@ -186,11 +186,11 @@ static void lm92_temp (struct i2c_client *client,int operation,int ctl_name,int if (operation == SENSORS_PROC_REAL_READ) { lm92_read (client); - results[0] = NATIVE_TO_PROC (data->temp.high); - results[1] = NATIVE_TO_PROC (data->temp.low); - results[2] = NATIVE_TO_PROC (data->temp.crit); - results[3] = NATIVE_TO_PROC (data->temp.hyst); - results[4] = NATIVE_TO_PROC (data->temp.input); + results[0] = NATIVE_TO_PROC (data->temp.input); + results[1] = NATIVE_TO_PROC (data->temp.high); + results[2] = NATIVE_TO_PROC (data->temp.low); + results[3] = NATIVE_TO_PROC (data->temp.crit); + results[4] = NATIVE_TO_PROC (data->temp.hyst); *nrels_mag = 5; } else if (operation == SENSORS_PROC_REAL_WRITE && *nrels_mag == 4) { data->temp.high = PROC_TO_NATIVE (results[0]); diff --git a/lib/chips.c b/lib/chips.c index dc4edb86..2e7199af 100644 --- a/lib/chips.c +++ b/lib/chips.c @@ -2791,6 +2791,42 @@ static sensors_chip_feature smsc47m1_features[] = { 0 } }; +#define LM92_TEMP(_idx,_name,_mapping,_mode,_offset) \ + { \ + number: _idx, \ + name: _name, \ + logical_mapping: _mapping, \ + compute_mapping: _mapping, \ + mode: _mode, \ + sysctl: LM92_SYSCTL_TEMP, \ + offset: VALUE(_offset), \ + scaling: 4 \ + } + +#define LM92_ALARM(_idx,_name,_mapping,_offset) \ + { \ + number: _idx, \ + name: _name, \ + logical_mapping: _mapping, \ + compute_mapping: _mapping, \ + mode: SENSORS_MODE_R, \ + sysctl: LM92_SYSCTL_ALARMS, \ + offset: VALUE(_offset), \ + scaling: 0 \ + } + +static sensors_chip_feature lm92_features[] = +{ + LM92_TEMP (SENSORS_LM92_TEMP,"temp",SENSORS_NO_MAPPING,SENSORS_MODE_R,1), + LM92_TEMP (SENSORS_LM92_TEMP_HIGH,"temp_high",SENSORS_LM92_TEMP,SENSORS_MODE_RW,2), + LM92_TEMP (SENSORS_LM92_TEMP_LOW,"temp_low",SENSORS_LM92_TEMP,SENSORS_MODE_RW,3), + LM92_TEMP (SENSORS_LM92_TEMP_CRIT,"temp_crit",SENSORS_LM92_TEMP,SENSORS_MODE_RW,4), + LM92_TEMP (SENSORS_LM92_TEMP_HYST,"temp_hyst",SENSORS_LM92_TEMP,SENSORS_MODE_RW,5), + LM92_ALARM (SENSORS_LM92_ALARMS_HIGH,"alarms_high",SENSORS_NO_MAPPING,1), + LM92_ALARM (SENSORS_LM92_ALARMS_LOW,"alarms_low",SENSORS_LM92_ALARMS_HIGH,2), + LM92_ALARM (SENSORS_LM92_ALARMS_CRIT,"alarms_crit",SENSORS_LM92_ALARMS_CRIT,3) +}; + sensors_chip_features sensors_chip_features_list[] = { { SENSORS_LM78_PREFIX, lm78_features }, @@ -2844,5 +2880,6 @@ sensors_chip_features sensors_chip_features_list[] = { SENSORS_PCF8591_PREFIX, pcf8591_features }, { SENSORS_VT1211_PREFIX, vt1211_features }, { SENSORS_SMSC47M1_PREFIX, smsc47m1_features }, + { SENSORS_LM92_PREFIX, lm92_features }, { 0 } }; diff --git a/lib/chips.h b/lib/chips.h index 9bc4d32a..ef968ff5 100644 --- a/lib/chips.h +++ b/lib/chips.h @@ -1195,4 +1195,15 @@ #define SENSORS_SMSC47M1_FAN2_DIV 76 /* RW */ #define SENSORS_SMSC47M1_ALARMS 81 /* R */ +#define SENSORS_LM92_PREFIX "lm92" + +#define SENSORS_LM92_TEMP_HIGH 1 /* RW */ +#define SENSORS_LM92_TEMP_LOW 2 /* RW */ +#define SENSORS_LM92_TEMP_CRIT 3 /* RW */ +#define SENSORS_LM92_TEMP_HYST 4 /* RW */ +#define SENSORS_LM92_TEMP 5 /* R */ +#define SENSORS_LM92_ALARMS_HIGH 6 /* R */ +#define SENSORS_LM92_ALARMS_LOW 7 /* R */ +#define SENSORS_LM92_ALARMS_CRIT 8 /* R */ + #endif /* def LIB_SENSORS_CHIPS_H */ diff --git a/prog/sensors/chips.c b/prog/sensors/chips.c index a15325fa..8861dafb 100644 --- a/prog/sensors/chips.c +++ b/prog/sensors/chips.c @@ -3310,6 +3310,84 @@ void print_smsc47m1(const sensors_chip_name *name) } +static void lm92_print_temp (float n_cur,float n_high,float n_low,float n_crit,float n_hyst) +{ + char suffix[5]; + + if (fahrenheit) { + sprintf (suffix,"%cF",176); + n_cur = deg_ctof (n_cur); + n_high = deg_ctof (n_high); + n_low = deg_ctof (n_low); + n_crit = deg_ctof (n_crit); + n_hyst = deg_ctof (n_hyst); + } else sprintf (suffix,"%cC",176); + + printf ("%+6.4f%s (high = %+6.4f%s, low = %+6.4f%s, crit = %+6.4f%s, hyst = %+6.4f%s)", + n_cur,suffix, + n_high,suffix, + n_low,suffix, + n_crit,suffix, + n_hyst,suffix); +} + +void print_lm92 (const sensors_chip_name *name) +{ + char *label = NULL; + double temp[5],alarms[3]; + int valid,comma = 0; + + if (fahrenheit) { + sprintf (degv,"%cF",176); + n + if (!sensors_get_feature (*name,SENSORS_LM92_ALARMS_HIGH,alarms) && + !sensors_get_feature (*name,SENSORS_LM92_ALARMS_LOW,alarms + 1) && + !sensors_get_feature (*name,SENSORS_LM92_ALAMRS_CRIT,alarms + 2)) { + alarms[0] = (int) (alarms[0] + 0.5); + alarms[1] = (int) (alarms[1] + 0.5); + alarms[2] = (int) (alarms[2] + 0.5); + } else { + printf ("ERROR: Can't get alarm data!\n"); + return; + } + + if (!sensors_get_label_and_valid (*name,SENSORS_LM92_TEMP,&label,&valid) && + !sensors_get_feature (*name,SENSORS_LM92_TEMP,temp) && + !sensors_get_feature (*name,SENSORS_LM92_TEMP_HIGH,temp + 1) && + !sensors_get_feature (*name,SENSORS_LM92_TEMP_LOW,temp + 2) && + !sensors_get_feature (*name,SENSORS_LM92_TEMP_CRIT,temp + 3) && + !sensors_get_feature (*name,SENSORS_LM92_TEMP_HYST,temp + 4)) { + if (valid) { + print_label (label,10); + print_temp_info (temp[0],temp[1],temp[2],temp[3],temp[4]); + if (alarms[0] || alarms[1] || alarms[2]) { + printf (" ALARMS ("); + + if (alarms[0]) { + comma = 1; + printf ("HIGH"); + } + + if (alarms[1]) { + if (comma) printf (","); + comma = 1; + printf ("LOW"); + } + + if (alarms[2]) { + if (comma) printf (","); + printf ("CRIT"); + } + + printf (")"); + } + printf ("\n"); + } + } else printf ("ERROR: Can't get temperature data!\n"); + + free_the_label (&label); +} + void print_unknown_chip(const sensors_chip_name *name) { int a,b,valid; diff --git a/prog/sensors/chips.h b/prog/sensors/chips.h index e47f3e48..24e3ec84 100644 --- a/prog/sensors/chips.h +++ b/prog/sensors/chips.h @@ -47,5 +47,6 @@ extern void print_fscscy(const sensors_chip_name *name); extern void print_pcf8591(const sensors_chip_name *name); extern void print_vt1211(const sensors_chip_name *name); extern void print_smsc47m1(const sensors_chip_name *name); +extern void print_lm92(const sensors_chip_name *name); #endif /* def PROG_SENSORS_CHIPS_H */ diff --git a/prog/sensors/main.c b/prog/sensors/main.c index 8eb746cb..a7b2a5e9 100644 --- a/prog/sensors/main.c +++ b/prog/sensors/main.c @@ -351,6 +351,8 @@ void do_a_print(sensors_chip_name name) print_vt1211(&name); else if (!strcmp(name.prefix,"smsc47m1")) print_smsc47m1(&name); + else if (!strcmp(name.prefix,"lm92")) + print_lm92(&name); else print_unknown_chip(&name); printf("\n");