stlink: avoid null pointer dereference in stlink_usb_close()

[fw/openocd] / src / target / arm7tdmi.h

diff --git a/src/target/arm7tdmi.h b/src/target/arm7tdmi.h
index da0f7722bd714ead01927c1c503d444aca4104b8..a44ceee53bc92e83cf26e9fe38701331db97fd11 100644 (file)
--- a/src/target/arm7tdmi.h
+++ b/src/target/arm7tdmi.h
@@ -18,23 +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.
- */
-typedef struct arm7tdmi_common_s
-{
-       arm7_9_common_t arm7_9_common;
-} arm7tdmi_common_t;
-
-int arm7tdmi_init_arch_info(target_t *target, arm7tdmi_common_t *arm7tdmi, struct jtag_tap *tap);
-int arm7tdmi_init_target(struct command_context_s *cmd_ctx, struct target_s *target);
-int arm7tdmi_examine(struct target_s *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 */