cortex_m.c: Use two byte breakpoint for 32bit Thumb-2 request

[openocd] / src / target / arm7tdmi.h

diff --git a/src/target/arm7tdmi.h b/src/target/arm7tdmi.h
index 4ed6f3e23471de0952c6a70992e4ff2eb74194b6..a44ceee53bc92e83cf26e9fe38701331db97fd11 100644 (file)
--- a/src/target/arm7tdmi.h
+++ b/src/target/arm7tdmi.h
@@ -18,22 +18,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.           *
  ***************************************************************************/
+
 #ifndef ARM7TDMI_H
 #define ARM7TDMI_H
 
 #include "embeddedice.h"
 
-/* FIXME we don't really need a separate arm7tdmi struct any more...
- * remove it, the arm7/arm9 common struct suffices.
- */
-struct arm7tdmi_common
-{
-       struct arm7_9_common arm7_9_common;
-};
-
-int arm7tdmi_init_arch_info(struct target *target, struct arm7tdmi_common *arm7tdmi, struct jtag_tap *tap);
-int arm7tdmi_init_target(struct command_context *cmd_ctx, struct target *target);
+int arm7tdmi_init_arch_info(struct target *target,
+               struct arm7_9_common *arm7_9, struct jtag_tap *tap);
+int arm7tdmi_init_target(struct command_context *cmd_ctx,
+               struct target *target);
 
 #endif /* ARM7TDMI_H */