rtos: do not use LOG_OUTPUT

[openocd.git] / src / rtos / FreeRTOS.c

diff --git a/src/rtos/FreeRTOS.c b/src/rtos/FreeRTOS.c
index 2295d7456532ee1709cc3ec5bc833551934910eb..acf3689fafe1ea79eacc07f71fc34d1cac6390f6 100644 (file)
--- a/src/rtos/FreeRTOS.c
+++ b/src/rtos/FreeRTOS.c
@@ -28,6 +28,7 @@
 #include "target/target_type.h"
 #include "rtos.h"
 #include "helper/log.h"
+#include "helper/types.h"
 #include "rtos_standard_stackings.h"
 
 #define FREERTOS_MAX_PRIORITIES        63
@@ -61,7 +62,7 @@ const struct FreeRTOS_params FreeRTOS_params_list[] = {
        &rtos_standard_Cortex_M3_stacking,      /* stacking_info */
        },
        {
-       "stm32_stlink",                 /* target_name */
+       "hla_target",                   /* target_name */
        4,                                              /* thread_count_width; */
        4,                                              /* pointer_width; */
        16,                                             /* list_next_offset; */
@@ -121,8 +122,6 @@ static char *FreeRTOS_symbol_list[] = {
        NULL
 };
 
-#define FREERTOS_NUM_SYMBOLS (sizeof(FreeRTOS_symbol_list)/sizeof(char *))
-
 /* TODO: */
 /* this is not safe for little endian yet */
 /* may be problems reading if sizes are not 32 bit long integers. */
@@ -141,12 +140,12 @@ static int FreeRTOS_update_threads(struct rtos *rtos)
        param = (const struct FreeRTOS_params *) rtos->rtos_specific_params;
 
        if (rtos->symbols == NULL) {
-               LOG_OUTPUT("No symbols for FreeRTOS\r\n");
+               LOG_ERROR("No symbols for FreeRTOS");
                return -3;
        }
 
        if (rtos->symbols[FreeRTOS_VAL_uxCurrentNumberOfTasks].address == 0) {
-               LOG_OUTPUT("Don't have the number of threads in FreeRTOS \r\n");
+               LOG_ERROR("Don't have the number of threads in FreeRTOS");
                return -2;
        }
 
@@ -157,7 +156,7 @@ static int FreeRTOS_update_threads(struct rtos *rtos)
                        (uint8_t *)&thread_list_size);
 
        if (retval != ERROR_OK) {
-               LOG_OUTPUT("Could not read FreeRTOS thread count from target\r\n");
+               LOG_ERROR("Could not read FreeRTOS thread count from target");
                return retval;
        }
 
@@ -188,7 +187,7 @@ static int FreeRTOS_update_threads(struct rtos *rtos)
                        param->pointer_width,
                        (uint8_t *)&rtos->current_thread);
        if (retval != ERROR_OK) {
-               LOG_OUTPUT("Error reading current thread in FreeRTOS thread list\r\n");
+               LOG_ERROR("Error reading current thread in FreeRTOS thread list");
                return retval;
        }
 
@@ -270,7 +269,7 @@ static int FreeRTOS_update_threads(struct rtos *rtos)
                                param->thread_count_width,
                                (uint8_t *)&list_thread_count);
                if (retval != ERROR_OK) {
-                       LOG_OUTPUT("Error reading number of threads in FreeRTOS thread list\r\n");
+                       LOG_ERROR("Error reading number of threads in FreeRTOS thread list");
                        free(list_of_lists);
                        return retval;
                }
@@ -286,7 +285,7 @@ static int FreeRTOS_update_threads(struct rtos *rtos)
                                param->pointer_width,
                                (uint8_t *)&list_elem_ptr);
                if (retval != ERROR_OK) {
-                       LOG_OUTPUT("Error reading first thread item location in FreeRTOS thread list\r\n");
+                       LOG_ERROR("Error reading first thread item location in FreeRTOS thread list");
                        free(list_of_lists);
                        return retval;
                }
