X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Frtos%2Frtos.c;h=9ceeb2610cc482279cfafe8ee7775d73c09c7dc4;hb=677b02b475870b7d9e5d86e9bf61dc28dae5a6e4;hp=0082ced1ff0bf8c12401ede09f796af4af5ce8d0;hpb=d36889e692788d4dc4acabd073d57f4a178e3172;p=openocd.git diff --git a/src/rtos/rtos.c b/src/rtos/rtos.c index 0082ced1ff..9ceeb2610c 100644 --- a/src/rtos/rtos.c +++ b/src/rtos/rtos.c @@ -46,7 +46,7 @@ static struct rtos_type *rtos_types[] = { NULL }; -int rtos_thread_packet(struct connection *connection, char *packet, int packet_size); +int rtos_thread_packet(struct connection *connection, const char *packet, int packet_size); int rtos_smp_init(struct target *target) { @@ -138,7 +138,7 @@ int rtos_create(Jim_GetOptInfo *goi, struct target *target) return JIM_ERR; } -int gdb_thread_packet(struct connection *connection, char *packet, int packet_size) +int gdb_thread_packet(struct connection *connection, char const *packet, int packet_size) { struct target *target = get_target_from_connection(connection); if (target->rtos == NULL) @@ -186,7 +186,7 @@ static char *next_symbol(struct rtos *os, char *cur_symbol, uint64_t cur_addr) * * rtos_qsymbol() returns 1 if an RTOS has been detected, or 0 otherwise. */ -int rtos_qsymbol(struct connection *connection, char *packet, int packet_size) +int rtos_qsymbol(struct connection *connection, char const *packet, int packet_size) { int rtos_detected = 0; uint64_t addr = 0; @@ -254,7 +254,7 @@ done: return rtos_detected; } -int rtos_thread_packet(struct connection *connection, char *packet, int packet_size) +int rtos_thread_packet(struct connection *connection, char const *packet, int packet_size) { struct target *target = get_target_from_connection(connection); @@ -289,7 +289,7 @@ int rtos_thread_packet(struct connection *connection, char *packet, int packet_s if (detail->extra_info_str != NULL) str_size += strlen(detail->extra_info_str); - char *tmp_str = (char *) malloc(str_size + 7); + char *tmp_str = malloc(str_size + 7); char *tmp_str_ptr = tmp_str; if (detail->display_str != NULL) @@ -309,7 +309,7 @@ int rtos_thread_packet(struct connection *connection, char *packet, int packet_s assert(strlen(tmp_str) == (size_t) (tmp_str_ptr - tmp_str)); - char *hex_str = (char *) malloc(strlen(tmp_str) * 2 + 1); + char *hex_str = malloc(strlen(tmp_str) * 2 + 1); int pkt_len = hexify(hex_str, tmp_str, 0, strlen(tmp_str) * 2 + 1); gdb_put_packet(connection, hex_str, pkt_len); @@ -334,7 +334,7 @@ int rtos_thread_packet(struct connection *connection, char *packet, int packet_s gdb_put_packet(connection, "l", 1); } else { /*thread id are 16 char +1 for ',' */ - char *out_str = (char *) malloc(17 * target->rtos->thread_count + 1); + char *out_str = malloc(17 * target->rtos->thread_count + 1); char *tmp_str = out_str; for (i = 0; i < target->rtos->thread_count; i++) { tmp_str += sprintf(tmp_str, "%c%016" PRIx64, i == 0 ? 'm' : ',', @@ -344,7 +344,7 @@ int rtos_thread_packet(struct connection *connection, char *packet, int packet_s free(out_str); } } else - gdb_put_packet(connection, "", 0); + gdb_put_packet(connection, "l", 1); return ERROR_OK; } else if (strncmp(packet, "qsThreadInfo", 12) == 0) { @@ -437,7 +437,7 @@ int rtos_generic_stack_read(struct target *target, return -5; } /* Read the stack */ - uint8_t *stack_data = (uint8_t *) malloc(stacking->stack_registers_size); + uint8_t *stack_data = malloc(stacking->stack_registers_size); uint32_t address = stack_ptr; if (stacking->stack_growth_direction == 1) @@ -456,7 +456,7 @@ int rtos_generic_stack_read(struct target *target, #endif for (i = 0; i < stacking->num_output_registers; i++) list_size += stacking->register_offsets[i].width_bits/8; - *hex_reg_list = (char *)malloc(list_size*2 + 1); + *hex_reg_list = malloc(list_size*2 + 1); tmp_str_ptr = *hex_reg_list; new_stack_ptr = stack_ptr - stacking->stack_growth_direction * stacking->stack_registers_size;