Skip to content

Commit 867611d

Browse files
borneoaborneoa
committed
jtag: drivers: align switch and case statements
The coding style requires the 'case' to be at the same indentation level of its 'switch' statement. Align the code accordingly. Skip the driver angie that is going to be updated soon with a new commit and skip the folder OpenULINK that contains a firmware for the dongle. No changes are reported by git log -p -w --ignore-blank-lines --patience Change-Id: I960a89a45bc9956f98676a019f0d1a652601155f Signed-off-by: Antonio Borneo <[email protected]> Reviewed-on: https://review.openocd.org/c/openocd/+/9055 Tested-by: jenkins Reviewed-by: zapb <[email protected]>
1 parent 8b751e0 commit 867611d

File tree

20 files changed

+1147
-1147
lines changed

20 files changed

+1147
-1147
lines changed

‎src/jtag/drivers/amt_jtagaccel.c‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -332,43 +332,43 @@ static int amt_jtagaccel_execute_queue(struct jtag_command *cmd_queue)
332332

333333
while (cmd) {
334334
switch (cmd->type) {
335-
case JTAG_RESET:
336-
LOG_DEBUG_IO("reset trst: %i srst %i",
337-
cmd->cmd.reset->trst,
338-
cmd->cmd.reset->srst);
339-
if (cmd->cmd.reset->trst == 1)
340-
tap_set_state(TAP_RESET);
341-
amt_jtagaccel_reset(cmd->cmd.reset->trst, cmd->cmd.reset->srst);
342-
break;
343-
case JTAG_RUNTEST:
344-
LOG_DEBUG_IO("runtest %i cycles, end in %i",
345-
cmd->cmd.runtest->num_cycles,
346-
cmd->cmd.runtest->end_state);
347-
amt_jtagaccel_end_state(cmd->cmd.runtest->end_state);
348-
amt_jtagaccel_runtest(cmd->cmd.runtest->num_cycles);
349-
break;
350-
case JTAG_TLR_RESET:
351-
LOG_DEBUG_IO("statemove end in %i", cmd->cmd.statemove->end_state);
352-
amt_jtagaccel_end_state(cmd->cmd.statemove->end_state);
353-
amt_jtagaccel_state_move();
354-
break;
355-
case JTAG_SCAN:
356-
LOG_DEBUG_IO("scan end in %i", cmd->cmd.scan->end_state);
357-
amt_jtagaccel_end_state(cmd->cmd.scan->end_state);
358-
scan_size = jtag_build_buffer(cmd->cmd.scan, &buffer);
359-
type = jtag_scan_type(cmd->cmd.scan);
360-
amt_jtagaccel_scan(cmd->cmd.scan->ir_scan, type, buffer, scan_size);
361-
if (jtag_read_buffer(buffer, cmd->cmd.scan) != ERROR_OK)
362-
retval = ERROR_JTAG_QUEUE_FAILED;
363-
free(buffer);
364-
break;
365-
case JTAG_SLEEP:
366-
LOG_DEBUG_IO("sleep %" PRIu32, cmd->cmd.sleep->us);
367-
jtag_sleep(cmd->cmd.sleep->us);
368-
break;
369-
default:
370-
LOG_ERROR("BUG: unknown JTAG command type encountered");
371-
exit(-1);
335+
case JTAG_RESET:
336+
LOG_DEBUG_IO("reset trst: %i srst %i",
337+
cmd->cmd.reset->trst,
338+
cmd->cmd.reset->srst);
339+
if (cmd->cmd.reset->trst == 1)
340+
tap_set_state(TAP_RESET);
341+
amt_jtagaccel_reset(cmd->cmd.reset->trst, cmd->cmd.reset->srst);
342+
break;
343+
case JTAG_RUNTEST:
344+
LOG_DEBUG_IO("runtest %i cycles, end in %i",
345+
cmd->cmd.runtest->num_cycles,
346+
cmd->cmd.runtest->end_state);
347+
amt_jtagaccel_end_state(cmd->cmd.runtest->end_state);
348+
amt_jtagaccel_runtest(cmd->cmd.runtest->num_cycles);
349+
break;
350+
case JTAG_TLR_RESET:
351+
LOG_DEBUG_IO("statemove end in %i", cmd->cmd.statemove->end_state);
352+
amt_jtagaccel_end_state(cmd->cmd.statemove->end_state);
353+
amt_jtagaccel_state_move();
354+
break;
355+
case JTAG_SCAN:
356+
LOG_DEBUG_IO("scan end in %i", cmd->cmd.scan->end_state);
357+
amt_jtagaccel_end_state(cmd->cmd.scan->end_state);
358+
scan_size = jtag_build_buffer(cmd->cmd.scan, &buffer);
359+
type = jtag_scan_type(cmd->cmd.scan);
360+
amt_jtagaccel_scan(cmd->cmd.scan->ir_scan, type, buffer, scan_size);
361+
if (jtag_read_buffer(buffer, cmd->cmd.scan) != ERROR_OK)
362+
retval = ERROR_JTAG_QUEUE_FAILED;
363+
free(buffer);
364+
break;
365+
case JTAG_SLEEP:
366+
LOG_DEBUG_IO("sleep %" PRIu32, cmd->cmd.sleep->us);
367+
jtag_sleep(cmd->cmd.sleep->us);
368+
break;
369+
default:
370+
LOG_ERROR("BUG: unknown JTAG command type encountered");
371+
exit(-1);
372372
}
373373
cmd = cmd->next;
374374
}

