diff options
| author | drath <drath@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2006-10-19 10:07:24 +0000 |
|---|---|---|
| committer | drath <drath@b42882b7-edfa-0310-969c-e2dbd0fdcd60> | 2006-10-19 10:07:24 +0000 |
| commit | e8ead33804f1aede5157a5afc1bc249038799e6b (patch) | |
| tree | b8f9e1c72e03933bc6984a0d2ffe1a880e57834a /src/jtag | |
| parent | 81294537cd61b0f0fb2c0ae93e4367c049bf497f (diff) | |
| download | openocd_libswd-e8ead33804f1aede5157a5afc1bc249038799e6b.tar.gz openocd_libswd-e8ead33804f1aede5157a5afc1bc249038799e6b.tar.bz2 openocd_libswd-e8ead33804f1aede5157a5afc1bc249038799e6b.tar.xz openocd_libswd-e8ead33804f1aede5157a5afc1bc249038799e6b.zip | |
- fixed endianness handling in arm7_9_read_core_reg (thanks to Magnus Lundin for reporting this)
- correctly handle ft2232_device_desc and ft2232_serial when both are given at the same time
git-svn-id: svn://svn.berlios.de/openocd/trunk@104 b42882b7-edfa-0310-969c-e2dbd0fdcd60
Diffstat (limited to 'src/jtag')
| -rw-r--r-- | src/jtag/ft2232.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/jtag/ft2232.c b/src/jtag/ft2232.c index e9fce54b..06b419a0 100644 --- a/src/jtag/ft2232.c +++ b/src/jtag/ft2232.c @@ -994,7 +994,8 @@ int ft2232_init(void) WARNING("can't open by device description and serial number, giving precedence to serial"); ft2232_device_desc = NULL; } - else if (ft2232_device_desc) + + if (ft2232_device_desc) { openex_string = ft2232_device_desc; openex_flags = FT_OPEN_BY_DESCRIPTION; |