brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-08-05 17:53:44 +09:00
Code Issues Projects Releases Wiki Activity

board/evb64260/i2c.c: Coding Style cleanup

Browse Source 
Make checkpatch-clean

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Eran Man <eran@nbase.co.il>
This commit is contained in:
Wolfgang Denk 2011-11-09 09:28:55 +00:00
parent 878d6b48f9
commit fecf63e41e
1 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
board/evb64260/i2c.c
View File

@ -27,18 +27,15 @@ i2c_init(int speed, int slaveaddr)
DP(puts("i2c_init\n")); DP(puts("i2c_init\n"));
for(n = 0 ; n < 8 ; n++) for (n = 0 ; n < 8 ; n++) {
{ for (m = 0 ; m < 16 ; m++) {
for(m = 0 ; m < 16 ; m++)
{
power = 2<<n; /* power = 2^(n+1) */ power = 2<<n; /* power = 2^(n+1) */
freq = tclk/(10*(m+1)*power); freq = tclk/(10*(m+1)*power);
if (speed > freq) if (speed > freq)
margin = speed - freq; margin = speed - freq;
else else
margin = freq - speed; margin = freq - speed;
if(margin < minMargin) if (margin < minMargin) {
{
minMargin = margin; minMargin = margin;
actualFreq = freq; actualFreq = freq;
actualN = n; actualN = n;
@ -91,13 +88,13 @@ i2c_start(void)
udelay(I2C_DELAY); udelay(I2C_DELAY);
if (count > 20) { if (count > 20) {
GT_REG_WRITE(I2C_CONTROL, (0x1 << 4)); /*stop*/ GT_REG_WRITE(I2C_CONTROL, (0x1 << 4)); /*stop*/
return (status); return status;
} }
GT_REG_READ(I2C_STATUS_BAUDE_RATE, &status); GT_REG_READ(I2C_STATUS_BAUDE_RATE, &status);
count++; count++;
} }
return (0); return 0;
} }
static uchar static uchar
@ -110,9 +107,8 @@ i2c_select_device(uchar dev_addr, uchar read, int ten_bit)
/* Output slave address */ /* Output slave address */
if (ten_bit) { if (ten_bit)
bits = 10; bits = 10;
}
data = (dev_addr << 1); data = (dev_addr << 1);
/* set the read bit */ /* set the read bit */
@ -129,7 +125,7 @@ i2c_select_device(uchar dev_addr, uchar read, int ten_bit)
udelay(I2C_DELAY); udelay(I2C_DELAY);
if (count > 20) { if (count > 20) {
GT_REG_WRITE(I2C_CONTROL, (0x1 << 4)); /*stop*/ GT_REG_WRITE(I2C_CONTROL, (0x1 << 4)); /*stop*/
return(status); return status;
} }
GT_REG_READ(I2C_STATUS_BAUDE_RATE, &status); GT_REG_READ(I2C_STATUS_BAUDE_RATE, &status);
count++; count++;
@ -137,10 +133,10 @@ i2c_select_device(uchar dev_addr, uchar read, int ten_bit)
if (bits == 10) { if (bits == 10) {
printf("10 bit I2C addressing not yet implemented\n"); printf("10 bit I2C addressing not yet implemented\n");
return (0xff); return 0xff;
} }
return (0); return 0;
} }
static uchar static uchar
@ -180,14 +176,14 @@ i2c_get_data(uchar* return_data, int len) {
udelay(I2C_DELAY); udelay(I2C_DELAY);
if (count > 200) { if (count > 200) {
GT_REG_WRITE(I2C_CONTROL, (0x1 << 4)); /*stop*/ GT_REG_WRITE(I2C_CONTROL, (0x1 << 4)); /*stop*/
return (status); return status;
} }
GT_REG_READ(I2C_STATUS_BAUDE_RATE, &status); GT_REG_READ(I2C_STATUS_BAUDE_RATE, &status);
count++; count++;
} }
GT_REG_WRITE(I2C_CONTROL, (0x1 << 4)); /* stop */ GT_REG_WRITE(I2C_CONTROL, (0x1 << 4)); /* stop */
return (0); return 0;
} }
static uchar static uchar
@ -215,7 +211,7 @@ i2c_write_data(unsigned int data, int len)
udelay(I2C_DELAY); udelay(I2C_DELAY);
if (count > 20) { if (count > 20) {
GT_REG_WRITE(I2C_CONTROL, (0x1 << 4)); /*stop*/ GT_REG_WRITE(I2C_CONTROL, (0x1 << 4)); /*stop*/
return (status); return status;
} }
GT_REG_READ(I2C_STATUS_BAUDE_RATE, &status); GT_REG_READ(I2C_STATUS_BAUDE_RATE, &status);
count++; count++;
@ -227,7 +223,7 @@ i2c_write_data(unsigned int data, int len)
udelay(I2C_DELAY * 10); udelay(I2C_DELAY * 10);
return (0); return 0;
} }
static uchar static uchar
@ -254,7 +250,7 @@ i2c_set_dev_offset(uchar dev_addr, unsigned int offset, int ten_bit)
return status; return status;
} }
return (0); return 0;
} }
uchar uchar