diff options
| -rw-r--r-- | iceprog/iceprog.c | 6 | ||||
| -rw-r--r-- | icetime/icetime.cc | 2 |
2 files changed, 4 insertions, 4 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); } } diff --git a/icetime/icetime.cc b/icetime/icetime.cc index 2614539..cdec43e 100644 --- a/icetime/icetime.cc +++ b/icetime/icetime.cc @@ -1564,7 +1564,7 @@ void make_seg_cell(int net, const net_segment_t &seg) if (sscanf(seg.name.c_str(), "lutff_%d/in_%d", &a, &b) == 2) { //"logic" wires at the side of the device are actually IP or DSP - if(device_type == "up5k" && ((seg.x == 0) || (seg.x == config_tile_type.size() - 1))) { + if(device_type == "up5k" && ((seg.x == 0) || (seg.x == int(config_tile_type.size()) - 1))) { std::string primnet; auto cell = make_dsp_ip(seg.x, seg.y, seg.name, primnet); netlist_cell_ports[cell][primnet] = net_name(net); |