projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
openocd: use unique name for struct command_registration
[fw/openocd]
/
src
/
target
/
arm920t.h
diff --git
a/src/target/arm920t.h
b/src/target/arm920t.h
index 20f614d7dad324129b31bdfbb082fa1784b957a3..2e3b08ca3a31940690e94f92437ec1dbd7c146df 100644
(file)
--- a/
src/target/arm920t.h
+++ b/
src/target/arm920t.h
@@
-13,20
+13,18
@@
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* 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 ARM920T_H
-#define ARM920T_H
+
+#ifndef OPENOCD_TARGET_ARM920T_H
+#define OPENOCD_TARGET_ARM920T_H
#include "arm9tdmi.h"
#include "armv4_5_mmu.h"
#define ARM920T_COMMON_MAGIC 0xa920a920
#include "arm9tdmi.h"
#include "armv4_5_mmu.h"
#define ARM920T_COMMON_MAGIC 0xa920a920
-struct arm920t_common
-{
+struct arm920t_common {
struct arm7_9_common arm7_9_common;
uint32_t common_magic;
struct armv4_5_mmu_common armv4_5_mmu;
struct arm7_9_common arm7_9_common;
uint32_t common_magic;
struct armv4_5_mmu_common armv4_5_mmu;
@@
-38,21
+36,17
@@
struct arm920t_common
int preserve_cache;
};
int preserve_cache;
};
-static inline struct arm920t_common *
-target_to_arm920(struct target *target)
+static inline struct arm920t_common *target_to_arm920(struct target *target)
{
{
- return container_of(target->arch_info, struct arm920t_common,
- arm7_9_common.armv4_5_common);
+ return container_of(target->arch_info, struct arm920t_common, arm7_9_common.arm);
}
}
-struct arm920t_cache_line
-{
+struct arm920t_cache_line {
uint32_t cam;
uint32_t data[8];
};
uint32_t cam;
uint32_t data[8];
};
-struct arm920t_tlb_entry
-{
+struct arm920t_tlb_entry {
uint32_t cam;
uint32_t ram1;
uint32_t ram2;
uint32_t cam;
uint32_t ram1;
uint32_t ram2;
@@
-61,10
+55,10
@@
struct arm920t_tlb_entry
int arm920t_arch_state(struct target *target);
int arm920t_soft_reset_halt(struct target *target);
int arm920t_read_memory(struct target *target,
int arm920t_arch_state(struct target *target);
int arm920t_soft_reset_halt(struct target *target);
int arm920t_read_memory(struct target *target,
-
uint32
_t address, uint32_t size, uint32_t count, uint8_t *buffer);
+
target_addr
_t address, uint32_t size, uint32_t count, uint8_t *buffer);
int arm920t_write_memory(struct target *target,
int arm920t_write_memory(struct target *target,
-
uint32_t address, uint32_t size, uint32_t count,
uint8_t *buffer);
-
void
arm920t_post_debug_entry(struct target *target);
+
target_addr_t address, uint32_t size, uint32_t count, const
uint8_t *buffer);
+
int
arm920t_post_debug_entry(struct target *target);
void arm920t_pre_restore_context(struct target *target);
int arm920t_get_ttb(struct target *target, uint32_t *result);
int arm920t_disable_mmu_caches(struct target *target,
void arm920t_pre_restore_context(struct target *target);
int arm920t_get_ttb(struct target *target, uint32_t *result);
int arm920t_disable_mmu_caches(struct target *target,
@@
-74,4
+68,4
@@
int arm920t_enable_mmu_caches(struct target *target,
extern const struct command_registration arm920t_command_handlers[];
extern const struct command_registration arm920t_command_handlers[];
-#endif /* ARM920T_H */
+#endif /*
OPENOCD_TARGET_
ARM920T_H */