X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Fmips_m4k.h;h=ea09ae527ffc8d1892c0655e506c3987aa76902d;hb=81a33244df232a27a0f42f39aa34141009da3c3d;hp=bb37ee2d4a063b54931cc50f13dda54d0941bc57;hpb=3f59fcf77e5eb1d8c504a337b05bb1a5797e656f;p=openocd.git

diff --git a/src/target/mips_m4k.h b/src/target/mips_m4k.h
index bb37ee2d4a..ea09ae527f 100644
--- a/src/target/mips_m4k.h
+++ b/src/target/mips_m4k.h
@@ -4,6 +4,9 @@
  *                                                                         *
  *   Copyright (C) 2008 by David T.L. Wong                                 *
  *                                                                         *
+ *   Copyright (C) 2011 by Drasko DRASKOVIC                                *
+ *   drasko.draskovic@gmail.com                                            *
+ *                                                                         *
  *   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     *
@@ -15,23 +18,18 @@
  *   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 MIPS_M4K_H
-#define MIPS_M4K_H
-
-#include <helper/types.h>
+#ifndef OPENOCD_TARGET_MIPS_M4K_H
+#define OPENOCD_TARGET_MIPS_M4K_H
 
 struct target;
 
 #define MIPSM4K_COMMON_MAGIC	0xB321B321
 
-struct mips_m4k_common
-{
-	int common_magic;
+struct mips_m4k_common {
+	uint32_t common_magic;
 	bool is_pic32mx;
 	struct mips32_common mips32;
 };
@@ -43,4 +41,17 @@ target_to_m4k(struct target *target)
 			struct mips_m4k_common, mips32);
 }
 
-#endif	/*MIPS_M4K_H*/
+static inline void mips_m4k_isa_filter(enum mips32_isa_imp isa_imp, target_addr_t  *addr)
+{
+	if (isa_imp <= 1) {	/* if only one isa implemented */
+		target_addr_t address = (*addr & ~1) | isa_imp;
+
+		if (address != *addr) {
+			LOG_USER("Warning: isa bit changed due to isa not implemented");
+			*addr = address;
+		}
+	}
+}
+extern const struct command_registration mips_m4k_command_handlers[];
+
+#endif /* OPENOCD_TARGET_MIPS_M4K_H */