jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

ftdi_bmp: Fix setting bits and FTDIJTAG srst.

Browse Source
This commit is contained in:
Uwe Bonnes 2020-12-30 17:03:46 +01:00 committed by UweBonnes
parent cfdf55855e
commit 36836d0746
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,8 +123,8 @@ cable_desc_t cable_desc[] = {
.init.ddr_low = PIN4, .init.ddr_low = PIN4,
.init.data_high = PIN4 | PIN3 | PIN2, .init.data_high = PIN4 | PIN3 | PIN2,
.init.ddr_high = PIN4 | PIN3 | PIN2 | PIN1 | PIN0, .init.ddr_high = PIN4 | PIN3 | PIN2 | PIN1 | PIN0,
.assert_srst.data_high = ~PIN2, .assert_srst.data_high = ~PIN3,
.deassert_srst.data_high = PIN2, .deassert_srst.data_high = PIN3,
.srst_get_port_cmd = GET_BITS_LOW, .srst_get_port_cmd = GET_BITS_LOW,
.srst_get_pin = PIN6, .srst_get_pin = PIN6,
.description = "FTDIJTAG", .description = "FTDIJTAG",
@ -421,11 +421,11 @@ static void libftdi_set_data(data_desc_t* data)
if ((data->data_low) || (data->ddr_low)) { if ((data->data_low) || (data->ddr_low)) {
if (data->data_low > 0) if (data->data_low > 0)
active_state.data_low |= (data->data_low & 0xff); active_state.data_low |= (data->data_low & 0xff);
else else if (data->data_low < 0)
active_state.data_low &= (data->data_low & 0xff); active_state.data_low &= (data->data_low & 0xff);
if (data->ddr_low > 0) if (data->ddr_low > 0)
active_state.ddr_low |= (data->ddr_low & 0xff); active_state.ddr_low |= (data->ddr_low & 0xff);
else else if (data->ddr_low < 0)
active_state.ddr_low &= (data->ddr_low & 0xff); active_state.ddr_low &= (data->ddr_low & 0xff);
cmd[index++] = SET_BITS_LOW; cmd[index++] = SET_BITS_LOW;
cmd[index++] = active_state.data_low; cmd[index++] = active_state.data_low;
@ -434,11 +434,11 @@ static void libftdi_set_data(data_desc_t* data)
if ((data->data_high) || (data->ddr_high)) { if ((data->data_high) || (data->ddr_high)) {
if (data->data_high > 0) if (data->data_high > 0)
active_state.data_high |= (data->data_high & 0xff); active_state.data_high |= (data->data_high & 0xff);
else else if (data->data_high < 0)
active_state.data_high &= (data->data_high & 0xff); active_state.data_high &= (data->data_high & 0xff);
if (data->ddr_high > 0) if (data->ddr_high > 0)
active_state.ddr_high |= (data->ddr_high & 0xff); active_state.ddr_high |= (data->ddr_high & 0xff);
else else if (data->ddr_high < 0)
active_state.ddr_high &= (data->ddr_high & 0xff); active_state.ddr_high &= (data->ddr_high & 0xff);
cmd[index++] = SET_BITS_HIGH; cmd[index++] = SET_BITS_HIGH;
cmd[index++] = active_state.data_high; cmd[index++] = active_state.data_high;