stlink: enable queuing with stlink-server API v3

[fw/openocd] / src / jtag / drivers / jtag_dpi.c

diff --git a/src/jtag/drivers/jtag_dpi.c b/src/jtag/drivers/jtag_dpi.c
index f5a67dd118227291c58db9486e63b300bfbb4a33..016ff55366a383e51fb540acef2e44c7c2c87bc6 100644 (file)
--- a/src/jtag/drivers/jtag_dpi.c
+++ b/src/jtag/drivers/jtag_dpi.c
@@ -49,7 +49,7 @@ static int last_ir_num_bits;
 
 static int write_sock(char *buf, size_t len)
 {
-       if (buf == NULL) {
+       if (!buf) {
                LOG_ERROR("%s: NULL 'buf' argument, file %s, line %d",
                        __func__, __FILE__, __LINE__);
                return ERROR_FAIL;
@@ -64,7 +64,7 @@ static int write_sock(char *buf, size_t len)
 
 static int read_sock(char *buf, size_t len)
 {
-       if (buf == NULL) {
+       if (!buf) {
                LOG_ERROR("%s: NULL 'buf' argument, file %s, line %d",
                        __func__, __FILE__, __LINE__);
                return ERROR_FAIL;
@@ -123,7 +123,7 @@ static int jtag_dpi_scan(struct scan_command *cmd)
        int ret = ERROR_OK;
 
        num_bits = jtag_build_buffer(cmd, &data_buf);
-       if (data_buf == NULL) {
+       if (!data_buf) {
                LOG_ERROR("jtag_build_buffer call failed, data_buf == NULL, "
                        "file %s, line %d", __FILE__, __LINE__);
                return ERROR_FAIL;
@@ -133,7 +133,7 @@ static int jtag_dpi_scan(struct scan_command *cmd)
        if (cmd->ir_scan) {
                free(last_ir_buf);
                last_ir_buf = (uint8_t *)malloc(bytes * sizeof(uint8_t));
-               if (last_ir_buf == NULL) {
+               if (!last_ir_buf) {
                        LOG_ERROR("%s: malloc fail, file %s, line %d",
                                __func__, __FILE__, __LINE__);
                        ret = ERROR_FAIL;
@@ -181,7 +181,7 @@ static int jtag_dpi_runtest(int cycles)
        int num_bits = last_ir_num_bits, bytes;
        int ret = ERROR_OK;
 
-       if (data_buf == NULL) {
+       if (!data_buf) {
                LOG_ERROR("%s: NULL 'data_buf' argument, file %s, line %d",
                        __func__, __FILE__, __LINE__);
                return ERROR_FAIL;
@@ -194,7 +194,7 @@ static int jtag_dpi_runtest(int cycles)
 
        bytes = DIV_ROUND_UP(num_bits, 8);
        read_scan = (uint8_t *)malloc(bytes * sizeof(uint8_t));
-       if (read_scan == NULL) {
+       if (!read_scan) {
                LOG_ERROR("%s: malloc fail, file %s, line %d",
                        __func__, __FILE__, __LINE__);
                return ERROR_FAIL;
@@ -238,7 +238,7 @@ static int jtag_dpi_execute_queue(void)
        struct jtag_command *cmd;
        int ret = ERROR_OK;
 
-       for (cmd = jtag_command_queue; ret == ERROR_OK && cmd != NULL;
+       for (cmd = jtag_command_queue; ret == ERROR_OK && cmd;
             cmd = cmd->next) {
                switch (cmd->type) {
                case JTAG_RUNTEST:
@@ -289,9 +289,9 @@ static int jtag_dpi_init(void)
        serv_addr.sin_family = AF_INET;
        serv_addr.sin_port = htons(server_port);
 
-       if (server_address == NULL) {
+       if (!server_address) {
                server_address = strdup(SERVER_ADDRESS);
-               if (server_address == NULL) {
+               if (!server_address) {
                        LOG_ERROR("%s: strdup fail, file %s, line %d",
                                __func__, __FILE__, __LINE__);
                        return ERROR_FAIL;
@@ -350,9 +350,9 @@ COMMAND_HANDLER(jtag_dpi_set_address)
        if (CMD_ARGC > 1)
                return ERROR_COMMAND_SYNTAX_ERROR;
        else if (CMD_ARGC == 0) {
-               if (server_address == NULL) {
+               if (!server_address) {
                        server_address = strdup(SERVER_ADDRESS);
-                       if (server_address == NULL) {
+                       if (!server_address) {
                                LOG_ERROR("%s: strdup fail, file %s, line %d",
                                        __func__, __FILE__, __LINE__);
                                return ERROR_FAIL;
@@ -362,7 +362,7 @@ COMMAND_HANDLER(jtag_dpi_set_address)
        } else {
                free(server_address);
                server_address = strdup(CMD_ARGV[0]);
-               if (server_address == NULL) {
+               if (!server_address) {
                        LOG_ERROR("%s: strdup fail, file %s, line %d",
                                __func__, __FILE__, __LINE__);
                        return ERROR_FAIL;
@@ -373,16 +373,16 @@ COMMAND_HANDLER(jtag_dpi_set_address)
        return ERROR_OK;
 }
 
-static const struct command_registration jtag_dpi_command_handlers[] = {
+static const struct command_registration jtag_dpi_subcommand_handlers[] = {
        {
-               .name = "jtag_dpi_set_port",
+               .name = "set_port",
                .handler = &jtag_dpi_set_port,
                .mode = COMMAND_CONFIG,
                .help = "set the port of the DPI server",
                .usage = "[port]",
        },
        {
-               .name = "jtag_dpi_set_address",
+               .name = "set_address",
                .handler = &jtag_dpi_set_address,
                .mode = COMMAND_CONFIG,
                .help = "set the address of the DPI server",
@@ -391,6 +391,17 @@ static const struct command_registration jtag_dpi_command_handlers[] = {
        COMMAND_REGISTRATION_DONE
 };
 
+static const struct command_registration jtag_dpi_command_handlers[] = {
+       {
+               .name = "jtag_dpi",
+               .mode = COMMAND_ANY,
+               .help = "perform jtag_dpi management",
+               .chain = jtag_dpi_subcommand_handlers,
+               .usage = "",
+       },
+       COMMAND_REGISTRATION_DONE
+};
+
 static struct jtag_interface jtag_dpi_interface = {
        .supported = DEBUG_CAP_TMS_SEQ,
        .execute_queue = jtag_dpi_execute_queue,