X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Ftarget%2Farm7tdmi.h;h=053f64df8ea13b1bfacfc7a6de4fead9705108fe;hp=4a0a1ed903baf44eeb846a8101fed70d1353750e;hb=d4b7cbff88bb5eb14fececdbd8e2a0b3e58ce6e0;hpb=0f1163e823c6ca3c2a81fa296157f5dde0635fea

diff --git a/src/target/arm7tdmi.h b/src/target/arm7tdmi.h
index 4a0a1ed903..053f64df8e 100644
--- a/src/target/arm7tdmi.h
+++ b/src/target/arm7tdmi.h
@@ -16,25 +16,17 @@
  *   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 ARM7TDMI_H
-#define ARM7TDMI_H
 
-#include "embeddedice.h"
+#ifndef OPENOCD_TARGET_ARM7TDMI_H
+#define OPENOCD_TARGET_ARM7TDMI_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;
-};
+#include "embeddedice.h"
 
-int arm7tdmi_init_arch_info(struct target *target, struct arm7tdmi_common *arm7tdmi, struct jtag_tap *tap);
-int arm7tdmi_init_target(struct command_context_s *cmd_ctx, struct target *target);
-int arm7tdmi_examine(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 */
+#endif /* OPENOCD_TARGET_ARM7TDMI_H */