X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farmv4_5_cache.c;h=66dac3c20dab96078dce4fb81bfcbbb8124ad380;hp=e6f08894c6d4ba74b7c8d52b6d412fd0fd544303;hb=08d4411b59dd8bd0e7d8009003b71d23acbf6eee;hpb=68b05c55759970657c32607b3ce27c42e65cdad0

diff --git a/src/target/armv4_5_cache.c b/src/target/armv4_5_cache.c
index e6f08894c6..66dac3c20d 100644
--- a/src/target/armv4_5_cache.c
+++ b/src/target/armv4_5_cache.c
@@ -15,16 +15,17 @@
  *   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.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include "armv4_5_cache.h"
-#include "log.h"
+#include <helper/log.h>
 
-int armv4_5_identify_cache(u32 cache_type_reg, armv4_5_cache_common_t *cache)
+int armv4_5_identify_cache(uint32_t cache_type_reg, struct armv4_5_cache_common *cache)
 {
 	int size, assoc, M, len, multiplier;
 
@@ -37,16 +38,13 @@ int armv4_5_identify_cache(u32 cache_type_reg, armv4_5_cache_common_t *cache)
 	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,43 +52,35 @@ int armv4_5_identify_cache(u32 cache_type_reg, armv4_5_cache_common_t *cache)
 		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_s *cmd_ctx, armv4_5_cache_common_t *armv4_5_cache)
+int armv4_5_handle_cache_info_command(struct command_context *cmd_ctx, struct armv4_5_cache_common *armv4_5_cache)
 {
-	if (armv4_5_cache->ctype == -1)
-	{
+	if (armv4_5_cache->ctype == -1) {
 		command_print(cmd_ctx, "cache not yet identified");
 		return ERROR_OK;
 	}