X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farmv4_5_cache.h;h=2fd1ca3873e332a7478dcddbe14422d426ef899e;hp=456a32d3711b6791e33062fe48490c45cebebd59;hb=9f021c2bc129f8f7c659c64ad19531bd8073264a;hpb=405a5df7860bf9c0465fce4ac517083a1f9c4a4b

diff --git a/src/target/armv4_5_cache.h b/src/target/armv4_5_cache.h
index 456a32d371..2fd1ca3873 100644
--- a/src/target/armv4_5_cache.h
+++ b/src/target/armv4_5_cache.h
@@ -13,27 +13,22 @@
  *   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.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
-#ifndef ARMV4_5_CACHE_H
-#define ARMV4_5_CACHE_H
 
-#include "types.h"
+#ifndef OPENOCD_TARGET_ARMV4_5_CACHE_H
+#define OPENOCD_TARGET_ARMV4_5_CACHE_H
 
-struct command_context_s;
+struct command_context;
 
-struct armv4_5_cachesize
-{
+struct armv4_5_cachesize {
 	int linelen;
 	int associativity;
 	int nsets;
 	int cachesize;
 };
 
-struct armv4_5_cache_common
-{
+struct armv4_5_cache_common {
 	int ctype;	/* specify supported cache operations */
 	int separate;	/* separate caches or unified cache */
 	struct armv4_5_cachesize d_u_size;	/* data cache */
@@ -47,15 +42,14 @@ int armv4_5_identify_cache(uint32_t cache_type_reg,
 int armv4_5_cache_state(uint32_t cp15_control_reg,
 		struct armv4_5_cache_common *cache);
 
-int armv4_5_handle_cache_info_command(struct command_context_s *cmd_ctx,
+int armv4_5_handle_cache_info_command(struct command_context *cmd_ctx,
 		struct armv4_5_cache_common *armv4_5_cache);
 
-enum
-{
+enum {
 	ARMV4_5_D_U_CACHE_ENABLED = 0x4,
 	ARMV4_5_I_CACHE_ENABLED = 0x1000,
 	ARMV4_5_WRITE_BUFFER_ENABLED = 0x8,
 	ARMV4_5_CACHE_RR_BIT = 0x5000,
 };
 
-#endif /* ARMV4_5_CACHE_H */
+#endif /* OPENOCD_TARGET_ARMV4_5_CACHE_H */