update files to correct FSF address

[openocd.git] / src / jtag / drivers / ftdi.c

diff --git a/src/jtag/drivers/ftdi.c b/src/jtag/drivers/ftdi.c
index a8d396c0825e46aa80032a0dedea817ae009ff30..20969c04827462ac72d68b040b5ae145d142a285 100644 (file)
--- a/src/jtag/drivers/ftdi.c
+++ b/src/jtag/drivers/ftdi.c
@@ -15,7 +15,7 @@
 *   You should have received a copy of the GNU General Public License     *
 *   along with this program; if not, write to the                         *
 *   Free Software Foundation, Inc.,                                       *
-*   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+*   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
 ***************************************************************************/
 
 /**
@@ -175,7 +175,7 @@ static int ftdi_set_signal(const struct signal *s, char value)
 
        output = data ? output | s->data_mask : output & ~s->data_mask;
        if (s->oe_mask == s->data_mask)
-               direction = oe ? output | s->oe_mask : output & ~s->oe_mask;
+               direction = oe ? direction | s->oe_mask : direction & ~s->oe_mask;
        else
                output = oe ? output | s->oe_mask : output & ~s->oe_mask;
 
@@ -643,7 +643,7 @@ static int ftdi_initialize(void)
        if (retval == ERROR_OK)
                retval = mpsse_set_data_bits_high_byte(mpsse_ctx, output >> 8, direction >> 8);
        if (retval != ERROR_OK) {
-               LOG_ERROR("couldn't initialize FTDI with 'JTAGkey' layout");
+               LOG_ERROR("couldn't initialize FTDI with configured layout");
                return ERROR_JTAG_INIT_FAILED;
        }