@@ -301,7 +300,7 @@ static int FreeRTOS_update_threads(struct rtos *rtos)
                                        param->pointer_width,
                                        (uint8_t *)&(rtos->thread_details[tasks_found].threadid));
                        if (retval != ERROR_OK) {
-                               LOG_OUTPUT("Error reading thread list item object in FreeRTOS thread list\r\n");
+                               LOG_ERROR("Error reading thread list item object in FreeRTOS thread list");
                                free(list_of_lists);
                                return retval;
                        }
@@ -317,7 +316,7 @@ static int FreeRTOS_update_threads(struct rtos *rtos)
                                        FREERTOS_THREAD_NAME_STR_SIZE,
                                        (uint8_t *)&tmp_str);
                        if (retval != ERROR_OK) {
-                               LOG_OUTPUT("Error reading first thread item location in FreeRTOS thread list\r\n");
+                               LOG_ERROR("Error reading first thread item location in FreeRTOS thread list");
                                free(list_of_lists);
                                return retval;
                        }
@@ -351,7 +350,7 @@ static int FreeRTOS_update_threads(struct rtos *rtos)
                                        param->pointer_width,
                                        (uint8_t *)&list_elem_ptr);
                        if (retval != ERROR_OK) {
-                               LOG_OUTPUT("Error reading next thread item location in FreeRTOS thread list\r\n");
+                               LOG_ERROR("Error reading next thread item location in FreeRTOS thread list");
                                free(list_of_lists);
                                return retval;
                        }
@@ -387,21 +386,20 @@ static int FreeRTOS_get_thread_reg_list(struct rtos *rtos, int64_t thread_id, ch
                        param->pointer_width,
                        (uint8_t *)&stack_ptr);
        if (retval != ERROR_OK) {
-               LOG_OUTPUT("Error reading stack frame from FreeRTOS thread\r\n");
+               LOG_ERROR("Error reading stack frame from FreeRTOS thread");
                return retval;
        }
 
        return rtos_generic_stack_read(rtos->target, param->stacking_info, stack_ptr, hex_reg_list);
-
 }
 
 static int FreeRTOS_get_symbol_list_to_lookup(symbol_table_elem_t *symbol_list[])
 {
        unsigned int i;
        *symbol_list = (symbol_table_elem_t *) malloc(
-                       sizeof(symbol_table_elem_t) * FREERTOS_NUM_SYMBOLS);
+                       sizeof(symbol_table_elem_t) * ARRAY_SIZE(FreeRTOS_symbol_list));
 
-       for (i = 0; i < FREERTOS_NUM_SYMBOLS; i++)
+       for (i = 0; i < ARRAY_SIZE(FreeRTOS_symbol_list); i++)
                (*symbol_list)[i].symbol_name = FreeRTOS_symbol_list[i];
 
        return 0;
@@ -439,7 +437,7 @@ static int FreeRTOS_get_thread_ascii_info(struct rtos *rtos, threadid_t thread_i
                        FREERTOS_THREAD_NAME_STR_SIZE,
                        (uint8_t *)&tmp_str);
        if (retval != ERROR_OK) {
-               LOG_OUTPUT("Error reading first thread item location in FreeRTOS thread list\r\n");
+               LOG_ERROR("Error reading first thread item location in FreeRTOS thread list");
                return retval;
        }
        tmp_str[FREERTOS_THREAD_NAME_STR_SIZE-1] = '\x00';
@@ -472,7 +470,7 @@ static int FreeRTOS_create(struct target *target)
                i++;
        }
        if (i >= FREERTOS_NUM_PARAMS) {
-               LOG_OUTPUT("Could not find target in FreeRTOS compatibility list\r\n");
+               LOG_ERROR("Could not find target in FreeRTOS compatibility list");
                return -1;
        }