From 28d0313cccacff0aaa775a5b2b50edd3a852bae8 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sat, 12 Oct 2019 15:26:24 +0200 Subject: Less types needed --- ecp5/constids.inc | 24 ++++++++-------------- ecp5/trellis_import.py | 56 +++++++++++++++----------------------------------- 2 files changed, 24 insertions(+), 56 deletions(-) diff --git a/ecp5/constids.inc b/ecp5/constids.inc index f7d722c1..63ca4b26 100644 --- a/ecp5/constids.inc +++ b/ecp5/constids.inc @@ -1297,19 +1297,11 @@ X(ECSOUT) X(WIRE_TYPE_NONE) X(WIRE_TYPE_SLICE) -X(WIRE_TYPE_H00R) -X(WIRE_TYPE_H00L) -X(WIRE_TYPE_H01E) -X(WIRE_TYPE_H01W) -X(WIRE_TYPE_H02E) -X(WIRE_TYPE_H02W) -X(WIRE_TYPE_H06E) -X(WIRE_TYPE_H06W) -X(WIRE_TYPE_V00T) -X(WIRE_TYPE_V00B) -X(WIRE_TYPE_V01N) -X(WIRE_TYPE_V01S) -X(WIRE_TYPE_V02N) -X(WIRE_TYPE_V02S) -X(WIRE_TYPE_V06N) -X(WIRE_TYPE_V06S) +X(WIRE_TYPE_H00) +X(WIRE_TYPE_H01) +X(WIRE_TYPE_H02) +X(WIRE_TYPE_H06) +X(WIRE_TYPE_V00) +X(WIRE_TYPE_V01) +X(WIRE_TYPE_V02) +X(WIRE_TYPE_V06) diff --git a/ecp5/trellis_import.py b/ecp5/trellis_import.py index 2ff0d0e7..e12f8bb7 100755 --- a/ecp5/trellis_import.py +++ b/ecp5/trellis_import.py @@ -50,53 +50,29 @@ def wire_type(name): if name[0].endswith("_SLICE"): return "WIRE_TYPE_SLICE" - if name[0].startswith("H00R"): - return "WIRE_TYPE_H00R" + if name[0].startswith("H00"): + return "WIRE_TYPE_H00" - if name[0].startswith("H00L"): - return "WIRE_TYPE_H00L" + if name[0].startswith("H01"): + return "WIRE_TYPE_H01" - if name[0].startswith("H01E"): - return "WIRE_TYPE_H01E" + if name[0].startswith("H02"): + return "WIRE_TYPE_H02" - if name[0].startswith("H01W"): - return "WIRE_TYPE_H01W" + if name[0].startswith("H06"): + return "WIRE_TYPE_H06" - if name[0].startswith("H02E"): - return "WIRE_TYPE_H02E" + if name[0].startswith("V00"): + return "WIRE_TYPE_V00" - if name[0].startswith("H02W"): - return "WIRE_TYPE_H02W" + if name[0].startswith("V01"): + return "WIRE_TYPE_V01" - if name[0].startswith("H06E"): - return "WIRE_TYPE_H06E" + if name[0].startswith("V02"): + return "WIRE_TYPE_V02" - if name[0].startswith("H06W"): - return "WIRE_TYPE_H06W" - - if name[0].startswith("V00T"): - return "WIRE_TYPE_V00T" - - if name[0].startswith("V00B"): - return "WIRE_TYPE_V00B" - - if name[0].startswith("V01N"): - return "WIRE_TYPE_V01N" - - if name[0].startswith("V01S"): - return "WIRE_TYPE_V01S" - - if name[0].startswith("V02N"): - return "WIRE_TYPE_V02N" - - if name[0].startswith("V02S"): - return "WIRE_TYPE_V02S" - - if name[0].startswith("V06N"): - return "WIRE_TYPE_V06N" - - if name[0].startswith("V06S"): - return "WIRE_TYPE_V06S" + if name[0].startswith("V06"): + return "WIRE_TYPE_V06" return "WIRE_TYPE_NONE" -- cgit v1.2.3