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/openocd.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/openocd.c')
| -rw-r--r-- | src/openocd.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/openocd.c b/src/openocd.c index fac385a1..604a3c5b 100644 --- a/src/openocd.c +++ b/src/openocd.c @@ -88,10 +88,10 @@ int main(int argc, char *argv[]) if (log_init(cmd_ctx) != ERROR_OK) return EXIT_FAILURE; - DEBUG("log init complete"); + LOG_DEBUG("log init complete"); - OUTPUT( OPENOCD_VERSION "\n" ); - OUTPUT( "$URL$\n"); + LOG_OUTPUT( OPENOCD_VERSION "\n" ); + LOG_OUTPUT( "$URL$\n"); cfg_cmd_ctx = copy_command_context(cmd_ctx); cfg_cmd_ctx->mode = COMMAND_CONFIG; @@ -111,23 +111,23 @@ int main(int argc, char *argv[]) if (jtag_init(cmd_ctx) != ERROR_OK) return EXIT_FAILURE; - DEBUG("jtag init complete"); + LOG_DEBUG("jtag init complete"); if (target_init(cmd_ctx) != ERROR_OK) return EXIT_FAILURE; - DEBUG("target init complete"); + LOG_DEBUG("target init complete"); if (flash_init_drivers(cmd_ctx) != ERROR_OK) return EXIT_FAILURE; - DEBUG("flash init complete"); + LOG_DEBUG("flash init complete"); if (nand_init(cmd_ctx) != ERROR_OK) return EXIT_FAILURE; - DEBUG("NAND init complete"); + LOG_DEBUG("NAND init complete"); if (pld_init(cmd_ctx) != ERROR_OK) return EXIT_FAILURE; - DEBUG("pld init complete"); + LOG_DEBUG("pld init complete"); /* initialize tcp server */ server_init(); @@ -139,7 +139,7 @@ int main(int argc, char *argv[]) /* call any target resets */ if (target_init_reset(cmd_ctx) != ERROR_OK) return EXIT_FAILURE; - DEBUG("target init reset complete"); + LOG_DEBUG("target init reset complete"); /* handle network connections */ server_loop(cmd_ctx); |