- convert all files to unix line-ending

[fw/openocd] / src / server / gdb_server.c

diff --git a/src/server/gdb_server.c b/src/server/gdb_server.c
index c2651e88edce971968596f63f75d1a5e019c4e35..335a4cd2cee8fd1566f91ceada62eff9acddc62a 100644 (file)
--- a/src/server/gdb_server.c
+++ b/src/server/gdb_server.c
@@ -303,7 +303,7 @@ int gdb_put_packet_inner(connection_t *connection, char *buffer, int len)
                else if (reply == '-')
                {
                        /* Stop sending output packets for now */
-                       log_setCallback(NULL, NULL);
+                       log_remove_callback(gdb_log_callback, connection);
                        WARNING("negative reply, retrying");
                }
                else if (reply == 0x3)
@@ -316,7 +316,7 @@ int gdb_put_packet_inner(connection_t *connection, char *buffer, int len)
                        else if (reply == '-')
                        {
                                /* Stop sending output packets for now */
-                               log_setCallback(NULL, NULL);
+                               log_remove_callback(gdb_log_callback, connection);
                                WARNING("negative reply, retrying");
                        }
                        else
@@ -579,7 +579,7 @@ int gdb_target_callback_event_handler(struct target_s *target, enum target_event
                        if (gdb_connection->frontend_state == TARGET_RUNNING)
                        {
                                /* stop forwarding log packets! */
-                               log_setCallback(NULL, NULL);
+                               log_remove_callback(gdb_log_callback, connection);
                                
                                if (gdb_connection->ctrl_c)
                                {
@@ -678,7 +678,7 @@ int gdb_connection_closed(connection_t *connection)
        }
 
        target_unregister_event_callback(gdb_target_callback_event_handler, connection);
-       log_setCallback(NULL, NULL);
+       log_remove_callback(gdb_log_callback, connection);
 
        return ERROR_OK;
 }
@@ -1459,7 +1459,7 @@ int gdb_query_packet(connection_t *connection, target_t *target, char *packet, i
                        cmd[(packet_size - 6)/2] = 0x0;
                        
                        /* We want to print all debug output to GDB connection */
-                       log_setCallback(gdb_log_callback, connection);
+                       log_add_callback(gdb_log_callback, connection);
                        target_call_timer_callbacks();
                        command_run_line(cmd_ctx, cmd);
                        free(cmd);
@@ -1744,23 +1744,16 @@ int gdb_v_packet(connection_t *connection, target_t *target, char *packet, int p
        if (!strcmp(packet, "vFlashDone"))
        {
                u32 written;
-               char *error_str;
 
                /* process the flashing buffer. No need to erase as GDB
                 * always issues a vFlashErase first. */
-               if ((result = flash_write(gdb_service->target, gdb_connection->vflash_image, &written, &error_str, NULL, 0)) != ERROR_OK)
+               if ((result = flash_write(gdb_service->target, gdb_connection->vflash_image, &written, 0)) != ERROR_OK)
                {
                        if (result == ERROR_FLASH_DST_OUT_OF_BANK)
                                gdb_put_packet(connection, "E.memtype", 9);
                        else
                                gdb_send_error(connection, EIO);
-                       
-                       if (error_str)
-                       {
-                               ERROR("flash writing failed: %s", error_str);
-                               free(error_str);
                        }
-               }
                else
                {
                        DEBUG("wrote %u bytes from vFlash image to flash", written);
@@ -1815,7 +1808,7 @@ static void gdb_log_callback(void *priv, const char *file, int line,
                return;
        }
 
-       char *t = allocPrintf(format, args);
+       char *t = alloc_printf(format, args);
        if (t == NULL)
                return;
        
@@ -1893,7 +1886,7 @@ int gdb_input_inner(connection_t *connection)
                                         * forward log output until the target is halted */
                                                gdb_connection_t *gdb_con = connection->priv;
                                                gdb_con->frontend_state = TARGET_RUNNING;
-                                               log_setCallback(gdb_log_callback, connection);
+                                               log_add_callback(gdb_log_callback, connection);
                                                gdb_step_continue_packet(connection, target, packet, packet_size);
                                        }
                                        break;