Code Review / openocd.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
openocd: remove NULL comparisons with checkpatch [1/2]
[openocd.git] / src / rtos / rtos.c
diff --git a/src/rtos/rtos.c b/src/rtos/rtos.c
index 0374e9b5bb42c139122287e8f42a7d51b5b15c64..2b621543052b83e40c6a160a753701da02f7a460 100644 (file)
--- a/src/rtos/rtos.c
+++ b/src/rtos/rtos.c
@@ -27,30 +27,30 @@
 #include "server/gdb_server.h"
 
 /* RTOSs */
-extern struct rtos_type FreeRTOS_rtos;
-extern struct rtos_type ThreadX_rtos;
-extern struct rtos_type eCos_rtos;
-extern struct rtos_type Linux_os;
+extern struct rtos_type freertos_rtos;
+extern struct rtos_type threadx_rtos;
+extern struct rtos_type ecos_rtos;
+extern struct rtos_type linux_rtos;
 extern struct rtos_type chibios_rtos;
 extern struct rtos_type chromium_ec_rtos;
-extern struct rtos_type embKernel_rtos;
+extern struct rtos_type embkernel_rtos;
 extern struct rtos_type mqx_rtos;
-extern struct rtos_type uCOS_III_rtos;
+extern struct rtos_type ucos_iii_rtos;
 extern struct rtos_type nuttx_rtos;
 extern struct rtos_type hwthread_rtos;
 extern struct rtos_type riot_rtos;
 extern struct rtos_type zephyr_rtos;
 
 static struct rtos_type *rtos_types[] = {
-       &ThreadX_rtos,
-       &FreeRTOS_rtos,
-       &eCos_rtos,
-       &Linux_os,
+       &threadx_rtos,
+       &freertos_rtos,
+       &ecos_rtos,
+       &linux_rtos,
        &chibios_rtos,
        &chromium_ec_rtos,
-       &embKernel_rtos,
+       &embkernel_rtos,
        &mqx_rtos,
-       &uCOS_III_rtos,
+       &ucos_iii_rtos,
        &nuttx_rtos,
        &riot_rtos,
        &zephyr_rtos,
@@ -113,7 +113,7 @@ static int os_alloc_create(struct target *target, struct rtos_type *ostype)
 {
        int ret = os_alloc(target, ostype);
 
-       if (JIM_OK == ret) {
+       if (ret == JIM_OK) {
                ret = target->rtos->type->create(target);
                if (ret != JIM_OK)
                        os_free(target);
@@ -140,7 +140,7 @@ int rtos_create(struct jim_getopt_info *goi, struct target *target)
        if (e != JIM_OK)
                return e;
 
-       if (0 == strcmp(cp, "auto")) {
+       if (strcmp(cp, "auto") == 0) {
                /* Auto detect tries to look up all symbols for each RTOS,
                 * and runs the RTOS driver's _detect() function when GDB
                 * finds all symbols for any RTOS. See rtos_qsymbol(). */
@@ -172,7 +172,7 @@ void rtos_destroy(struct target *target)
 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)
+       if (!target->rtos)
                return rtos_thread_packet(connection, packet, packet_size);     /* thread not
                                                                                 *found*/
        return target->rtos->gdb_thread_packet(connection, packet, packet_size);
@@ -306,13 +306,13 @@ int rtos_thread_packet(struct connection *connection, char const *packet, int pa
        struct target *target = get_target_from_connection(connection);
 
        if (strncmp(packet, "qThreadExtraInfo,", 17) == 0) {
-               if ((target->rtos != NULL) && (target->rtos->thread_details != NULL) &&
+               if ((target->rtos) && (target->rtos->thread_details) &&
                                (target->rtos->thread_count != 0)) {
                        threadid_t threadid = 0;
                        int found = -1;
                        sscanf(packet, "qThreadExtraInfo,%" SCNx64, &threadid);
 
-                       if ((target->rtos != NULL) && (target->rtos->thread_details != NULL)) {
+                       if ((target->rtos) && (target->rtos->thread_details)) {
                                int thread_num;
                                for (thread_num = 0; thread_num < target->rtos->thread_count; thread_num++) {
                                        if (target->rtos->thread_details[thread_num].threadid == threadid) {
@@ -329,17 +329,17 @@ int rtos_thread_packet(struct connection *connection, char const *packet, int pa
                        struct thread_detail *detail = &target->rtos->thread_details[found];
 
                        int str_size = 0;
-                       if (detail->thread_name_str != NULL)
+                       if (detail->thread_name_str)
                                str_size += strlen(detail->thread_name_str);
-                       if (detail->extra_info_str != NULL)
+                       if (detail->extra_info_str)
                                str_size += strlen(detail->extra_info_str);
 
                        char *tmp_str = calloc(str_size + 9, sizeof(char));
                        char *tmp_str_ptr = tmp_str;
 
-                       if (detail->thread_name_str != NULL)
+                       if (detail->thread_name_str)
                                tmp_str_ptr += sprintf(tmp_str_ptr, "Name: %s", detail->thread_name_str);
-                       if (detail->extra_info_str != NULL) {
+                       if (detail->extra_info_str) {
                                if (tmp_str_ptr != tmp_str)
                                        tmp_str_ptr += sprintf(tmp_str_ptr, ", ");
                                tmp_str_ptr += sprintf(tmp_str_ptr, "%s", detail->extra_info_str);
@@ -371,7 +371,7 @@ int rtos_thread_packet(struct connection *connection, char const *packet, int pa
                return ERROR_OK;
        } else if (strncmp(packet, "qfThreadInfo", 12) == 0) {
                int i;
-               if (target->rtos != NULL) {
+               if (target->rtos) {
                        if (target->rtos->thread_count == 0) {
                                gdb_put_packet(connection, "l", 1);
                        } else {
@@ -404,7 +404,7 @@ int rtos_thread_packet(struct connection *connection, char const *packet, int pa
                 * otherwise it gets incorrectly handled */
                return GDB_THREAD_PACKET_NOT_CONSUMED;
        } else if (strncmp(packet, "qC", 2) == 0) {
-               if (target->rtos != NULL) {
+               if (target->rtos) {
                        char buffer[19];
                        int size;
                        size = snprintf(buffer, 19, "QC%016" PRIx64, target->rtos->current_thread);
@@ -416,7 +416,7 @@ int rtos_thread_packet(struct connection *connection, char const *packet, int pa
                threadid_t threadid;
                int found = -1;
                sscanf(packet, "T%" SCNx64, &threadid);
-               if ((target->rtos != NULL) && (target->rtos->thread_details != NULL)) {
+               if ((target->rtos) && (target->rtos->thread_details)) {
                        int thread_num;
                        for (thread_num = 0; thread_num < target->rtos->thread_count; thread_num++) {
                                if (target->rtos->thread_details[thread_num].threadid == threadid) {
@@ -432,7 +432,7 @@ int rtos_thread_packet(struct connection *connection, char const *packet, int pa
                return ERROR_OK;
        } else if (packet[0] == 'H') {  /* Set current thread ( 'c' for step and continue, 'g' for
                                         * all other operations ) */
-               if ((packet[1] == 'g') && (target->rtos != NULL)) {
+               if ((packet[1] == 'g') && (target->rtos)) {
                        threadid_t threadid;
                        sscanf(packet, "Hg%16" SCNx64, &threadid);
                        LOG_DEBUG("RTOS: GDB requested to set current thread to 0x%" PRIx64, threadid);
@@ -477,7 +477,7 @@ int rtos_get_gdb_reg(struct connection *connection, int reg_num)
 {
        struct target *target = get_target_from_connection(connection);
        int64_t current_threadid = target->rtos->current_threadid;
-       if ((target->rtos != NULL) && (current_threadid != -1) &&
+       if ((target->rtos) && (current_threadid != -1) &&
                        (current_threadid != 0) &&
                        ((current_threadid != target->rtos->current_thread) ||
                        (target->smp))) {       /* in smp several current thread are possible */
@@ -529,7 +529,7 @@ int rtos_get_gdb_reg_list(struct connection *connection)
 {
        struct target *target = get_target_from_connection(connection);
        int64_t current_threadid = target->rtos->current_threadid;
-       if ((target->rtos != NULL) && (current_threadid != -1) &&
+       if ((target->rtos) && (current_threadid != -1) &&
                        (current_threadid != 0) &&
                        ((current_threadid != target->rtos->current_thread) ||
                        (target->smp))) {       /* in smp several current thread are possible */
@@ -563,8 +563,8 @@ int rtos_set_reg(struct connection *connection, int reg_num,
 {
        struct target *target = get_target_from_connection(connection);
        int64_t current_threadid = target->rtos->current_threadid;
-       if ((target->rtos != NULL) &&
-                       (target->rtos->type->set_reg != NULL) &&
+       if ((target->rtos) &&
+                       (target->rtos->type->set_reg) &&
                        (current_threadid != -1) &&
                        (current_threadid != 0)) {
                return target->rtos->type->set_reg(target->rtos, reg_num, reg_value);
@@ -606,7 +606,7 @@ int rtos_generic_stack_read(struct target *target,
 #endif
 
        int64_t new_stack_ptr;
-       if (stacking->calculate_process_stack != NULL) {
+       if (stacking->calculate_process_stack) {
                new_stack_ptr = stacking->calculate_process_stack(target,
                                stack_data, stacking, stack_ptr);
        } else {
@@ -657,7 +657,7 @@ static int rtos_try_next(struct target *target)
 
 int rtos_update_threads(struct target *target)
 {
-       if ((target->rtos != NULL) && (target->rtos->type != NULL))
+       if ((target->rtos) && (target->rtos->type))
                target->rtos->type->update_threads(target->rtos);
        return ERROR_OK;
 }
@@ -679,3 +679,19 @@ void rtos_free_threadlist(struct rtos *rtos)
                rtos->current_thread = 0;
        }
 }
+
+int rtos_read_buffer(struct target *target, target_addr_t address,
+               uint32_t size, uint8_t *buffer)
+{
+       if (target->rtos->type->read_buffer)
+               return target->rtos->type->read_buffer(target->rtos, address, size, buffer);
+       return ERROR_NOT_IMPLEMENTED;
+}
+
+int rtos_write_buffer(struct target *target, target_addr_t address,
+               uint32_t size, const uint8_t *buffer)
+{
+       if (target->rtos->type->write_buffer)
+               return target->rtos->type->write_buffer(target->rtos, address, size, buffer);
+       return ERROR_NOT_IMPLEMENTED;
+}
Open On-Chip Debugger

Linking to existing account procedure

If you already have an account and want to add another login method you MUST first sign in with your existing account and then change URL to read https://review.openocd.org/login/?link to get to this page again but this time it'll work for linking. Thank you.

SSH host keys fingerprints

1024 SHA256:YKx8b7u5ZWdcbp7/4AeXNaqElP49m6QrwfXaqQGJAOk gerrit-code-review@openocd.zylin.com (DSA)
384 SHA256:jHIbSQa4REvwCFG4cq5LBlBLxmxSqelQPem/EXIrxjk gerrit-code-review@openocd.org (ECDSA)
521 SHA256:UAOPYkU9Fjtcao0Ul/Rrlnj/OsQvt+pgdYSZ4jOYdgs gerrit-code-review@openocd.org (ECDSA)
256 SHA256:A13M5QlnozFOvTllybRZH6vm7iSt0XLxbA48yfc2yfY gerrit-code-review@openocd.org (ECDSA)
256 SHA256:spYMBqEYoAOtK7yZBrcwE8ZpYt6b68Cfh9yEVetvbXg gerrit-code-review@openocd.org (ED25519)
+--[ED25519 256]--+
|=..              |
|+o..   .         |
|*.o   . .        |
|+B . . .         |
|Bo. = o S        |
|Oo.+ + =         |
|oB=.* = . o      |
| =+=.+   + E     |
|. .=o   . o      |
+----[SHA256]-----+
2048 SHA256:0Onrb7/PHjpo6iVZ7xQX2riKN83FJ3KGU0TvI0TaFG4 gerrit-code-review@openocd.zylin.com (RSA)