]> git.sur5r.net Git - openocd/commitdiff
mips: mips_ejtag_get_impcode error propagation added
authorØyvind Harboe <oyvind.harboe@zylin.com>
Thu, 31 Mar 2011 21:39:10 +0000 (23:39 +0200)
committerØyvind Harboe <oyvind.harboe@zylin.com>
Thu, 31 Mar 2011 21:46:56 +0000 (23:46 +0200)
Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
src/target/mips_ejtag.c
src/target/mips_m4k.c

index 8e1404f1868eee2acc1504355f31df49ea47368b..f9eaef197e4798433ca1599d3c43db95c41496e2 100644 (file)
@@ -261,8 +261,11 @@ int mips_ejtag_read_debug(struct mips_ejtag *ejtag_info, uint32_t* debug_reg)
 int mips_ejtag_init(struct mips_ejtag *ejtag_info)
 {
        uint32_t ejtag_version;
+       int retval;
 
-       mips_ejtag_get_impcode(ejtag_info, &ejtag_info->impcode);
+       retval = mips_ejtag_get_impcode(ejtag_info, &ejtag_info->impcode);
+       if (retval != ERROR_OK)
+               return retval;
        LOG_DEBUG("impcode: 0x%8.8" PRIx32 "", ejtag_info->impcode);
 
        /* get ejtag version */
index 3a79273b28614b2549b5f86d74b2086e71cb92cd..0508c35f80d7ab7dc99c9c5a113cfcb07eb42f15 100644 (file)
@@ -940,7 +940,9 @@ static int mips_m4k_examine(struct target *target)
 
        if (!target_was_examined(target))
        {
-               mips_ejtag_get_idcode(ejtag_info, &idcode);
+               retval = mips_ejtag_get_idcode(ejtag_info, &idcode);
+               if (retval != ERROR_OK)
+                       return retval;
                ejtag_info->idcode = idcode;
 
                if (((idcode >> 1) & 0x7FF) == 0x29)