Unused variables

Fix a few errors with set and unused variables detected by GCC 4.7.0

Change-Id: I59b748e18e514ee9f0cde7883b4ed5116198bd4a
Signed-off-by: Freddie Chopin <freddie.chopin@gmail.com>
Reviewed-on: http://openocd.zylin.com/36
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>

diff --git a/src/target/armv7a.c b/src/target/armv7a.c
index e0d08827f62a730eed52eef462efac54fcb5292e..0bac27fa15a740833e5eee5c844803cd00f942b8 100644 (file)
--- a/src/target/armv7a.c
+++ b/src/target/armv7a.c
@@ -129,7 +129,6 @@ int armv7a_mmu_translate_va(struct target *target,  uint32_t va, uint32_t *val)
        uint32_t first_lvl_descriptor = 0x0;
        uint32_t second_lvl_descriptor = 0x0;
        int retval;
-       uint32_t cb;
        struct armv7a_common *armv7a = target_to_armv7a(target);
        struct arm_dpm *dpm = armv7a->armv4_5_common.dpm;
        uint32_t ttb = 0; /*  default ttb0 */
@@ -168,7 +167,6 @@ int armv7a_mmu_translate_va(struct target *target,  uint32_t va, uint32_t *val)
        if ((first_lvl_descriptor & 0x3) == 2)
        {
                /* section descriptor */
-               cb = (first_lvl_descriptor & 0xc) >> 2;
                *val = (first_lvl_descriptor & 0xfff00000) | (va & 0x000fffff);
                return ERROR_OK;
        }
@@ -203,9 +201,6 @@ int armv7a_mmu_translate_va(struct target *target,  uint32_t va, uint32_t *val)
                return ERROR_TARGET_TRANSLATION_FAULT;
        }
 
-       /* cacheable/bufferable is always specified in bits 3-2 */
-       cb = (second_lvl_descriptor & 0xc) >> 2;
-
        if ((second_lvl_descriptor & 0x3) == 1)
        {
                /* large page descriptor */
@@ -243,7 +238,7 @@ int armv7a_mmu_translate_va_pa(struct target *target, uint32_t va,
        struct armv7a_common *armv7a = target_to_armv7a(target);
        struct arm_dpm *dpm = armv7a->armv4_5_common.dpm;
        uint32_t virt = va & ~0xfff;
-       uint32_t NOS,NS,SH,INNER,OUTER;
+       uint32_t NOS,NS,INNER,OUTER;
        *val = 0xdeadbeef;
        retval = dpm->prepare(dpm);
        if (retval != ERROR_OK)
@@ -260,7 +255,6 @@ int armv7a_mmu_translate_va_pa(struct target *target, uint32_t va,
        /* decode memory attribute */
        NOS = (*val >> 10) & 1; /*  Not Outer shareable */
        NS = (*val >> 9) & 1; /* Non secure */
-       SH = (*val >> 7 )& 1; /*  shareable */
        INNER = (*val >> 4) &  0x7;
        OUTER = (*val >> 2) & 0x3;
 
@@ -726,7 +720,6 @@ done:
 
 int armv7a_init_arch_info(struct target *target, struct armv7a_common *armv7a)
 {
-       struct armv7a_common *again;
        struct arm *armv4_5 = &armv7a->armv4_5_common;
     armv4_5->arch_info = armv7a;
        target->arch_info = &armv7a->armv4_5_common;
@@ -738,7 +731,6 @@ int armv7a_init_arch_info(struct target *target, struct armv7a_common *armv7a)
        armv7a->armv7a_mmu.armv7a_cache.ctype = -1;
        armv7a->armv7a_mmu.armv7a_cache.flush_all_data_cache = NULL;
     armv7a->armv7a_mmu.armv7a_cache.display_cache_info = NULL;
-    again =target_to_armv7a(target);
        return ERROR_OK;
 }
 

diff --git a/src/target/cortex_a.c b/src/target/cortex_a.c
index 7547f17f6328b97fe2e357864d5a7c0d89b9502e..2370d95c95787cf0e318f30f56d453186c5b7acf 100755 (executable)
--- a/src/target/cortex_a.c
+++ b/src/target/cortex_a.c
@@ -92,7 +92,7 @@ static int cortex_a8_restore_cp15_control_reg(struct target* target)
                                1, 0,   /* CRn, CRm */
                                cortex_a8->cp15_control_reg);
        }
-       return ERROR_OK;
+       return retval;
 }
 
 /*  check address before cortex_a8_apb read write access with mmu on