diff options
| author | ntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-03-25 15:45:17 +0000 |
|---|---|---|
| committer | ntfreak <ntfreak@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2008-03-25 15:45:17 +0000 |
| commit | d47e1b8f362379d8a2307f49e2b42115a3f40524 (patch) | |
| tree | 6b3276ca066bf34e165c28a3de71f84dbc98175d /src/target/armv4_5_mmu.c | |
| parent | a96f96d1f0827c6b0eb5d67cb9a94a4084e36184 (diff) | |
| download | openocd+libswd-d47e1b8f362379d8a2307f49e2b42115a3f40524.tar.gz openocd+libswd-d47e1b8f362379d8a2307f49e2b42115a3f40524.tar.bz2 openocd+libswd-d47e1b8f362379d8a2307f49e2b42115a3f40524.tar.xz openocd+libswd-d47e1b8f362379d8a2307f49e2b42115a3f40524.zip | |
- rename log functions to stop conflicts under win32 (wingdi)
git-svn-id: svn://svn.berlios.de/openocd/trunk@523 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/target/armv4_5_mmu.c')
| -rw-r--r-- | src/target/armv4_5_mmu.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/target/armv4_5_mmu.c b/src/target/armv4_5_mmu.c index 9c6d12e3..1d84847e 100644 --- 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); - 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; - 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; - ERROR("Address translation failure"); + LOG_ERROR("Address translation failure"); 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); - 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; - ERROR("Address translation failure"); + LOG_ERROR("Address translation failure"); 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; - ERROR("Address translation failure"); + LOG_ERROR("Address translation failure"); return ERROR_TARGET_TRANSLATION_FAULT; } |