misc: Formatting consistency

This commit is contained in:
dragonmux 2022-06-15 22:14:35 -04:00 committed by Piotr Esden-Tempski
parent 2765811bbb
commit aa9c80b37d
6 changed files with 39 additions and 37 deletions

View File

@ -216,7 +216,7 @@ static bool cmd_jtag_scan(target *t, int argc, char **argv)
break; break;
} }
if(devs <= 0) { if (devs <= 0) {
platform_nrst_set_val(false); platform_nrst_set_val(false);
gdb_out("JTAG device scan failed!\n"); gdb_out("JTAG device scan failed!\n");
return false; return false;
@ -328,7 +328,7 @@ bool cmd_frequency(target *t, int argc, char **argv)
if (argc == 2) { if (argc == 2) {
char *p; char *p;
uint32_t frequency = strtol(argv[1], &p, 10); uint32_t frequency = strtol(argv[1], &p, 10);
switch(*p) { switch (*p) {
case 'k': case 'k':
frequency *= 1000; frequency *= 1000;
break; break;
@ -384,7 +384,7 @@ bool cmd_morse(target *t, int argc, char **argv)
(void)t; (void)t;
(void)argc; (void)argc;
(void)argv; (void)argv;
if(morse_msg) { if (morse_msg) {
gdb_outf("%s\n", morse_msg); gdb_outf("%s\n", morse_msg);
DEBUG_WARN("%s\n", morse_msg); DEBUG_WARN("%s\n", morse_msg);
} }

View File

@ -51,4 +51,3 @@ void platform_max_frequency_set(uint32_t frequency);
uint32_t platform_max_frequency_get(void); uint32_t platform_max_frequency_get(void);
#endif #endif

View File

@ -352,7 +352,7 @@ int ftdi_bmp_init(BMP_CL_OPTIONS_t *cl_opts, bmp_info_t *info)
{ {
int err; int err;
cable_desc_t *cable = &cable_desc[0]; cable_desc_t *cable = &cable_desc[0];
for(; cable->name; cable++) { for (; cable->name; cable++) {
if (strncmp(cable->name, cl_opts->opt_cable, strlen(cable->name)) == 0) if (strncmp(cable->name, cl_opts->opt_cable, strlen(cable->name)) == 0)
break; break;
} }
@ -384,23 +384,23 @@ int ftdi_bmp_init(BMP_CL_OPTIONS_t *cl_opts, bmp_info_t *info)
DEBUG_WARN("SWD with cable not possible, trying JTAG\n"); DEBUG_WARN("SWD with cable not possible, trying JTAG\n");
cl_opts->opt_scanmode = BMP_SCAN_JTAG; cl_opts->opt_scanmode = BMP_SCAN_JTAG;
} }
if(ftdic) { if (ftdic) {
ftdi_usb_close(ftdic); ftdi_usb_close(ftdic);
ftdi_free(ftdic); ftdi_free(ftdic);
ftdic = NULL; ftdic = NULL;
} }
if((ftdic = ftdi_new()) == NULL) { if ((ftdic = ftdi_new()) == NULL) {
DEBUG_WARN( "ftdi_new: %s\n", DEBUG_WARN( "ftdi_new: %s\n",
ftdi_get_error_string(ftdic)); ftdi_get_error_string(ftdic));
abort(); abort();
} }
info->ftdic = ftdic; info->ftdic = ftdic;
if((err = ftdi_set_interface(ftdic, active_cable->interface)) != 0) { if ((err = ftdi_set_interface(ftdic, active_cable->interface)) != 0) {
DEBUG_WARN( "ftdi_set_interface: %d: %s\n", DEBUG_WARN( "ftdi_set_interface: %d: %s\n",
err, ftdi_get_error_string(ftdic)); err, ftdi_get_error_string(ftdic));
goto error_1; goto error_1;
} }
if((err = ftdi_usb_open_desc( if ((err = ftdi_usb_open_desc(
ftdic, active_cable->vendor, active_cable->product, ftdic, active_cable->vendor, active_cable->product,
active_cable->description, cl_opts->opt_serial)) != 0) { active_cable->description, cl_opts->opt_serial)) != 0) {
DEBUG_WARN( "unable to open ftdi device: %d (%s)\n", DEBUG_WARN( "unable to open ftdi device: %d (%s)\n",
@ -408,17 +408,17 @@ int ftdi_bmp_init(BMP_CL_OPTIONS_t *cl_opts, bmp_info_t *info)
goto error_1; goto error_1;
} }
if((err = ftdi_set_latency_timer(ftdic, 1)) != 0) { if ((err = ftdi_set_latency_timer(ftdic, 1)) != 0) {
DEBUG_WARN( "ftdi_set_latency_timer: %d: %s\n", DEBUG_WARN( "ftdi_set_latency_timer: %d: %s\n",
err, ftdi_get_error_string(ftdic)); err, ftdi_get_error_string(ftdic));
goto error_2; goto error_2;
} }
if((err = ftdi_set_baudrate(ftdic, 1000000)) != 0) { if ((err = ftdi_set_baudrate(ftdic, 1000000)) != 0) {
DEBUG_WARN( "ftdi_set_baudrate: %d: %s\n", DEBUG_WARN( "ftdi_set_baudrate: %d: %s\n",
err, ftdi_get_error_string(ftdic)); err, ftdi_get_error_string(ftdic));
goto error_2; goto error_2;
} }
if((err = ftdi_write_data_set_chunksize(ftdic, BUF_SIZE)) != 0) { if ((err = ftdi_write_data_set_chunksize(ftdic, BUF_SIZE)) != 0) {
DEBUG_WARN( "ftdi_write_data_set_chunksize: %d: %s\n", DEBUG_WARN( "ftdi_write_data_set_chunksize: %d: %s\n",
err, ftdi_get_error_string(ftdic)); err, ftdi_get_error_string(ftdic));
goto error_2; goto error_2;
@ -459,7 +459,7 @@ int ftdi_bmp_init(BMP_CL_OPTIONS_t *cl_opts, bmp_info_t *info)
} }
int index = 0; int index = 0;
ftdi_init[index++]= LOOPBACK_END; /* FT2232D gets upset otherwise*/ ftdi_init[index++]= LOOPBACK_END; /* FT2232D gets upset otherwise*/
switch(ftdic->type) { switch (ftdic->type) {
case TYPE_2232H: case TYPE_2232H:
case TYPE_4232H: case TYPE_4232H:
case TYPE_232H: case TYPE_232H:
@ -633,19 +633,22 @@ void libftdi_jtagtap_tdi_tdo_seq(
{ {
int rsize, rticks; int rsize, rticks;
if(!ticks) return; if (!ticks)
if (!DI && !DO) return; return;
if (!DI && !DO)
return;
DEBUG_WIRE("libftdi_jtagtap_tdi_tdo_seq %s ticks: %d\n", DEBUG_WIRE("libftdi_jtagtap_tdi_tdo_seq %s ticks: %d\n",
(DI && DO) ? "read/write" : ((DI) ? "write" : "read"), ticks); (DI && DO) ? "read/write" : ((DI) ? "write" : "read"), ticks);
if(final_tms) ticks--; if (final_tms)
--ticks;
rticks = ticks & 7; rticks = ticks & 7;
ticks >>= 3; ticks >>= 3;
uint8_t data[8]; uint8_t data[8];
uint8_t cmd = ((DO)? MPSSE_DO_READ : 0) | uint8_t cmd = ((DO)? MPSSE_DO_READ : 0) |
((DI)? (MPSSE_DO_WRITE | MPSSE_WRITE_NEG) : 0) | MPSSE_LSB; ((DI)? (MPSSE_DO_WRITE | MPSSE_WRITE_NEG) : 0) | MPSSE_LSB;
rsize = ticks; rsize = ticks;
if(ticks) { if (ticks) {
data[0] = cmd; data[0] = cmd;
data[1] = ticks - 1; data[1] = ticks - 1;
data[2] = 0; data[2] = 0;
@ -654,14 +657,14 @@ void libftdi_jtagtap_tdi_tdo_seq(
libftdi_buffer_write(DI, ticks); libftdi_buffer_write(DI, ticks);
} }
int index = 0; int index = 0;
if(rticks) { if (rticks) {
rsize++; rsize++;
data[index++] = cmd | MPSSE_BITMODE; data[index++] = cmd | MPSSE_BITMODE;
data[index++] = rticks - 1; data[index++] = rticks - 1;
if (DI) if (DI)
data[index++] = DI[ticks]; data[index++] = DI[ticks];
} }
if(final_tms) { if (final_tms) {
rsize++; rsize++;
data[index++] = MPSSE_WRITE_TMS | ((DO)? MPSSE_DO_READ : 0) | data[index++] = MPSSE_WRITE_TMS | ((DO)? MPSSE_DO_READ : 0) |
MPSSE_LSB | MPSSE_BITMODE | MPSSE_WRITE_NEG; MPSSE_LSB | MPSSE_BITMODE | MPSSE_WRITE_NEG;
@ -677,19 +680,20 @@ void libftdi_jtagtap_tdi_tdo_seq(
libftdi_buffer_read(tmp, rsize); libftdi_buffer_read(tmp, rsize);
if(final_tms) rsize--; if(final_tms) rsize--;
while(rsize--) { while (rsize--)
*DO++ = tmp[index++]; *DO++ = tmp[index++];
}
if (rticks == 0) if (rticks == 0)
*DO++ = 0; *DO++ = 0;
if(final_tms) {
if (final_tms) {
rticks++; rticks++;
*(--DO) >>= 1; *(--DO) >>= 1;
*DO |= tmp[index] & 0x80; *DO |= tmp[index] & 0x80;
} else DO--; } else
if(rticks) { --DO;
if (rticks)
*DO >>= (8-rticks); *DO >>= (8-rticks);
}
} }
} }

View File

@ -274,7 +274,7 @@ static void remotePacketProcessGEN(unsigned i, char *packet)
uint32_t freq; uint32_t freq;
switch (packet[1]) { switch (packet[1]) {
case REMOTE_VOLTAGE: case REMOTE_VOLTAGE:
_respondS(REMOTE_RESP_OK,platform_target_voltage()); _respondS(REMOTE_RESP_OK, platform_target_voltage());
break; break;
case REMOTE_NRST_SET: case REMOTE_NRST_SET:
@ -298,26 +298,25 @@ static void remotePacketProcessGEN(unsigned i, char *packet)
#ifdef PLATFORM_HAS_POWER_SWITCH #ifdef PLATFORM_HAS_POWER_SWITCH
if (packet[2]=='1' if (packet[2]=='1'
&& !platform_target_get_power() && !platform_target_get_power()
&& platform_target_voltage_sense() > POWER_CONFLICT_THRESHOLD) && platform_target_voltage_sense() > POWER_CONFLICT_THRESHOLD) {
{
/* want to enable target power, but voltage > 0.5V sensed /* want to enable target power, but voltage > 0.5V sensed
* on the pin -> cancel * on the pin -> cancel
*/ */
_respond(REMOTE_RESP_ERR,0); _respond(REMOTE_RESP_ERR, 0);
} else { } else {
platform_target_set_power(packet[2]=='1'); platform_target_set_power(packet[2] == '1');
_respond(REMOTE_RESP_OK,0); _respond(REMOTE_RESP_OK, 0);
} }
#else #else
_respond(REMOTE_RESP_NOTSUP,0); _respond(REMOTE_RESP_NOTSUP, 0);
#endif #endif
break; break;
case REMOTE_PWR_GET: case REMOTE_PWR_GET:
#ifdef PLATFORM_HAS_POWER_SWITCH #ifdef PLATFORM_HAS_POWER_SWITCH
_respond(REMOTE_RESP_OK,platform_target_get_power()); _respond(REMOTE_RESP_OK, platform_target_get_power());
#else #else
_respond(REMOTE_RESP_NOTSUP,0); _respond(REMOTE_RESP_NOTSUP, 0);
#endif #endif
break; break;
@ -329,7 +328,7 @@ static void remotePacketProcessGEN(unsigned i, char *packet)
break; break;
default: default:
_respond(REMOTE_RESP_ERR,REMOTE_ERROR_UNRECOGNISED); _respond(REMOTE_RESP_ERR, REMOTE_ERROR_UNRECOGNISED);
break; break;
} }
} }