sys64738
/
blackmagic
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hosted/FTDI: Cleaned up the error handling so the compiler can usefully tell us of errors in conditions 

This also fixes an accidental assignment bug in libfti_max_frequency_set()
This commit is contained in:
dragonmux 2022-06-15 22:08:03 -04:00 committed by Piotr Esden-Tempski
parent 826840bf90
commit 0139a349ab
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/platforms/hosted/ftdi_bmp.c
View File

@ -564,7 +564,7 @@ bool libftdi_nrst_get_val(void)
uint8_t data[1]; uint8_t data[1];
libftdi_buffer_read(data, 1); libftdi_buffer_read(data, 1);
bool res = false; bool res = false;
if (((pin < 0x7f) || (pin == PIN7))) if (pin < 0x7f || pin == PIN7)
res = data[0] & pin; res = data[0] & pin;
else else
res = !(data[0] & ~pin); res = !(data[0] & ~pin);
@ -594,7 +594,7 @@ int libftdi_buffer_write(const uint8_t *data, int size)
DEBUG_WIRE("Write %d bytes:", size); DEBUG_WIRE("Write %d bytes:", size);
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
DEBUG_WIRE(" %02x", data[i]); DEBUG_WIRE(" %02x", data[i]);
if (i && ((i & 0xf) == 0xf)) if (i && (i & 0xf) == 0xf)
DEBUG_WIRE("\n\t"); DEBUG_WIRE("\n\t");
} }
DEBUG_WIRE("\n"); DEBUG_WIRE("\n");
@ -621,7 +621,7 @@ int libftdi_buffer_read(uint8_t *data, int size)
DEBUG_WIRE("Read %d bytes:", size); DEBUG_WIRE("Read %d bytes:", size);
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
DEBUG_WIRE(" %02x", data[i]); DEBUG_WIRE(" %02x", data[i]);
if (i && ((i & 0xf) == 0xf)) if (i && (i & 0xf) == 0xf)
DEBUG_WIRE("\n\t"); DEBUG_WIRE("\n\t");
} }
DEBUG_WIRE("\n"); DEBUG_WIRE("\n");
@ -701,7 +701,7 @@ const char *libftdi_target_voltage(void)
uint8_t data[1]; uint8_t data[1];
libftdi_buffer_read(data, 1); libftdi_buffer_read(data, 1);
bool res = false; bool res = false;
if (((pin < 0x7f) || (pin == PIN7))) if (pin < 0x7f || pin == PIN7)
res = data[0] & pin; res = data[0] & pin;
else else
res = !(data[0] & ~pin); res = !(data[0] & ~pin);
@ -723,7 +723,7 @@ void libftdi_max_frequency_set(uint32_t freq)
/* Undivided clock set during startup*/ /* Undivided clock set during startup*/
clock = 60 * 1000 * 1000; clock = 60 * 1000 * 1000;
uint32_t div = (clock + 2 * freq - 1)/ freq; uint32_t div = (clock + 2 * freq - 1)/ freq;
if ((div < 4) && (ftdic->type = TYPE_2232C)) if (div < 4 && ftdic->type == TYPE_2232C)
div = 4; /* Avoid bad unsymetrict FT2232C clock at 6 MHz*/ div = 4; /* Avoid bad unsymetrict FT2232C clock at 6 MHz*/
divisor = div / 2 - 1; divisor = div / 2 - 1;
uint8_t buf[3]; uint8_t buf[3];