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

post/i2c: General clean up 

- Clean up ifdeffery
- Update coding style

No functional change should have occurred.

Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
Acked-by: Heiko Schocher <hs@denx.de>
Acked-by: Wolfgang Denk <wd@denx.de>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
Peter Tyser 2010-10-22 00:20:27 -05:00 committed by Kumar Gala
parent c00ac259f6
commit b9b1bc8542
1 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
post/drivers/i2c.c
View File

@ -21,8 +21,6 @@
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
#include <common.h>
/* /*
* I2C test * I2C test
* *
@ -36,6 +34,7 @@
* #endif * #endif
*/ */
#include <common.h>
#include <post.h> #include <post.h>
#include <i2c.h> #include <i2c.h>
@ -44,42 +43,41 @@
int i2c_post_test (int flags) int i2c_post_test (int flags)
{ {
unsigned int i; unsigned int i;
#ifndef I2C_ADDR_LIST
for (i = 0; i < 128; i++)
if (i2c_probe (i) == 0)
return 0;
/* No devices found */
return -1;
#else
unsigned int good = 0; unsigned int good = 0;
#ifdef I2C_ADDR_LIST
unsigned int bad = 0; unsigned int bad = 0;
int j; int j;
unsigned char i2c_addr_list[] = I2C_ADDR_LIST; unsigned char i2c_addr_list[] = I2C_ADDR_LIST;
unsigned char i2c_miss_list[] = I2C_ADDR_LIST; unsigned char i2c_miss_list[] = I2C_ADDR_LIST;
#endif
for (i = 0; i < 128; i++) { for (i = 0; i < 128; i++) {
if (i2c_probe (i) == 0) { if (i2c_probe(i) != 0)
#ifndef I2C_ADDR_LIST continue;
good++; for (j = 0; j < sizeof(i2c_addr_list); ++j) {
#else /* I2C_ADDR_LIST */ if (i == i2c_addr_list[j]) {
for (j=0; j<sizeof(i2c_addr_list); ++j) { good++;
if (i == i2c_addr_list[j]) { i2c_miss_list[j] = 0xFF;
good++; break;
i2c_miss_list[j] = 0xFF;
break;
}
} }
if (j == sizeof(i2c_addr_list)) { }
bad++;
post_log ("I2C: addr %02X not expected\n", if (j == sizeof(i2c_addr_list)) {
i); bad++;
} post_log("I2C: addr %02X not expected\n", i);
#endif /* I2C_ADDR_LIST */
} }
} }
#ifndef I2C_ADDR_LIST
return good > 0 ? 0 : -1;
#else /* I2C_ADDR_LIST */
if (good != sizeof(i2c_addr_list)) { if (good != sizeof(i2c_addr_list)) {
for (j=0; j<sizeof(i2c_miss_list); ++j) { for (j = 0; j < sizeof(i2c_miss_list); ++j) {
if (i2c_miss_list[j] != 0xFF) { if (i2c_miss_list[j] != 0xFF) {
post_log ("I2C: addr %02X did not respond\n", post_log("I2C: addr %02X did not respond\n",
i2c_miss_list[j]); i2c_miss_list[j]);
} }
} }