X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Ftarget%2Farm720t.h;h=35d45ffd4076a167445b126cdfc531ad047f5283;hb=58256d48358ab695e970b5e61546aecb366ad914;hp=ab9aef6ab506fd314a28f34ab1d1765081da7af6;hpb=f6dae0cf84de26846a18f3fcaea842ccd898a5c1;p=openocd.git diff --git a/src/target/arm720t.h b/src/target/arm720t.h index ab9aef6ab5..35d45ffd40 100644 --- a/src/target/arm720t.h +++ b/src/target/arm720t.h @@ -15,8 +15,9 @@ * 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 ARM720T_H #define ARM720T_H @@ -25,9 +26,8 @@ #define ARM720T_COMMON_MAGIC 0xa720a720 -struct arm720t_common -{ - struct arm7tdmi_common arm7tdmi_common; +struct arm720t_common { + struct arm7_9_common arm7_9_common; uint32_t common_magic; struct armv4_5_mmu_common armv4_5_mmu; uint32_t cp15_control_reg; @@ -35,11 +35,9 @@ struct arm720t_common uint32_t far_reg; }; -static inline struct arm720t_common * -target_to_arm720(struct target_s *target) +static inline struct arm720t_common *target_to_arm720(struct target *target) { - return container_of(target->arch_info, struct arm720t_common, - arm7tdmi_common.arm7_9_common.armv4_5_common); + return container_of(target->arch_info, struct arm720t_common, arm7_9_common.arm); } #endif /* ARM720T_H */