target/armv7a_cache_l2x: change prototype of arm7a_handle_l2x_cache_info_command()

[openocd.git] / src / target / armv7a_cache_l2x.c

diff --git a/src/target/armv7a_cache_l2x.c b/src/target/armv7a_cache_l2x.c
index 8b35fd89b54268d9974538c03f256ff6f4363bc1..0aa69538285be99df681109056123012edba9d53 100644 (file)
--- a/src/target/armv7a_cache_l2x.c
+++ b/src/target/armv7a_cache_l2x.c
@@ -11,6 +11,9 @@
  *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
  *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
  *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -60,12 +63,12 @@ int arm7a_l2x_flush_all_data(struct target *target)
 
        l2_way_val = (1 << l2x_cache->way) - 1;
 
-       return target_write_phys_memory(target,
+       return target_write_phys_u32(target,
                        l2x_cache->base + L2X0_CLEAN_INV_WAY,
-                       4, 1, (uint8_t *)&l2_way_val);
+                       l2_way_val);
 }
 
-int armv7a_l2x_cache_flush_virt(struct target *target, uint32_t virt,
+int armv7a_l2x_cache_flush_virt(struct target *target, target_addr_t virt,
                                        uint32_t size)
 {
        struct armv7a_common *armv7a = target_to_armv7a(target);
@@ -80,16 +83,15 @@ int armv7a_l2x_cache_flush_virt(struct target *target, uint32_t virt,
                return retval;
 
        for (i = 0; i < size; i += linelen) {
-               uint32_t pa, offs = virt + i;
+               target_addr_t pa, offs = virt + i;
 
                /* FIXME: use less verbose virt2phys? */
                retval = target->type->virt2phys(target, offs, &pa);
                if (retval != ERROR_OK)
                        goto done;
 
-               retval = target_write_phys_memory(target,
-                               l2x_cache->base + L2X0_CLEAN_INV_LINE_PA,
-                               4, 1, (uint8_t *)&pa);
+               retval = target_write_phys_u32(target,
+                               l2x_cache->base + L2X0_CLEAN_INV_LINE_PA, pa);
                if (retval != ERROR_OK)
                        goto done;
        }
@@ -101,7 +103,7 @@ done:
        return retval;
 }
 
-static int armv7a_l2x_cache_inval_virt(struct target *target, uint32_t virt,
+static int armv7a_l2x_cache_inval_virt(struct target *target, target_addr_t virt,
                                        uint32_t size)
 {
        struct armv7a_common *armv7a = target_to_armv7a(target);
@@ -116,16 +118,15 @@ static int armv7a_l2x_cache_inval_virt(struct target *target, uint32_t virt,
                return retval;
 
        for (i = 0; i < size; i += linelen) {
-               uint32_t pa, offs = virt + i;
+               target_addr_t pa, offs = virt + i;
 
                /* FIXME: use less verbose virt2phys? */
                retval = target->type->virt2phys(target, offs, &pa);
                if (retval != ERROR_OK)
                        goto done;
 
-               retval = target_write_phys_memory(target,
-                               l2x_cache->base + L2X0_INV_LINE_PA,
-                               4, 1, (uint8_t *)&pa);
+               retval = target_write_phys_u32(target,
+                               l2x_cache->base + L2X0_INV_LINE_PA, pa);
                if (retval != ERROR_OK)
                        goto done;
        }
@@ -137,7 +138,7 @@ done:
        return retval;
 }
 
-static int armv7a_l2x_cache_clean_virt(struct target *target, uint32_t virt,
+static int armv7a_l2x_cache_clean_virt(struct target *target, target_addr_t virt,
                                        unsigned int size)
 {
        struct armv7a_common *armv7a = target_to_armv7a(target);
@@ -152,16 +153,15 @@ static int armv7a_l2x_cache_clean_virt(struct target *target, uint32_t virt,
                return retval;
 
        for (i = 0; i < size; i += linelen) {
-               uint32_t pa, offs = virt + i;
+               target_addr_t pa, offs = virt + i;
 
                /* FIXME: use less verbose virt2phys? */
                retval = target->type->virt2phys(target, offs, &pa);
                if (retval != ERROR_OK)
                        goto done;
 
-               retval = target_write_phys_memory(target,
-                               l2x_cache->base + L2X0_CLEAN_LINE_PA,
-                               4, 1, (uint8_t *)&pa);
+               retval = target_write_phys_u32(target,
+                               l2x_cache->base + L2X0_CLEAN_LINE_PA, pa);
                if (retval != ERROR_OK)
                        goto done;
        }
@@ -173,18 +173,18 @@ done:
        return retval;
 }
 
-static int arm7a_handle_l2x_cache_info_command(struct command_context *cmd_ctx,
+static int arm7a_handle_l2x_cache_info_command(struct command_invocation *cmd,
        struct armv7a_cache_common *armv7a_cache)
 {
        struct armv7a_l2x_cache *l2x_cache = (struct armv7a_l2x_cache *)
                (armv7a_cache->outer_cache);
 
        if (armv7a_cache->info == -1) {
-               command_print(cmd_ctx, "cache not yet identified");
+               command_print(cmd->ctx, "cache not yet identified");
                return ERROR_OK;
        }
 
-       command_print(cmd_ctx,
+       command_print(cmd->ctx,
                      "L2 unified cache Base Address 0x%" PRIx32 ", %" PRId32 " ways",
                      l2x_cache->base, l2x_cache->way);
 
@@ -235,7 +235,7 @@ COMMAND_HANDLER(arm7a_l2x_cache_info_command)
        if (retval)
                return retval;
 
-       return arm7a_handle_l2x_cache_info_command(CMD_CTX,
+       return arm7a_handle_l2x_cache_info_command(CMD,
                        &armv7a->armv7a_mmu.armv7a_cache);
 }
 
@@ -249,7 +249,8 @@ COMMAND_HANDLER(arm7a_l2x_cache_flush_all_command)
 COMMAND_HANDLER(arm7a_l2x_cache_flush_virt_cmd)
 {
        struct target *target = get_current_target(CMD_CTX);
-       uint32_t virt, size;
+       target_addr_t virt;
+       uint32_t size;
 
        if (CMD_ARGC == 0 || CMD_ARGC > 2)
                return ERROR_COMMAND_SYNTAX_ERROR;
@@ -259,7 +260,7 @@ COMMAND_HANDLER(arm7a_l2x_cache_flush_virt_cmd)
        else
                size = 1;
 
-       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], virt);
+       COMMAND_PARSE_ADDRESS(CMD_ARGV[0], virt);
 
        return armv7a_l2x_cache_flush_virt(target, virt, size);
 }
@@ -267,7 +268,8 @@ COMMAND_HANDLER(arm7a_l2x_cache_flush_virt_cmd)
 COMMAND_HANDLER(arm7a_l2x_cache_inval_virt_cmd)
 {
        struct target *target = get_current_target(CMD_CTX);
-       uint32_t virt, size;
+       target_addr_t virt;
+       uint32_t size;
 
        if (CMD_ARGC == 0 || CMD_ARGC > 2)
                return ERROR_COMMAND_SYNTAX_ERROR;
@@ -277,7 +279,7 @@ COMMAND_HANDLER(arm7a_l2x_cache_inval_virt_cmd)
        else
                size = 1;
 
-       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], virt);
+       COMMAND_PARSE_ADDRESS(CMD_ARGV[0], virt);
 
        return armv7a_l2x_cache_inval_virt(target, virt, size);
 }
@@ -285,7 +287,8 @@ COMMAND_HANDLER(arm7a_l2x_cache_inval_virt_cmd)
 COMMAND_HANDLER(arm7a_l2x_cache_clean_virt_cmd)
 {
        struct target *target = get_current_target(CMD_CTX);
-       uint32_t virt, size;
+       target_addr_t virt;
+       uint32_t size;
 
        if (CMD_ARGC == 0 || CMD_ARGC > 2)
                return ERROR_COMMAND_SYNTAX_ERROR;
@@ -295,7 +298,7 @@ COMMAND_HANDLER(arm7a_l2x_cache_clean_virt_cmd)
        else
                size = 1;
 
-       COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], virt);
+       COMMAND_PARSE_ADDRESS(CMD_ARGV[0], virt);
 
        return armv7a_l2x_cache_clean_virt(target, virt, size);
 }