From 2327b8603c8fe74f01d134f1f55c6ccad7147aa7 Mon Sep 17 00:00:00 2001 From: zwelch Date: Sat, 30 May 2009 01:44:22 +0000 Subject: [PATCH] Remove trailing whitespace from oocd_trace source file. git-svn-id: svn://svn.berlios.de/openocd/trunk@1946 b42882b7-edfa-0310-969c-e2dbd0fdcd60 --- src/target/oocd_trace.c | 104 ++++++++++++++++++++-------------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/src/target/oocd_trace.c b/src/target/oocd_trace.c index 4d1570762..7fef23d8f 100644 --- a/src/target/oocd_trace.c +++ b/src/target/oocd_trace.c @@ -48,7 +48,7 @@ static int oocd_trace_read_reg(oocd_trace_t *oocd_trace, int reg, u32 *value) } LOG_DEBUG("reg #%i: 0x%8.8x\n", reg, *value); - + return ERROR_OK; } @@ -92,7 +92,7 @@ static int oocd_trace_read_memory(oocd_trace_t *oocd_trace, u8 *data, u32 addres else bytes_to_read -= bytes_read; } - + return ERROR_OK; } @@ -101,7 +101,7 @@ static int oocd_trace_init(etm_context_t *etm_ctx) u8 trash[256]; oocd_trace_t *oocd_trace = etm_ctx->capture_driver_priv; size_t bytes_read; - + oocd_trace->tty_fd = open(oocd_trace->tty, O_RDWR | O_NOCTTY | O_NONBLOCK); if(oocd_trace->tty_fd < 0) @@ -114,32 +114,32 @@ static int oocd_trace_init(etm_context_t *etm_ctx) tcflush(oocd_trace->tty_fd, TCOFLUSH); tcflush(oocd_trace->tty_fd, TCIFLUSH); fcntl(oocd_trace->tty_fd, F_SETFL, fcntl(oocd_trace->tty_fd, F_GETFL) & ~O_NONBLOCK); - + tcgetattr(oocd_trace->tty_fd, &oocd_trace->oldtio); /* save current port settings */ - + bzero(&oocd_trace->newtio, sizeof(oocd_trace->newtio)); oocd_trace->newtio.c_cflag = CS8 | CLOCAL | CREAD | B2500000; - + oocd_trace->newtio.c_iflag = IGNPAR | IGNBRK | IXON | IXOFF; oocd_trace->newtio.c_oflag = 0; - + /* set input mode (non-canonical, no echo,...) */ oocd_trace->newtio.c_lflag = 0; - + cfmakeraw(&oocd_trace->newtio); oocd_trace->newtio.c_cc[VTIME] = 1; /* inter-character timer used */ oocd_trace->newtio.c_cc[VMIN] = 0; /* blocking read until 0 chars received */ - + tcflush(oocd_trace->tty_fd, TCIFLUSH); tcsetattr(oocd_trace->tty_fd, TCSANOW, &oocd_trace->newtio); - + /* occasionally one bogus character is left in the input buffer * read up any leftover characters to ensure communication is in sync */ while ((bytes_read = read(oocd_trace->tty_fd, trash, sizeof(trash))) > 0) { LOG_DEBUG("%zi bytes read\n", bytes_read); }; - + return ERROR_OK; } @@ -147,9 +147,9 @@ static trace_status_t oocd_trace_status(etm_context_t *etm_ctx) { oocd_trace_t *oocd_trace = etm_ctx->capture_driver_priv; u32 status; - + oocd_trace_read_reg(oocd_trace, OOCD_TRACE_STATUS, &status); - + /* if tracing is currently idle, return this information */ if (etm_ctx->capture_status == TRACE_IDLE) { @@ -160,18 +160,18 @@ static trace_status_t oocd_trace_status(etm_context_t *etm_ctx) /* check Full bit to identify an overflow */ if (status & 0x4) etm_ctx->capture_status |= TRACE_OVERFLOWED; - + /* check Triggered bit to identify trigger condition */ if (status & 0x2) etm_ctx->capture_status |= TRACE_TRIGGERED; - + if (status & 0x1) { etm_ctx->capture_status &= ~TRACE_RUNNING; etm_ctx->capture_status |= TRACE_COMPLETED; } } - + return etm_ctx->capture_status; } @@ -196,7 +196,7 @@ static int oocd_trace_read_trace(etm_context_t *etm_ctx) else num_frames = address; - /* read data into temporary array for unpacking + /* read data into temporary array for unpacking * one frame from OpenOCD+trace corresponds to 16 trace cycles */ trace_data = malloc(sizeof(u8) * num_frames * 16); @@ -209,13 +209,13 @@ static int oocd_trace_read_trace(etm_context_t *etm_ctx) etm_ctx->trace_depth = num_frames * 16; etm_ctx->trace_data = malloc(sizeof(etmv1_trace_data_t) * etm_ctx->trace_depth); - + for (i = 0; i < num_frames * 16; i++) { etm_ctx->trace_data[i].pipestat = (trace_data[i] & 0x7); etm_ctx->trace_data[i].packet = (trace_data[i] & 0x78) >> 3; etm_ctx->trace_data[i].flags = 0; - + if ((trace_data[i] & 0x80) >> 7) { etm_ctx->trace_data[i].flags |= ETMV1_TRACESYNC_CYCLE; @@ -227,7 +227,7 @@ static int oocd_trace_read_trace(etm_context_t *etm_ctx) etm_ctx->trace_data[i].flags |= ETMV1_TRIGGER_CYCLE; } } - + free(trace_data); return ERROR_OK; @@ -238,19 +238,19 @@ static int oocd_trace_start_capture(etm_context_t *etm_ctx) oocd_trace_t *oocd_trace = etm_ctx->capture_driver_priv; u32 control = 0x1; /* 0x1: enabled */ u32 trigger_count; - + if (((etm_ctx->portmode & ETM_PORT_MODE_MASK) != ETM_PORT_NORMAL) || ((etm_ctx->portmode & ETM_PORT_WIDTH_MASK) != ETM_PORT_4BIT)) { LOG_DEBUG("OpenOCD+trace only supports normal 4-bit ETM mode"); return ERROR_ETM_PORTMODE_NOT_SUPPORTED; } - + if ((etm_ctx->portmode & ETM_PORT_CLOCK_MASK) == ETM_PORT_HALF_CLOCK) { control |= 0x2; /* half rate clock, capture at twice the clock rate */ } - + /* OpenOCD+trace holds up to 16 million samples, * but trigger counts is set in multiples of 16 */ trigger_count = (1048576 * etm_ctx->trigger_percent) / 100; @@ -259,22 +259,22 @@ static int oocd_trace_start_capture(etm_context_t *etm_ctx) oocd_trace_write_reg(oocd_trace, OOCD_TRACE_ADDRESS, 0x0); oocd_trace_write_reg(oocd_trace, OOCD_TRACE_TRIGGER_COUNTER, trigger_count); oocd_trace_write_reg(oocd_trace, OOCD_TRACE_CONTROL, control); - + /* we're starting a new trace, initialize capture status */ etm_ctx->capture_status = TRACE_RUNNING; - - return ERROR_OK; + + return ERROR_OK; } static int oocd_trace_stop_capture(etm_context_t *etm_ctx) { oocd_trace_t *oocd_trace = etm_ctx->capture_driver_priv; - /* trace stopped, just clear running flag, but preserve others */ + /* trace stopped, just clear running flag, but preserve others */ etm_ctx->capture_status &= ~TRACE_RUNNING; - + oocd_trace_write_reg(oocd_trace, OOCD_TRACE_CONTROL, 0x0); - + return ERROR_OK; } @@ -294,28 +294,28 @@ static int handle_oocd_trace_config_command(struct command_context_s *cmd_ctx, c target_t *target; armv4_5_common_t *armv4_5; arm7_9_common_t *arm7_9; - + if (argc != 2) { LOG_ERROR("incomplete 'oocd_trace config ' command"); exit(-1); } - + target = get_current_target(cmd_ctx); - + if (arm7_9_get_arch_pointers(target, &armv4_5, &arm7_9) != ERROR_OK) { command_print(cmd_ctx, "current target isn't an ARM7/ARM9 target"); return ERROR_OK; } - + if (arm7_9->etm_ctx) { oocd_trace_t *oocd_trace = malloc(sizeof(oocd_trace_t)); - + arm7_9->etm_ctx->capture_driver_priv = oocd_trace; oocd_trace->etm_ctx = arm7_9->etm_ctx; - + /* copy name of TTY device used to communicate with OpenOCD+trace */ oocd_trace->tty = strndup(args[1], 256); } @@ -334,36 +334,36 @@ static int handle_oocd_trace_status_command(struct command_context_s *cmd_ctx, c arm7_9_common_t *arm7_9; oocd_trace_t *oocd_trace; u32 status; - + target = get_current_target(cmd_ctx); - + if (arm7_9_get_arch_pointers(target, &armv4_5, &arm7_9) != ERROR_OK) { command_print(cmd_ctx, "current target isn't an ARM7/ARM9 target"); return ERROR_OK; } - + if (!arm7_9->etm_ctx) { command_print(cmd_ctx, "current target doesn't have an ETM configured"); return ERROR_OK; } - + if (strcmp(arm7_9->etm_ctx->capture_driver->name, "oocd_trace") != 0) { command_print(cmd_ctx, "current target's ETM capture driver isn't 'oocd_trace'"); return ERROR_OK; } - + oocd_trace = (oocd_trace_t*)arm7_9->etm_ctx->capture_driver_priv; - + oocd_trace_read_reg(oocd_trace, OOCD_TRACE_STATUS, &status); - + if (status & 0x8) command_print(cmd_ctx, "trace clock locked"); else command_print(cmd_ctx, "no trace clock"); - + return ERROR_OK; } @@ -375,33 +375,33 @@ static int handle_oocd_trace_resync_command(struct command_context_s *cmd_ctx, c oocd_trace_t *oocd_trace; size_t bytes_written; u8 cmd_array[1]; - + target = get_current_target(cmd_ctx); - + if (arm7_9_get_arch_pointers(target, &armv4_5, &arm7_9) != ERROR_OK) { command_print(cmd_ctx, "current target isn't an ARM7/ARM9 target"); return ERROR_OK; } - + if (!arm7_9->etm_ctx) { command_print(cmd_ctx, "current target doesn't have an ETM configured"); return ERROR_OK; } - + if (strcmp(arm7_9->etm_ctx->capture_driver->name, "oocd_trace") != 0) { command_print(cmd_ctx, "current target's ETM capture driver isn't 'oocd_trace'"); return ERROR_OK; } - + oocd_trace = (oocd_trace_t*)arm7_9->etm_ctx->capture_driver_priv; - + cmd_array[0] = 0xf0; bytes_written = write(oocd_trace->tty_fd, cmd_array, 1); - + command_print(cmd_ctx, "requesting traceclock resync"); LOG_DEBUG("resyncing traceclk pll"); @@ -411,9 +411,9 @@ static int handle_oocd_trace_resync_command(struct command_context_s *cmd_ctx, c int oocd_trace_register_commands(struct command_context_s *cmd_ctx) { command_t *oocd_trace_cmd; - + oocd_trace_cmd = register_command(cmd_ctx, NULL, "oocd_trace", NULL, COMMAND_ANY, "OpenOCD+trace"); - + register_command(cmd_ctx, oocd_trace_cmd, "config", handle_oocd_trace_config_command, COMMAND_CONFIG, NULL); register_command(cmd_ctx, oocd_trace_cmd, "status", handle_oocd_trace_status_command, COMMAND_EXEC, "display OpenOCD+trace status");