rename CFG_ macros to CONFIG_SYS

[karo-tx-uboot.git] / post / board / lwmon5 / dspic.c

diff --git a/post/board/lwmon5/dspic.c b/post/board/lwmon5/dspic.c
index fcbbc6031c10ad1c652b7ae52dec5309a83b38ab..ff2ed0566fcbf177a45066d40ac7fc57464d6b9e 100644 (file)
--- a/post/board/lwmon5/dspic.c
+++ b/post/board/lwmon5/dspic.c
@@ -24,8 +24,6 @@
 
 #include <common.h>
 
-#ifdef CONFIG_POST
-
 /* There are two tests for dsPIC currently implemented:
  * 1. dsPIC ready test. Done in board_early_init_f(). Only result verified here.
  * 2. dsPIC POST result test.  This test gets dsPIC POST codes and version.
@@ -42,12 +40,12 @@ DECLARE_GLOBAL_DATA_PTR;
 #define DSPIC_SYS_ERROR_REG    0x802
 #define DSPIC_VERSION_REG      0x804
 
-#if CONFIG_POST & CFG_POST_BSPEC1
+#if CONFIG_POST & CONFIG_SYS_POST_BSPEC1
 
 /* Verify that dsPIC ready test done early at hw init passed ok */
 int dspic_init_post_test(int flags)
 {
-       if (in_be32((void *)CFG_DSPIC_TEST_ADDR) & CFG_DSPIC_TEST_MASK) {
+       if (in_be32((void *)CONFIG_SYS_DSPIC_TEST_ADDR) & CONFIG_SYS_DSPIC_TEST_MASK) {
                post_log("dsPIC init test failed\n");
                return 1;
        }
@@ -55,31 +53,29 @@ int dspic_init_post_test(int flags)
        return 0;
 }
 
-#endif /* CONFIG_POST & CFG_POST_BSPEC1 */
+#endif /* CONFIG_POST & CONFIG_SYS_POST_BSPEC1 */
 
-#if CONFIG_POST & CFG_POST_BSPEC2
+#if CONFIG_POST & CONFIG_SYS_POST_BSPEC2
 /* Read a register from the dsPIC. */
-int dspic_read(ushort reg, ushort *data)
+int dspic_read(ushort reg)
 {
-       uchar buf[sizeof(*data)];
-       int rval;
-
-       rval = i2c_read(CFG_I2C_DSPIC_IO_ADDR, reg, sizeof(reg),
-                                              buf, sizeof(*data));
+       uchar buf[2];
 
-       *data = (buf[0] << 8) | buf[1];
+       if (i2c_read(CONFIG_SYS_I2C_DSPIC_IO_ADDR, reg, 2, buf, 2))
+               return -1;
 
-       return rval;
+       return (uint)((buf[0] << 8) | buf[1]);
 }
 
 /* Verify error codes regs, display version */
 int dspic_post_test(int flags)
 {
-       ushort data;
+       int data;
        int ret = 0;
 
        post_log("\n");
-       if (dspic_read(DSPIC_VERSION_REG, &data)) {
+       data = dspic_read(DSPIC_VERSION_REG);
+       if (data == -1) {
                post_log("dsPIC : failed read version\n");
                ret = 1;
        } else {
@@ -87,24 +83,23 @@ int dspic_post_test(int flags)
                        (data >> 8) & 0xFF, data & 0xFF);
        }
 
-       if (dspic_read(DSPIC_POST_ERROR_REG, &data)) {
+       data = dspic_read(DSPIC_POST_ERROR_REG);
+       if (data != 0) ret = 1;
+       if (data == -1) {
                post_log("dsPIC : failed read POST code\n");
        } else {
                post_log("dsPIC POST code 0x%04X\n", data);
        }
-       if (data != 0)
-               ret = 1;
 
-       if (dspic_read(DSPIC_SYS_ERROR_REG, &data)) {
+       data = dspic_read(DSPIC_SYS_ERROR_REG);
+       if (data == -1) {
                post_log("dsPIC : failed read system error\n");
                ret = 1;
-       } else if (data != 0) {
+       } else {
                post_log("dsPIC SYS-ERROR code: 0x%04X\n", data);
-               ret = 1;
        }
 
        return ret;
 }
 
-#endif /* CONFIG_POST & CFG_POST_BSPEC2 */
-#endif /* CONFIG_POST */
+#endif /* CONFIG_POST & CONFIG_SYS_POST_BSPEC2 */