diff options
| author | Clifford Wolf <clifford@clifford.at> | 2018-02-09 13:52:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-09 13:52:31 +0100 |
| commit | be0b3489fb94be62a56c61c2df623f0d693567c4 (patch) | |
| tree | 19137cb69878febf1ac0a360a0f133015cc4c587 | |
| parent | a7a6f3695f03173e2bae0b206b785597f0342ef0 (diff) | |
| parent | 9ac405f98fe14f6d2f05774ad4d62b873ec20504 (diff) | |
| download | icestorm-be0b3489fb94be62a56c61c2df623f0d693567c4.tar.gz icestorm-be0b3489fb94be62a56c61c2df623f0d693567c4.tar.bz2 icestorm-be0b3489fb94be62a56c61c2df623f0d693567c4.zip | |
Merge pull request #122 from daveshah1/iceprog-up2
Add out-of-the-box FT232H support (for Upduino 2, etc)
| -rw-r--r-- | iceprog/iceprog.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/iceprog/iceprog.c b/iceprog/iceprog.c index 4a634c5..ce1faba 100644 --- a/iceprog/iceprog.c +++ b/iceprog/iceprog.c @@ -288,7 +288,7 @@ static void help(const char *progname) fprintf(stderr, " %s -t\n", progname); fprintf(stderr, "\n"); fprintf(stderr, "General options:\n"); - fprintf(stderr, " -d <device string> use the specified USB device [default: i:0x0403:0x6010]\n"); + fprintf(stderr, " -d <device string> use the specified USB device [default: i:0x0403:0x6010 or i:0x0403:0x6014]\n"); fprintf(stderr, " d:<devicenode> (e.g. d:002/005)\n"); fprintf(stderr, " i:<vendor>:<product> (e.g. i:0x0403:0x6010)\n"); fprintf(stderr, " i:<vendor>:<product>:<index> (e.g. i:0x0403:0x6010:0)\n"); @@ -610,8 +610,8 @@ int main(int argc, char **argv) error(2); } } else { - if (ftdi_usb_open(&ftdic, 0x0403, 0x6010)) { - fprintf(stderr, "Can't find iCE FTDI USB device (vendor_id 0x0403, device_id 0x6010).\n"); + if (ftdi_usb_open(&ftdic, 0x0403, 0x6010) && ftdi_usb_open(&ftdic, 0x0403, 0x6014)) { + fprintf(stderr, "Can't find iCE FTDI USB device (vendor_id 0x0403, device_id 0x6010 or 0x6014).\n"); error(2); } } |