diff --git a/main.cpp b/main.cpp index 9eab1f8..921df7e 100644 --- a/main.cpp +++ b/main.cpp @@ -118,13 +118,13 @@ int main(int argc, char **argv) cerr << "Error: device " << hex << idcode << " not supported" << endl; return 1; } else if (args.verbose) { - printf("idcode 0x%x\nfunder %s\nmodel %s\nfamily %s\n", + printf("idcode 0x%x\nmanufacturer %s\nmodel %s\nfamily %s\n", idcode, - fpga_list[idcode].funder.c_str(), + fpga_list[idcode].manufacturer.c_str(), fpga_list[idcode].model.c_str(), fpga_list[idcode].family.c_str()); } - string fab = fpga_list[idcode].funder; + string fab = fpga_list[idcode].manufacturer; Device *fpga; if (fab == "xilinx") { diff --git a/part.hpp b/part.hpp index 293b57c..4d749b9 100644 --- a/part.hpp +++ b/part.hpp @@ -5,16 +5,16 @@ #include typedef struct { - std::string funder; - std::string model; + std::string manufacturer; std::string family; + std::string model; } fpga_model; static std::map fpga_list = { {0x0362D093, {"xilinx", "artix a7 35t", "xc7a35"}}, {0x020f30dd, {"altera", "cyclone 10 LP", "10CL025"}}, {0x612bd043, {"lattice", "MachXO3LF", "LCMX03LF-6900C"}}, - {0x1100581b, {"Gowin", "GW1NR-9", "GW1N"}}, + {0x1100581b, {"Gowin", "GW1N", "GW1NR-9"}}, }; #endif