‎src/jtag/drivers/arm-jtag-ew.c‎

Lines changed: 52 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -94,69 +94,69 @@ static int armjtagew_execute_queue(struct jtag_command *cmd_queue)
9494

9595
while (cmd) {
9696
switch (cmd->type) {
97-
case JTAG_RUNTEST:
98-
LOG_DEBUG_IO("runtest %u cycles, end in %i",
99-
cmd->cmd.runtest->num_cycles,
100-
cmd->cmd.runtest->end_state);
97+
case JTAG_RUNTEST:
98+
LOG_DEBUG_IO("runtest %u cycles, end in %i",
99+
cmd->cmd.runtest->num_cycles,
100+
cmd->cmd.runtest->end_state);
101101

102-
armjtagew_end_state(cmd->cmd.runtest->end_state);
103-
armjtagew_runtest(cmd->cmd.runtest->num_cycles);
104-
break;
102+
armjtagew_end_state(cmd->cmd.runtest->end_state);
103+
armjtagew_runtest(cmd->cmd.runtest->num_cycles);
104+
break;
105105

106-
case JTAG_TLR_RESET:
107-
LOG_DEBUG_IO("statemove end in %i", cmd->cmd.statemove->end_state);
106+
case JTAG_TLR_RESET:
107+
LOG_DEBUG_IO("statemove end in %i", cmd->cmd.statemove->end_state);
108108

109-
armjtagew_end_state(cmd->cmd.statemove->end_state);
110-
armjtagew_state_move();
111-
break;
109+
armjtagew_end_state(cmd->cmd.statemove->end_state);
110+
armjtagew_state_move();
111+
break;
112112

113-
case JTAG_PATHMOVE:
114-
LOG_DEBUG_IO("pathmove: %u states, end in %i",
115-
cmd->cmd.pathmove->num_states,
116-
cmd->cmd.pathmove->path[cmd->cmd.pathmove->num_states - 1]);
113+
case JTAG_PATHMOVE:
114+
LOG_DEBUG_IO("pathmove: %u states, end in %i",
115+
cmd->cmd.pathmove->num_states,
116+
cmd->cmd.pathmove->path[cmd->cmd.pathmove->num_states - 1]);
117117

118-
armjtagew_path_move(cmd->cmd.pathmove->num_states,
119-
cmd->cmd.pathmove->path);
120-
break;
118+
armjtagew_path_move(cmd->cmd.pathmove->num_states,
119+
cmd->cmd.pathmove->path);
120+
break;
121121

122-
case JTAG_SCAN:
123-
LOG_DEBUG_IO("scan end in %i", cmd->cmd.scan->end_state);
122+
case JTAG_SCAN:
123+
LOG_DEBUG_IO("scan end in %i", cmd->cmd.scan->end_state);
124124

125-
armjtagew_end_state(cmd->cmd.scan->end_state);
125+
armjtagew_end_state(cmd->cmd.scan->end_state);
126126

127-
scan_size = jtag_build_buffer(cmd->cmd.scan, &buffer);
128-
LOG_DEBUG_IO("scan input, length = %d", scan_size);
127+
scan_size = jtag_build_buffer(cmd->cmd.scan, &buffer);
128+
LOG_DEBUG_IO("scan input, length = %d", scan_size);
129129

130130
#ifdef _DEBUG_USB_COMMS_
131-
armjtagew_debug_buffer(buffer, (scan_size + 7) / 8);
131+
armjtagew_debug_buffer(buffer, (scan_size + 7) / 8);
132132
#endif
133-
type = jtag_scan_type(cmd->cmd.scan);
134-
armjtagew_scan(cmd->cmd.scan->ir_scan,
135-
type, buffer,
136-
scan_size, cmd->cmd.scan);
137-
break;
138-
139-
case JTAG_RESET:
140-
LOG_DEBUG_IO("reset trst: %i srst %i",
141-
cmd->cmd.reset->trst,
142-
cmd->cmd.reset->srst);
143-
144-
armjtagew_tap_execute();
145-
146-
if (cmd->cmd.reset->trst == 1)
147-
tap_set_state(TAP_RESET);
148-
armjtagew_reset(cmd->cmd.reset->trst, cmd->cmd.reset->srst);
149-
break;
150-
151-
case JTAG_SLEEP:
152-
LOG_DEBUG_IO("sleep %" PRIu32, cmd->cmd.sleep->us);
153-
armjtagew_tap_execute();
154-
jtag_sleep(cmd->cmd.sleep->us);
155-
break;
156-
157-
default:
158-
LOG_ERROR("BUG: unknown JTAG command type encountered");
159-
exit(-1);
133+
type = jtag_scan_type(cmd->cmd.scan);
134+
armjtagew_scan(cmd->cmd.scan->ir_scan,
135+
type, buffer,
136+
scan_size, cmd->cmd.scan);
137+
break;
138+
139+
case JTAG_RESET:
140+
LOG_DEBUG_IO("reset trst: %i srst %i",
141+
cmd->cmd.reset->trst,
142+
cmd->cmd.reset->srst);
143+
144+
armjtagew_tap_execute();
145+
146+
if (cmd->cmd.reset->trst == 1)
147+
tap_set_state(TAP_RESET);
148+
armjtagew_reset(cmd->cmd.reset->trst, cmd->cmd.reset->srst);
149+
break;
150+
151+
case JTAG_SLEEP:
152+
LOG_DEBUG_IO("sleep %" PRIu32, cmd->cmd.sleep->us);
153+
armjtagew_tap_execute();
154+
jtag_sleep(cmd->cmd.sleep->us);
155+
break;
156+
157+
default:
158+
LOG_ERROR("BUG: unknown JTAG command type encountered");
159+
exit(-1);
160160
}
161161
cmd = cmd->next;
162162
}

