X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Ftarget%2Farmv4_5_cache.c;h=e12c43d336dd103ba558b78e0413b37a242c5d9e;hb=HEAD;hp=dcbcef3a131947d2ca0941b61244f0d96aac1c45;hpb=c79cca04bed78839a18e73f3996805eb8001a812;p=fw%2Fopenocd

diff --git a/src/target/armv4_5_cache.c b/src/target/armv4_5_cache.c
index dcbcef3a1..e12c43d33 100644
--- a/src/target/armv4_5_cache.c
+++ b/src/target/armv4_5_cache.c
@@ -1,22 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 /***************************************************************************
  *   Copyright (C) 2005 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   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, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -37,16 +25,13 @@ int armv4_5_identify_cache(uint32_t cache_type_reg, struct armv4_5_cache_common
 	len = (cache_type_reg & 0x3000) >> 12;
 	multiplier = 2 + M;
 
-	if ((assoc != 0) || (M != 1)) /* assoc 0 and M 1 means cache absent */
-	{
+	if ((assoc != 0) || (M != 1)) /* assoc 0 and M 1 means cache absent */ {
 		/* cache is present */
 		cache->d_u_size.linelen = 1 << (len + 3);
 		cache->d_u_size.associativity = multiplier << (assoc - 1);
 		cache->d_u_size.nsets = 1 << (size + 6 - assoc - len);
 		cache->d_u_size.cachesize = multiplier << (size + 8);
-	}
-	else
-	{
+	} else {
 		/* cache is absent */
 		cache->d_u_size.linelen = -1;
 		cache->d_u_size.associativity = -1;
@@ -54,57 +39,49 @@ int armv4_5_identify_cache(uint32_t cache_type_reg, struct armv4_5_cache_common
 		cache->d_u_size.cachesize = -1;
 	}
 
-	if (cache->separate)
-	{
+	if (cache->separate) {
 		size = (cache_type_reg & 0x1c0) >> 6;
 		assoc = (cache_type_reg & 0x38) >> 3;
 		M = (cache_type_reg & 0x4) >> 2;
 		len = (cache_type_reg & 0x3);
 		multiplier = 2 + M;
 
-		if ((assoc != 0) || (M != 1)) /* assoc 0 and M 1 means cache absent */
-		{
+		if ((assoc != 0) || (M != 1)) /* assoc 0 and M 1 means cache absent */ {
 			/* cache is present */
 			cache->i_size.linelen = 1 << (len + 3);
 			cache->i_size.associativity = multiplier << (assoc - 1);
 			cache->i_size.nsets = 1 << (size + 6 - assoc - len);
 			cache->i_size.cachesize = multiplier << (size + 8);
-		}
-		else
-		{
+		} else {
 			/* cache is absent */
 			cache->i_size.linelen = -1;
 			cache->i_size.associativity = -1;
 			cache->i_size.nsets = -1;
 			cache->i_size.cachesize = -1;
 		}
-	}
-	else
-	{
+	} else
 		cache->i_size = cache->d_u_size;
-	}
 
 	return ERROR_OK;
 }
 
-int armv4_5_handle_cache_info_command(struct command_context *cmd_ctx, struct armv4_5_cache_common *armv4_5_cache)
+int armv4_5_handle_cache_info_command(struct command_invocation *cmd, struct armv4_5_cache_common *armv4_5_cache)
 {
-	if (armv4_5_cache->ctype == -1)
-	{
-		command_print(cmd_ctx, "cache not yet identified");
+	if (armv4_5_cache->ctype == -1) {
+		command_print(cmd, "cache not yet identified");
 		return ERROR_OK;
 	}
 
-	command_print(cmd_ctx, "cache type: 0x%1.1x, %s", armv4_5_cache->ctype,
+	command_print(cmd, "cache type: 0x%1.1x, %s", armv4_5_cache->ctype,
 		(armv4_5_cache->separate) ? "separate caches" : "unified cache");
 
-	command_print(cmd_ctx, "D-Cache: linelen %i, associativity %i, nsets %i, cachesize 0x%x",
+	command_print(cmd, "D-Cache: linelen %i, associativity %i, nsets %i, cachesize 0x%x",
 		armv4_5_cache->d_u_size.linelen,
 		armv4_5_cache->d_u_size.associativity,
 		armv4_5_cache->d_u_size.nsets,
 		armv4_5_cache->d_u_size.cachesize);
 
-	command_print(cmd_ctx, "I-Cache: linelen %i, associativity %i, nsets %i, cachesize 0x%x",
+	command_print(cmd, "I-Cache: linelen %i, associativity %i, nsets %i, cachesize 0x%x",
 		armv4_5_cache->i_size.linelen,
 		armv4_5_cache->i_size.associativity,
 		armv4_5_cache->i_size.nsets,