minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-11 21:18:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

ds1621: Clean up coding style

Browse Source 
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
This commit is contained in:
Peter Tyser 2010-09-29 13:46:18 -05:00 committed by Wolfgang Denk
parent c3e5fa0b53
commit 9a6c80b0cf
1 changed files with 98 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
drivers/hwmon/ds1621.c
View File

@ -60,35 +60,30 @@ int dtt_read(int sensor, int reg)
int dlen; int dlen;
uchar data[2]; uchar data[2];
/* /* Calculate sensor address and command */
* Calculate sensor address and command.
*
*/
sensor = DTT_I2C_DEV_CODE + (sensor & 0x07); /* Calculate addr of ds1621*/ sensor = DTT_I2C_DEV_CODE + (sensor & 0x07); /* Calculate addr of ds1621*/
/* /* Prepare to handle 2 byte result */
* Prepare to handle 2 byte result. switch(reg) {
*/ case DTT_READ_TEMP:
if ((reg == DTT_READ_TEMP) || case DTT_TEMP_HIGH:
(reg == DTT_TEMP_HIGH) || (reg == DTT_TEMP_LOW)) case DTT_TEMP_LOW:
dlen = 2; dlen = 2;
else break;
default:
dlen = 1; dlen = 1;
}
/* /* Now try to read the register */
* Now try to read the register.
*/
if (i2c_read(sensor, reg, 1, data, dlen) != 0) if (i2c_read(sensor, reg, 1, data, dlen) != 0)
return 1; return 1;
/* /* Handle 2 byte result */
* Handle 2 byte result.
*/
if (dlen == 2) if (dlen == 2)
return ((int)((short)data[1] + (((short)data[0]) << 8))); return ((int)((short)data[1] + (((short)data[0]) << 8)));
return (int)data[0]; return (int)data[0];
} /* dtt_read() */ }
int dtt_write(int sensor, int reg, int val) int dtt_write(int sensor, int reg, int val)
@ -96,61 +91,51 @@ int dtt_write(int sensor, int reg, int val)
int dlen; int dlen;
uchar data[2]; uchar data[2];
/* /* Calculate sensor address and register */
* Calculate sensor address and register.
*
*/
sensor = DTT_I2C_DEV_CODE + (sensor & 0x07); sensor = DTT_I2C_DEV_CODE + (sensor & 0x07);
/* /* Handle various data sizes. */
* Handle various data sizes. switch(reg) {
*/ case DTT_READ_TEMP:
if ((reg == DTT_READ_TEMP) || case DTT_TEMP_HIGH:
(reg == DTT_TEMP_HIGH) || (reg == DTT_TEMP_LOW)) { case DTT_TEMP_LOW:
dlen = 2; dlen = 2;
data[0] = (char)((val >> 8) & 0xff); /* MSB first */ data[0] = (char)((val >> 8) & 0xff); /* MSB first */
data[1] = (char)(val & 0xff); data[1] = (char)(val & 0xff);
} break;
else if ((reg == DTT_WRITE_START_CONV) || (reg == DTT_WRITE_STOP_CONV)) { case DTT_WRITE_START_CONV:
case DTT_WRITE_STOP_CONV:
dlen = 0; dlen = 0;
data[0] = (char)0; data[0] = (char)0;
data[1] = (char)0; data[1] = (char)0;
} break;
else { default:
dlen = 1; dlen = 1;
data[0] = (char)(val & 0xff); data[0] = (char)(val & 0xff);
} }
/* /* Write value to device */
* Write value to device.
*/
if (i2c_write(sensor, reg, 1, data, dlen) != 0) if (i2c_write(sensor, reg, 1, data, dlen) != 0)
return 1; return 1;
/* /* Poll NV memory busy bit in case write was to register stored in EEPROM */
* Poll NV memory busy bit in case write was to register stored in EEPROM
*/
while(i2c_reg_read(sensor, DTT_CONFIG) & DTT_CONFIG_NVB) while(i2c_reg_read(sensor, DTT_CONFIG) & DTT_CONFIG_NVB)
; ;
return 0; return 0;
} /* dtt_write() */ }
static int _dtt_init(int sensor) static int _dtt_init(int sensor)
{ {
int val; int val;
/* /* Setup High Temp */
* Setup High Temp.
*/
val = ((CONFIG_SYS_DTT_MAX_TEMP * 2) << 7) & 0xff80; val = ((CONFIG_SYS_DTT_MAX_TEMP * 2) << 7) & 0xff80;
if (dtt_write(sensor, DTT_TEMP_HIGH, val) != 0) if (dtt_write(sensor, DTT_TEMP_HIGH, val) != 0)
return 1; return 1;
/* /* Setup Low Temp - hysteresis */
* Setup Low Temp - hysteresis.
*/
val = (((CONFIG_SYS_DTT_MAX_TEMP - CONFIG_SYS_DTT_HYSTERESIS) * 2) << 7) & 0xff80; val = (((CONFIG_SYS_DTT_MAX_TEMP - CONFIG_SYS_DTT_HYSTERESIS) * 2) << 7) & 0xff80;
if (dtt_write(sensor, DTT_TEMP_LOW, val) != 0) if (dtt_write(sensor, DTT_TEMP_LOW, val) != 0)
return 1; return 1;
@ -168,7 +153,7 @@ static int _dtt_init(int sensor)
return 1; return 1;
return 0; return 0;
} /* _dtt_init() */ }
int dtt_init (void) int dtt_init (void)
@ -178,22 +163,20 @@ int dtt_init (void)
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("DTT%d: FAILED\n", i+1); printf("DTT%d: FAILED\n", i + 1);
else else
printf("DTT%d: %i C\n", i+1, dtt_get_temp(sensors[i])); printf("DTT%d: %i C\n", i + 1, dtt_get_temp(sensors[i]));
} }
return (0); return (0);
} /* dtt_init() */ }
int dtt_get_temp(int sensor) int dtt_get_temp(int sensor)
{ {
int i; int i;
/* /* Start a conversion, may take up to 1 second. */
* Start a conversion, may take up to 1 second.
*/
dtt_write(sensor, DTT_WRITE_START_CONV, 0); dtt_write(sensor, DTT_WRITE_START_CONV, 0);
for (i = 0; i <= 10; i++) { for (i = 0; i <= 10; i++) {
udelay(100000); udelay(100000);
@ -202,4 +185,4 @@ int dtt_get_temp(int sensor)
} }
return (dtt_read(sensor, DTT_READ_TEMP) / 256); return (dtt_read(sensor, DTT_READ_TEMP) / 256);
} /* dtt_get_temp() */ }