From dc003f6212ef7f6ffc1bf7af686f9a7d30cf96e1 Mon Sep 17 00:00:00 2001 From: ultraembedded Date: Fri, 11 Jun 2021 11:24:57 +0100 Subject: [PATCH] As per feedback, allow 232H devices to have upper bank pins configured on init. --- src/cable.hpp | 2 +- src/ftdipp_mpsse.cpp | 2 +- src/ftdipp_mpsse.hpp | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/cable.hpp b/src/cable.hpp index 09b5540..ff3aca4 100644 --- a/src/cable.hpp +++ b/src/cable.hpp @@ -32,7 +32,7 @@ static std::map cable_list = { {"digilent_b", {MODE_FTDI_SERIAL, {0x0403, 0x6010, INTERFACE_B, 0xe8, 0xeb, 0x00, 0x60}}}, {"digilent_hs2", {MODE_FTDI_SERIAL, {0x0403, 0x6014, INTERFACE_A, 0xe8, 0xeb, 0x00, 0x60}}}, {"digilent_hs3", {MODE_FTDI_SERIAL, {0x0403, 0x6014, INTERFACE_A, 0x88, 0x8B, 0x20, 0x30}}}, - {"digilent_ad", {MODE_FTDI_SERIAL, {0x0403, 0x6014, INTERFACE_A, 0x08, 0x0B, 0x80, 0x80, true}}}, + {"digilent_ad", {MODE_FTDI_SERIAL, {0x0403, 0x6014, INTERFACE_A, 0x08, 0x0B, 0x80, 0x80}}}, {"dirtyJtag", {MODE_DIRTYJTAG, {}}}, {"efinix_spi", {MODE_FTDI_SERIAL, {0x0403, 0x6011, INTERFACE_A, 0x08, 0x8B, 0x00, 0x00}}}, {"ft2232", {MODE_FTDI_SERIAL, {0x0403, 0x6010, INTERFACE_A, 0x08, 0x0B, 0x08, 0x0B}}}, diff --git a/src/ftdipp_mpsse.cpp b/src/ftdipp_mpsse.cpp index c5bdb54..be95848 100644 --- a/src/ftdipp_mpsse.cpp +++ b/src/ftdipp_mpsse.cpp @@ -186,7 +186,7 @@ int FTDIpp_MPSSE::init(unsigned char latency, unsigned char bitmask_mode, buf_cmd[1] = _cable.bit_low_val; // 0xe8; buf_cmd[2] = _cable.bit_low_dir; // 0xeb; - if (_cable.force_high_bits || (_ftdi->type != TYPE_4232H && _ftdi->type != TYPE_232H)) { + if (_ftdi->type != TYPE_4232H) { buf_cmd[4] = _cable.bit_high_val; // 0x00; buf_cmd[5] = _cable.bit_high_dir; // 0x60; to_wr = 6; diff --git a/src/ftdipp_mpsse.hpp b/src/ftdipp_mpsse.hpp index e26bbd7..532dce4 100644 --- a/src/ftdipp_mpsse.hpp +++ b/src/ftdipp_mpsse.hpp @@ -13,7 +13,6 @@ class FTDIpp_MPSSE { int bit_low_dir; int bit_high_val; int bit_high_dir; - int force_high_bits; } mpsse_bit_config; FTDIpp_MPSSE(const mpsse_bit_config &cable, const std::string &dev,