retired reset run_and_init/halt

[openocd.git] / src / target / target_request.c

diff --git a/src/target/target_request.c b/src/target/target_request.c
index 020ee790e85d635ea36376859f20137f392c541f..4d92704d094dc3c598ee2f7c7297c828e068fafb 100644 (file)
--- a/src/target/target_request.c
+++ b/src/target/target_request.c
@@ -2,6 +2,9 @@
  *   Copyright (C) 2007 by Dominic Rath                                    *
  *   Dominic.Rath@gmx.de                                                   *
  *                                                                         *
+ *   Copyright (C) 2007,2008 Øyvind Harboe                                      *
+ *   oyvind.harboe@zylin.com                                               *
+ *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
@@ -42,7 +45,7 @@ int target_asciimsg(target_t *target, u32 length)
        target->type->target_request_data(target, CEIL(length, 4), (u8*)msg);
        msg[length] = 0;
        
-       DEBUG("%s", msg);
+       LOG_DEBUG("%s", msg);
        
        while (c)
        {
@@ -55,7 +58,7 @@ int target_asciimsg(target_t *target, u32 length)
 
 int target_charmsg(target_t *target, u8 msg)
 {
-       USER_SAMELINE("%c", msg);
+       LOG_USER_N("%c", msg);
        
        return ERROR_OK;
 }
@@ -68,7 +71,7 @@ int target_hexmsg(target_t *target, int size, u32 length)
        debug_msg_receiver_t *c = target->dbgmsg;
        int i;
        
-       DEBUG("size: %i, length: %i", size, length);
+       LOG_DEBUG("size: %i, length: %i", size, length);
 
        target->type->target_request_data(target, CEIL(length * size, 4), (u8*)data);
 
@@ -90,7 +93,7 @@ int target_hexmsg(target_t *target, int size, u32 length)
                
                if ((i%8 == 7) || (i == length - 1))
                {
-                       DEBUG("%s", line);
+                       LOG_DEBUG("%s", line);
                        
                        while (c)
                        {
@@ -136,7 +139,7 @@ int target_request(target_t *target, u32 request)
  *                     break;
  */
                default:
-                       ERROR("unknown target request: %2.2x", target_req_cmd);
+                       LOG_ERROR("unknown target request: %2.2x", target_req_cmd);
                        break;
        }