projects
/
fw
/
openocd
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- rename log functions to stop conflicts under win32 (wingdi)
[fw/openocd]
/
src
/
target
/
armv4_5_mmu.c
diff --git
a/src/target/armv4_5_mmu.c
b/src/target/armv4_5_mmu.c
index 9c6d12e382005f6b72ee5eaeb0dc50e61f6e2dd5..1d84847e84e56eeb947242faed9dc4f9a905915a 100644
(file)
--- a/
src/target/armv4_5_mmu.c
+++ b/
src/target/armv4_5_mmu.c
@@
-49,19
+49,19
@@
u32 armv4_5_mmu_translate_va(target_t *target, armv4_5_mmu_common_t *armv4_5_mmu
4, 1, (u8*)&first_lvl_descriptor);
first_lvl_descriptor = target_buffer_get_u32(target, (u8*)&first_lvl_descriptor);
4, 1, (u8*)&first_lvl_descriptor);
first_lvl_descriptor = target_buffer_get_u32(target, (u8*)&first_lvl_descriptor);
- DEBUG("1st lvl desc: %8.8x", first_lvl_descriptor);
+
LOG_
DEBUG("1st lvl desc: %8.8x", first_lvl_descriptor);
if ((first_lvl_descriptor & 0x3) == 0)
{
*type = -1;
if ((first_lvl_descriptor & 0x3) == 0)
{
*type = -1;
- ERROR("Address translation failure");
+
LOG_
ERROR("Address translation failure");
return ERROR_TARGET_TRANSLATION_FAULT;
}
if (!armv4_5_mmu->has_tiny_pages && ((first_lvl_descriptor & 0x3) == 3))
{
*type = -1;
return ERROR_TARGET_TRANSLATION_FAULT;
}
if (!armv4_5_mmu->has_tiny_pages && ((first_lvl_descriptor & 0x3) == 3))
{
*type = -1;
- ERROR("Address translation failure");
+
LOG_
ERROR("Address translation failure");
return ERROR_TARGET_TRANSLATION_FAULT;
}
return ERROR_TARGET_TRANSLATION_FAULT;
}
@@
-94,12
+94,12
@@
u32 armv4_5_mmu_translate_va(target_t *target, armv4_5_mmu_common_t *armv4_5_mmu
second_lvl_descriptor = target_buffer_get_u32(target, (u8*)&second_lvl_descriptor);
second_lvl_descriptor = target_buffer_get_u32(target, (u8*)&second_lvl_descriptor);
- DEBUG("2nd lvl desc: %8.8x", second_lvl_descriptor);
+
LOG_
DEBUG("2nd lvl desc: %8.8x", second_lvl_descriptor);
if ((second_lvl_descriptor & 0x3) == 0)
{
*type = -1;
if ((second_lvl_descriptor & 0x3) == 0)
{
*type = -1;
- ERROR("Address translation failure");
+
LOG_
ERROR("Address translation failure");
return ERROR_TARGET_TRANSLATION_FAULT;
}
return ERROR_TARGET_TRANSLATION_FAULT;
}
@@
-132,7
+132,7
@@
u32 armv4_5_mmu_translate_va(target_t *target, armv4_5_mmu_common_t *armv4_5_mmu
/* should not happen */
*type = -1;
/* should not happen */
*type = -1;
- ERROR("Address translation failure");
+
LOG_
ERROR("Address translation failure");
return ERROR_TARGET_TRANSLATION_FAULT;
}
return ERROR_TARGET_TRANSLATION_FAULT;
}