X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farmv4_5_cache.h;h=c529b458413345f80f668de6b51eb1a84ec5b933;hb=e6d979eefcc99aeb3f95fab67598af461ef234c1;hp=0a6e88ae560f78bcfa3a082588a585bc7fed6ea7;hpb=68b05c55759970657c32607b3ce27c42e65cdad0;p=openocd.git

diff --git a/src/target/armv4_5_cache.h b/src/target/armv4_5_cache.h
index 0a6e88ae56..c529b45841 100644
--- a/src/target/armv4_5_cache.h
+++ b/src/target/armv4_5_cache.h
@@ -20,32 +20,35 @@
 #ifndef ARMV4_5_CACHE_H
 #define ARMV4_5_CACHE_H
 
-#include "types.h"
+#include <helper/types.h>
 
-struct command_context_s;
+struct command_context;
 
-typedef struct armv4_5_cachesize_s
+struct armv4_5_cachesize
 {
 	int linelen;
 	int associativity;
 	int nsets;
 	int cachesize;
-} armv4_5_cachesize_t;
+};
 
-typedef struct armv4_5_cache_common_s
+struct armv4_5_cache_common
 {
 	int ctype;	/* specify supported cache operations */
 	int separate;	/* separate caches or unified cache */
-	armv4_5_cachesize_t d_u_size;	/* data cache */
-	armv4_5_cachesize_t i_size; /* instruction cache */
+	struct armv4_5_cachesize d_u_size;	/* data cache */
+	struct armv4_5_cachesize i_size; /* instruction cache */
 	int i_cache_enabled;
 	int d_u_cache_enabled;
-} armv4_5_cache_common_t;
+};
 
-extern int armv4_5_identify_cache(u32 cache_type_reg, armv4_5_cache_common_t *cache);
-extern int armv4_5_cache_state(u32 cp15_control_reg, armv4_5_cache_common_t *cache);
+int armv4_5_identify_cache(uint32_t cache_type_reg,
+		struct armv4_5_cache_common *cache);
+int armv4_5_cache_state(uint32_t cp15_control_reg,
+		struct armv4_5_cache_common *cache);
 
-extern 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);
 
 enum
 {