X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=src%2Fjtag%2Fcommands.c;h=546b12f8bfef0d935018b806895f3c0e9c34c8bc;hb=07251ab8d81b2b5491af673b694bebbbc574c112;hp=c092eec5325cd56872a2912eb00636f0d0c67eb7;hpb=e11c5a3b42a2a39c5b24c9a19ba03f7b16caf3d7;p=openocd.git diff --git a/src/jtag/commands.c b/src/jtag/commands.c index c092eec532..546b12f8bf 100644 --- a/src/jtag/commands.c +++ b/src/jtag/commands.c @@ -27,10 +27,12 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif +#include #include "commands.h" struct cmd_queue_page { @@ -40,26 +42,26 @@ struct cmd_queue_page { }; #define CMD_QUEUE_PAGE_SIZE (1024 * 1024) -static struct cmd_queue_page *cmd_queue_pages = NULL; +static struct cmd_queue_page *cmd_queue_pages; -jtag_command_t *jtag_command_queue = NULL; -static jtag_command_t **next_command_pointer = &jtag_command_queue; +struct jtag_command *jtag_command_queue; +static struct jtag_command **next_command_pointer = &jtag_command_queue; -void jtag_queue_command(jtag_command_t * cmd) +void jtag_queue_command(struct jtag_command *cmd) { - // this command goes on the end, so ensure the queue terminates + /* this command goes on the end, so ensure the queue terminates */ cmd->next = NULL; - jtag_command_t **last_cmd = next_command_pointer; + struct jtag_command **last_cmd = next_command_pointer; assert(NULL != last_cmd); assert(NULL == *last_cmd); *last_cmd = cmd; - // store location where the next command pointer will be stored + /* store location where the next command pointer will be stored */ next_command_pointer = &cmd->next; } -void* cmd_queue_alloc(size_t size) +void *cmd_queue_alloc(size_t size) { struct cmd_queue_page **p_page = &cmd_queue_pages; int offset; @@ -94,19 +96,17 @@ void* cmd_queue_alloc(size_t size) #define ALIGN_SIZE (sizeof(union worse_case_align)) /* The alignment process. */ - size = (size + ALIGN_SIZE -1) & (~(ALIGN_SIZE-1)); + size = (size + ALIGN_SIZE - 1) & (~(ALIGN_SIZE - 1)); /* Done... */ - if (*p_page) - { + if (*p_page) { while ((*p_page)->next) p_page = &((*p_page)->next); if (CMD_QUEUE_PAGE_SIZE - (*p_page)->used < size) p_page = &((*p_page)->next); } - if (!*p_page) - { + if (!*p_page) { *p_page = malloc(sizeof(struct cmd_queue_page)); (*p_page)->used = 0; (*p_page)->address = malloc(CMD_QUEUE_PAGE_SIZE); @@ -120,12 +120,11 @@ void* cmd_queue_alloc(size_t size) return t + offset; } -void cmd_queue_free(void) +static void cmd_queue_free(void) { struct cmd_queue_page *page = cmd_queue_pages; - while (page) - { + while (page) { struct cmd_queue_page *last = page; free(page->address); page = page->next; @@ -148,8 +147,7 @@ enum scan_type jtag_scan_type(const struct scan_command *cmd) int i; int type = 0; - for (i = 0; i < cmd->num_fields; i++) - { + for (i = 0; i < cmd->num_fields; i++) { if (cmd->fields[i].in_value) type |= SCAN_IN; if (cmd->fields[i].out_value) @@ -166,9 +164,7 @@ int jtag_scan_size(const struct scan_command *cmd) /* count bits in scan command */ for (i = 0; i < cmd->num_fields; i++) - { bit_count += cmd->fields[i].num_bits; - } return bit_count; } @@ -179,7 +175,7 @@ int jtag_build_buffer(const struct scan_command *cmd, uint8_t **buffer) int i; bit_count = jtag_scan_size(cmd); - *buffer = calloc(1,CEIL(bit_count, 8)); + *buffer = calloc(1, DIV_ROUND_UP(bit_count, 8)); bit_count = 0; @@ -187,10 +183,8 @@ int jtag_build_buffer(const struct scan_command *cmd, uint8_t **buffer) cmd->ir_scan ? "IRSCAN" : "DRSCAN", cmd->num_fields); - for (i = 0; i < cmd->num_fields; i++) - { - if (cmd->fields[i].out_value) - { + for (i = 0; i < cmd->num_fields; i++) { + if (cmd->fields[i].out_value) { #ifdef _DEBUG_JTAG_IO_ char *char_buf = buf_to_str(cmd->fields[i].out_value, (cmd->fields[i].num_bits > DEBUG_JTAG_IOZ) @@ -203,9 +197,7 @@ int jtag_build_buffer(const struct scan_command *cmd, uint8_t **buffer) #endif buf_set_buf(cmd->fields[i].out_value, 0, *buffer, bit_count, cmd->fields[i].num_bits); - } - else - { + } else { DEBUG_JTAG_IO("fields[%i].out_value[%i]: NULL", i, cmd->fields[i].num_bits); } @@ -213,7 +205,7 @@ int jtag_build_buffer(const struct scan_command *cmd, uint8_t **buffer) bit_count += cmd->fields[i].num_bits; } - //DEBUG_JTAG_IO("bit_count totalling: %i", bit_count); + /*DEBUG_JTAG_IO("bit_count totalling: %i", bit_count); */ return bit_count; } @@ -227,15 +219,14 @@ int jtag_read_buffer(uint8_t *buffer, const struct scan_command *cmd) /* we return ERROR_OK, unless a check fails, or a handler reports a problem */ retval = ERROR_OK; - for (i = 0; i < cmd->num_fields; i++) - { + for (i = 0; i < cmd->num_fields; i++) { /* if neither in_value nor in_handler * are specified we don't have to examine this field */ - if (cmd->fields[i].in_value) - { + if (cmd->fields[i].in_value) { int num_bits = cmd->fields[i].num_bits; - uint8_t *captured = buf_set_buf(buffer, bit_count, malloc(CEIL(num_bits, 8)), 0, num_bits); + uint8_t *captured = buf_set_buf(buffer, bit_count, + malloc(DIV_ROUND_UP(num_bits, 8)), 0, num_bits); #ifdef _DEBUG_JTAG_IO_ char *char_buf = buf_to_str(captured, @@ -249,9 +240,7 @@ int jtag_read_buffer(uint8_t *buffer, const struct scan_command *cmd) #endif if (cmd->fields[i].in_value) - { buf_cpy(captured, cmd->fields[i].in_value, num_bits); - } free(captured); } @@ -260,5 +249,3 @@ int jtag_read_buffer(uint8_t *buffer, const struct scan_command *cmd) return retval; } - -