From c25252d4796beb840b75f5602b5f8f148c002114 Mon Sep 17 00:00:00 2001 From: Philip Edelbrock Date: Sun, 12 Sep 1999 23:02:35 +0000 Subject: [PATCH] (Phil) thmc50.o now compiles and inserts as part of the package. git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@560 7894878c-1315-0410-8ee3-d5d059ff63e0 --- kernel/chips/Module.mk | 3 ++- kernel/chips/thmc50.c | 10 +++++++--- kernel/include/sensors.h | 4 ++++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/kernel/chips/Module.mk b/kernel/chips/Module.mk index 4bb2c026..659914f5 100644 --- a/kernel/chips/Module.mk +++ b/kernel/chips/Module.mk @@ -28,7 +28,8 @@ KERNELCHIPSTARGETS := $(MODULE_DIR)/adm1021.o $(MODULE_DIR)/adm9240.o \ $(MODULE_DIR)/lm80.o $(MODULE_DIR)/ltc1710.o \ $(MODULE_DIR)/w83781d.o $(MODULE_DIR)/sis5595.o \ $(MODULE_DIR)/maxilife.o $(MODULE_DIR)/bt869.o \ - $(MODULE_DIR)/matorb.o $(MODULE_DIR)/gl520sm.o + $(MODULE_DIR)/matorb.o $(MODULE_DIR)/gl520sm.o \ + $(MODULE_DIR)/thmc50.o # Include all dependency files INCLUDEFILES += $(KERNELCHIPSTARGETS:.o=.d) diff --git a/kernel/chips/thmc50.c b/kernel/chips/thmc50.c index 57fa5a3c..492dae2f 100644 --- a/kernel/chips/thmc50.c +++ b/kernel/chips/thmc50.c @@ -19,6 +19,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#define DEBUG 1 + #include #include #include @@ -143,12 +145,16 @@ int thmc50_attach_adapter(struct i2c_adapter *adapter) /* This function is called by sensors_detect */ int thmc50_detect(struct i2c_adapter *adapter, int address, int kind) { - int company; + int company,i; struct i2c_client *new_client; struct thmc50_data *data; int err=0; const char *type_name,*client_name; +#ifdef DEBUG + printk("Probing for THMC50 at 0x%2.X on bus %d\n",address,adapter->id); +#endif + /* Make sure we aren't probing the ISA bus!! This is just a safety check at this moment; sensors_detect really won't call us. */ #ifdef DEBUG @@ -179,8 +185,6 @@ int thmc50_detect(struct i2c_adapter *adapter, int address, int kind) /* Now, we do the remaining detection. */ company = i2c_smbus_read_byte_data(adapter,address,0x3E); - = i2c_smbus_read_word_data(adapter,address,2); - os = i2c_smbus_read_word_data(adapter,address,3); if (company != 0x4E) goto ERROR1; diff --git a/kernel/include/sensors.h b/kernel/include/sensors.h index 657ccb11..a59b2357 100644 --- a/kernel/include/sensors.h +++ b/kernel/include/sensors.h @@ -327,6 +327,7 @@ extern inline int SENSORS_LIMIT(long value, long low, long high) #define I2C_DRIVERID_MAXILIFE 1014 #define I2C_DRIVERID_MATORB 1015 #define I2C_DRIVERID_GL520 1016 +#define I2C_DRIVERID_THMC50 1017 /* Sysctl IDs */ #ifdef DEV_HWMON @@ -603,4 +604,7 @@ struct sensors_chips_data { #define MATORB_SYSCTL_DISP 1000 +#define THMC50_SYSCTL_TEMP 1200 /* Degrees Celcius */ + + #endif /* def SENSORS_SENSORS_H */