caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ice40: Remove obsolete belType member

Browse Source 
Signed-off-by: David Shah <davey1576@gmail.com>
This commit is contained in:
David Shah 2018-09-24 14:27:50 +01:00
parent e7fe046e57
commit 9834b68041
3 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ice40/arch.cc
View File

@ -959,7 +959,6 @@ void Arch::assignArchInfo()
void Arch::assignCellInfo(CellInfo *cell) void Arch::assignCellInfo(CellInfo *cell)
{ {
cell->belType = cell->type;
if (cell->type == id_ICESTORM_LC) { if (cell->type == id_ICESTORM_LC) {
cell->lcInfo.dffEnable = bool_or_default(cell->params, id_DFF_ENABLE); cell->lcInfo.dffEnable = bool_or_default(cell->params, id_DFF_ENABLE);
cell->lcInfo.carryEnable = bool_or_default(cell->params, id_CARRY_ENABLE); cell->lcInfo.carryEnable = bool_or_default(cell->params, id_CARRY_ENABLE);

2
ice40/arch_place.cc
View File

@ -34,7 +34,7 @@ bool Arch::logicCellsCompatible(const CellInfo** it, const size_t size) const
int locals_count = 0; int locals_count = 0;
for (auto cell : boost::make_iterator_range(it, it+size)) { for (auto cell : boost::make_iterator_range(it, it+size)) {
NPNR_ASSERT(cell->belType == id_ICESTORM_LC); NPNR_ASSERT(cell->type == id_ICESTORM_LC);
if (cell->lcInfo.dffEnable) { if (cell->lcInfo.dffEnable) {
if (!dffs_exist) { if (!dffs_exist) {
dffs_exist = true; dffs_exist = true;

1
ice40/archdefs.h
View File

@ -134,7 +134,6 @@ struct NetInfo;
struct ArchCellInfo struct ArchCellInfo
{ {
IdString belType;
union union
{ {
struct struct