‎src/jtag/drivers/bitbang.c‎

Lines changed: 74 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -236,14 +236,14 @@ static int bitbang_scan(bool ir_scan, enum scan_type type, uint8_t *buffer,
236236
buffered++;
237237
} else {
238238
switch (bitbang_interface->read()) {
239-
case BB_LOW:
240-
buffer[bytec] &= ~bcval;
241-
break;
242-
case BB_HIGH:
243-
buffer[bytec] |= bcval;
244-
break;
245-
default:
246-
return ERROR_FAIL;
239+
case BB_LOW:
240+
buffer[bytec] &= ~bcval;
241+
break;
242+
case BB_HIGH:
243+
buffer[bytec] |= bcval;
244+
break;
245+
default:
246+
return ERROR_FAIL;
247247
}
248248
}
249249
}
@@ -256,14 +256,14 @@ static int bitbang_scan(bool ir_scan, enum scan_type type, uint8_t *buffer,
256256
bit_cnt == scan_size - 1)) {
257257
for (unsigned int i = bit_cnt + 1 - buffered; i <= bit_cnt; i++) {
258258
switch (bitbang_interface->read_sample()) {
259-
case BB_LOW:
260-
buffer[i/8] &= ~(1 << (i % 8));
261-
break;
262-
case BB_HIGH:
263-
buffer[i/8] |= 1 << (i % 8);
264-
break;
265-
default:
266-
return ERROR_FAIL;
259+
case BB_LOW:
260+
buffer[i / 8] &= ~(1 << (i % 8));
261+
break;
262+
case BB_HIGH:
263+
buffer[i / 8] |= 1 << (i % 8);
264+
break;
265+
default:
266+
return ERROR_FAIL;
267267
}
268268
}
269269
buffered = 0;
@@ -315,64 +315,64 @@ int bitbang_execute_queue(struct jtag_command *cmd_queue)
315315

316316
while (cmd) {
317317
switch (cmd->type) {
318-
case JTAG_RUNTEST:
319-
LOG_DEBUG_IO("runtest %u cycles, end in %s",
320-
cmd->cmd.runtest->num_cycles,
321-
tap_state_name(cmd->cmd.runtest->end_state));
322-
bitbang_end_state(cmd->cmd.runtest->end_state);
323-
if (bitbang_runtest(cmd->cmd.runtest->num_cycles) != ERROR_OK)
324-
return ERROR_FAIL;
325-
break;
326-
327-
case JTAG_STABLECLOCKS:
328-
/* this is only allowed while in a stable state. A check for a stable
329-
* state was done in jtag_add_clocks()
330-
*/
331-
if (bitbang_stableclocks(cmd->cmd.stableclocks->num_cycles) != ERROR_OK)
332-
return ERROR_FAIL;
333-
break;
334-
335-
case JTAG_TLR_RESET:
336-
LOG_DEBUG_IO("statemove end in %s",
337-
tap_state_name(cmd->cmd.statemove->end_state));
338-
bitbang_end_state(cmd->cmd.statemove->end_state);
339-
if (bitbang_state_move(0) != ERROR_OK)
340-
return ERROR_FAIL;
341-
break;
342-
case JTAG_PATHMOVE:
343-
LOG_DEBUG_IO("pathmove: %u states, end in %s",
344-
cmd->cmd.pathmove->num_states,
345-
tap_state_name(cmd->cmd.pathmove->path[cmd->cmd.pathmove->num_states - 1]));
346-
if (bitbang_path_move(cmd->cmd.pathmove) != ERROR_OK)
347-
return ERROR_FAIL;
348-
break;
349-
case JTAG_SCAN:
350-
bitbang_end_state(cmd->cmd.scan->end_state);
351-
scan_size = jtag_build_buffer(cmd->cmd.scan, &buffer);
352-
LOG_DEBUG_IO("%s scan %d bits; end in %s",
353-
(cmd->cmd.scan->ir_scan) ? "IR" : "DR",
354-
scan_size,
355-
tap_state_name(cmd->cmd.scan->end_state));
356-
type = jtag_scan_type(cmd->cmd.scan);
357-
if (bitbang_scan(cmd->cmd.scan->ir_scan, type, buffer,
358-
scan_size) != ERROR_OK)
359-
return ERROR_FAIL;
360-
if (jtag_read_buffer(buffer, cmd->cmd.scan) != ERROR_OK)
361-
retval = ERROR_JTAG_QUEUE_FAILED;
362-
free(buffer);
363-
break;
364-
case JTAG_SLEEP:
365-
LOG_DEBUG_IO("sleep %" PRIu32, cmd->cmd.sleep->us);
366-
if (bitbang_interface->flush && (bitbang_interface->flush() != ERROR_OK))
367-
return ERROR_FAIL;
368-
bitbang_sleep(cmd->cmd.sleep->us);
369-
break;
370-
case JTAG_TMS:
371-
retval = bitbang_execute_tms(cmd);
372-
break;
373-
default:
374-
LOG_ERROR("BUG: unknown JTAG command type encountered");
375-
exit(-1);
318+
case JTAG_RUNTEST:
319+
LOG_DEBUG_IO("runtest %u cycles, end in %s",
320+
cmd->cmd.runtest->num_cycles,
321+
tap_state_name(cmd->cmd.runtest->end_state));
322+
bitbang_end_state(cmd->cmd.runtest->end_state);
323+
if (bitbang_runtest(cmd->cmd.runtest->num_cycles) != ERROR_OK)
324+
return ERROR_FAIL;
325+
break;
326+
327+
case JTAG_STABLECLOCKS:
328+
/* this is only allowed while in a stable state. A check for a stable
329+
* state was done in jtag_add_clocks()
330+
*/
331+
if (bitbang_stableclocks(cmd->cmd.stableclocks->num_cycles) != ERROR_OK)
332+
return ERROR_FAIL;
333+
break;
334+
335+
case JTAG_TLR_RESET:
336+
LOG_DEBUG_IO("statemove end in %s",
337+
tap_state_name(cmd->cmd.statemove->end_state));
338+
bitbang_end_state(cmd->cmd.statemove->end_state);
339+
if (bitbang_state_move(0) != ERROR_OK)
340+
return ERROR_FAIL;
341+
break;
342+
case JTAG_PATHMOVE:
343+
LOG_DEBUG_IO("pathmove: %u states, end in %s",
344+
cmd->cmd.pathmove->num_states,
345+
tap_state_name(cmd->cmd.pathmove->path[cmd->cmd.pathmove->num_states - 1]));
346+
if (bitbang_path_move(cmd->cmd.pathmove) != ERROR_OK)
347+
return ERROR_FAIL;
348+
break;
349+
case JTAG_SCAN:
350+
bitbang_end_state(cmd->cmd.scan->end_state);
351+
scan_size = jtag_build_buffer(cmd->cmd.scan, &buffer);
352+
LOG_DEBUG_IO("%s scan %d bits; end in %s",
353+
(cmd->cmd.scan->ir_scan) ? "IR" : "DR",
354+
scan_size,
355+
tap_state_name(cmd->cmd.scan->end_state));
356+
type = jtag_scan_type(cmd->cmd.scan);
357+
if (bitbang_scan(cmd->cmd.scan->ir_scan, type, buffer,
358+
scan_size) != ERROR_OK)
359+
return ERROR_FAIL;
360+
if (jtag_read_buffer(buffer, cmd->cmd.scan) != ERROR_OK)
361+
retval = ERROR_JTAG_QUEUE_FAILED;
362+
free(buffer);
363+
break;
364+
case JTAG_SLEEP:
365+
LOG_DEBUG_IO("sleep %" PRIu32, cmd->cmd.sleep->us);
366+
if (bitbang_interface->flush && (bitbang_interface->flush() != ERROR_OK))
367+
return ERROR_FAIL;
368+
bitbang_sleep(cmd->cmd.sleep->us);
369+
break;
370+
case JTAG_TMS:
371+
retval = bitbang_execute_tms(cmd);
372+
break;
373+
default:
374+
LOG_ERROR("BUG: unknown JTAG command type encountered");
375+
exit(-1);
376376
}
377377
cmd = cmd->next;
378378
}

0 commit comments

Comments
 (0)