Remove FSF address from GPL notices

[openocd.git] / src / target / armv7a.h

diff --git a/src/target/armv7a.h b/src/target/armv7a.h
index 69ccbd914b23aba3d8163a14b377f07d67a74c17..7d9abf10f92ae6b6d015324b44c427f1320287f6 100644 (file)
--- a/src/target/armv7a.h
+++ b/src/target/armv7a.h
@@ -12,9 +12,7 @@
  *   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.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
 
 #ifndef ARMV7A_H
@@ -63,12 +61,20 @@ struct armv7a_cachesize {
        uint32_t way_shift;
 };
 
-struct armv7a_cache_common {
-       int ctype;
+/* information about one architecture cache at any level */
+struct armv7a_arch_cache {
+       int ctype;                              /* cache type, CLIDR encoding */
        struct armv7a_cachesize d_u_size;       /* data cache */
        struct armv7a_cachesize i_size;         /* instruction cache */
+};
+
+/* common cache information */
+struct armv7a_cache_common {
+       int info;                               /* -1 invalid, else valid */
+       int loc;                                /* level of coherency */
        uint32_t dminline;                      /* minimum d-cache linelen */
        uint32_t iminline;                      /* minimum i-cache linelen */
+       struct armv7a_arch_cache arch[6];       /* cache info, L1 - L7 */
        int i_cache_enabled;
        int d_u_cache_enabled;
        int auto_cache_enabled;                 /* openocd automatic
@@ -76,8 +82,6 @@ struct armv7a_cache_common {
        /* outer unified cache if some */
        void *outer_cache;
        int (*flush_all_data_cache)(struct target *target);
-       int (*display_cache_info)(struct command_context *cmd_ctx,
-                       struct armv7a_cache_common *armv7a_cache);
 };
 
 struct armv7a_mmu_common {
@@ -86,7 +90,6 @@ struct armv7a_mmu_common {
        uint32_t ttbcr;     /* cache for ttbcr register */
        uint32_t ttbr_mask[2];
        uint32_t ttbr_range[2];
-       uint32_t os_border;
 
        int (*read_physical_memory)(struct target *target, uint32_t address, uint32_t size,
                        uint32_t count, uint8_t *buffer);
@@ -99,13 +102,11 @@ struct armv7a_common {
        int common_magic;
        struct reg_cache *core_cache;
 
-       struct adiv5_dap dap;
-
        /* Core Debug Unit */
        struct arm_dpm dpm;
        uint32_t debug_base;
-       uint8_t debug_ap;
-       uint8_t memory_ap;
+       struct adiv5_ap *debug_ap;
+       struct adiv5_ap *memory_ap;
        bool memory_ap_available;
        /* mdir */
        uint8_t multi_processor_system;
@@ -166,6 +167,7 @@ target_to_armv7a(struct target *target)
 
 /* See ARMv7a arch spec section C10.7 */
 #define CPUDBG_DSCCR           0x028
+#define CPUDBG_DSMCR           0x02C
 
 /* See ARMv7a arch spec section C10.8 */
 #define CPUDBG_AUTHSTATUS      0xFB8