V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

lm75: fix Codingstyle issues. 

Signed-off-by: Heiko Schocher <hs@denx.de>
This commit is contained in:
Heiko Schocher 2008-10-15 09:37:04 +02:00 committed by Wolfgang Denk
parent f2202450c7
commit 12f1678127
1 changed files with 86 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

196
drivers/hwmon/lm75.c
View File

@ -44,159 +44,135 @@
int dtt_read(int sensor, int reg) int dtt_read(int sensor, int reg)
{ {
int dlen; int dlen;
uchar data[2]; uchar data[2];
#ifdef CONFIG_DTT_AD7414 #ifdef CONFIG_DTT_AD7414
/* /*
* On AD7414 the first value upon bootup is not read correctly. * On AD7414 the first value upon bootup is not read correctly.
* This is most likely because of the 800ms update time of the * This is most likely because of the 800ms update time of the
* temp register in normal update mode. To get current values * temp register in normal update mode. To get current values
* each time we issue the "dtt" command including upon powerup * each time we issue the "dtt" command including upon powerup
* we switch into one-short mode. * we switch into one-short mode.
* *
* Issue one-shot mode command * Issue one-shot mode command
*/ */
dtt_write(sensor, DTT_CONFIG, 0x64); dtt_write(sensor, DTT_CONFIG, 0x64);
#endif #endif
/* /* Validate 'reg' param */
* Validate 'reg' param if((reg < 0) || (reg > 3))
*/ return -1;
if((reg < 0) || (reg > 3))
return -1;
/* /* Calculate sensor address and register. */
* Calculate sensor address and register. sensor = DTT_I2C_DEV_CODE + (sensor & 0x07);
*/
sensor = DTT_I2C_DEV_CODE + (sensor & 0x07); /* calculate address of lm75 */
/* /* Prepare to handle 2 byte result. */
* Prepare to handle 2 byte result. if ((reg == DTT_READ_TEMP) ||
*/ (reg == DTT_TEMP_HYST) ||
if ((reg == DTT_READ_TEMP) || (reg == DTT_TEMP_SET))
(reg == DTT_TEMP_HYST) || dlen = 2;
(reg == DTT_TEMP_SET)) else
dlen = 2; dlen = 1;
else
dlen = 1;
/* /* Now try to read the register. */
* Now try to read the register. if (i2c_read(sensor, reg, 1, data, dlen) != 0)
*/ return -1;
if (i2c_read(sensor, reg, 1, data, dlen) != 0)
return -1;
/* /* Handle 2 byte result. */
* Handle 2 byte result. if (dlen == 2)
*/ return ((int)((short)data[1] + (((short)data[0]) << 8)));
if (dlen == 2)
return ((int)((short)data[1] + (((short)data[0]) << 8)));
return (int)data[0];
return (int)data[0];
} /* dtt_read() */ } /* dtt_read() */
int dtt_write(int sensor, int reg, int val) int dtt_write(int sensor, int reg, int val)
{ {
int dlen; int dlen;
uchar data[2]; uchar data[2];
/* /* Validate 'reg' param */
* Validate 'reg' param if ((reg < 0) || (reg > 3))
*/ return 1;
if ((reg < 0) || (reg > 3))
return 1;
/* /* Calculate sensor address and register. */
* Calculate sensor address and register. sensor = DTT_I2C_DEV_CODE + (sensor & 0x07);
*/
sensor = DTT_I2C_DEV_CODE + (sensor & 0x07); /* calculate address of lm75 */
/* /* Handle 2 byte values. */
* Handle 2 byte values. if ((reg == DTT_READ_TEMP) ||
*/ (reg == DTT_TEMP_HYST) ||
if ((reg == DTT_READ_TEMP) || (reg == DTT_TEMP_SET)) {
(reg == DTT_TEMP_HYST) || dlen = 2;
(reg == DTT_TEMP_SET)) { data[0] = (char)((val >> 8) & 0xff); /* MSB first */
dlen = 2; data[1] = (char)(val & 0xff);
data[0] = (char)((val >> 8) & 0xff); /* MSB first */ } else {
data[1] = (char)(val & 0xff); dlen = 1;
} else { data[0] = (char)(val & 0xff);
dlen = 1; }
data[0] = (char)(val & 0xff);
}
/* /* Write value to register. */
* Write value to register. if (i2c_write(sensor, reg, 1, data, dlen) != 0)
*/ return 1;
if (i2c_write(sensor, reg, 1, data, dlen) != 0)
return 1;
return 0; return 0;
} /* dtt_write() */ } /* dtt_write() */
static int _dtt_init(int sensor) static int _dtt_init(int sensor)
{ {
int val; int val;
/* /* Setup TSET ( trip point ) register */
* Setup TSET ( trip point ) register val = ((CFG_DTT_MAX_TEMP * 2) << 7) & 0xff80; /* trip */
*/ if (dtt_write(sensor, DTT_TEMP_SET, val) != 0)
val = ((CFG_DTT_MAX_TEMP * 2) << 7) & 0xff80; /* trip */ return 1;
if (dtt_write(sensor, DTT_TEMP_SET, val) != 0)
return 1;
/* /* Setup THYST ( untrip point ) register - Hysteresis */
* Setup THYST ( untrip point ) register - Hysteresis val = (((CFG_DTT_MAX_TEMP - CFG_DTT_HYSTERESIS) * 2) << 7) & 0xff80;
*/ if (dtt_write(sensor, DTT_TEMP_HYST, val) != 0)
val = (((CFG_DTT_MAX_TEMP - CFG_DTT_HYSTERESIS) * 2) << 7) & 0xff80; return 1;
if (dtt_write(sensor, DTT_TEMP_HYST, val) != 0)
return 1;
/* /* Setup configuraton register */
* Setup configuraton register
*/
#ifdef CONFIG_DTT_AD7414 #ifdef CONFIG_DTT_AD7414
/* config = alert active low and disabled */ /* config = alert active low and disabled */
val = 0x60; val = 0x60;
#else #else
/* config = 6 sample integration, int mode, active low, and enable */ /* config = 6 sample integration, int mode, active low, and enable */
val = 0x18; val = 0x18;
#endif #endif
if (dtt_write(sensor, DTT_CONFIG, val) != 0) if (dtt_write(sensor, DTT_CONFIG, val) != 0)
return 1; return 1;
return 0; return 0;
} /* _dtt_init() */ } /* _dtt_init() */
int dtt_init (void) int dtt_init (void)
{ {
int i; int i;
unsigned char sensors[] = CONFIG_DTT_SENSORS; unsigned char sensors[] = CONFIG_DTT_SENSORS;
const char *const header = "DTT: "; const char *const header = "DTT: ";
int old_bus;
for (i = 0; i < sizeof(sensors); i++) { for (i = 0; i < sizeof(sensors); i++) {
if (_dtt_init(sensors[i]) != 0) if (_dtt_init(sensors[i]) != 0)
printf("%s%d FAILED INIT\n", header, i+1); printf("%s%d FAILED INIT\n", header, i+1);
else else
printf("%s%d is %i C\n", header, i+1, printf("%s%d is %i C\n", header, i+1,
dtt_get_temp(sensors[i])); dtt_get_temp(sensors[i]));
} }
return (0); return (0);
} /* dtt_init() */ } /* dtt_init() */
int dtt_get_temp(int sensor) int dtt_get_temp(int sensor)
{ {
int const ret = dtt_read(sensor, DTT_READ_TEMP); int const ret = dtt_read(sensor, DTT_READ_TEMP);
if (ret < 0) { if (ret < 0) {
printf("DTT temperature read failed.\n"); printf("DTT temperature read failed.\n");
return 0; return 0;
} }
return (int)((int16_t) ret / 256); return (int)((int16_t) ret / 256);
} /* dtt_get_temp() */ } /* dtt_get_temp() */