From ddfc535df766a8d6091e6c043b74bb6a40c8d2b7 Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Tue, 17 Jul 2018 20:04:49 +0200
Subject: [PATCH] Add ArchNetInfo and ArchCellInfo

Signed-off-by: Clifford Wolf <clifford@clifford.at>
---
 common/nextpnr.h   | 4 ++--
 ecp5/archdefs.h    | 3 +++
 generic/archdefs.h | 3 +++
 ice40/archdefs.h   | 4 +++-
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/common/nextpnr.h b/common/nextpnr.h
index 50465869..3d0cc955 100644
--- a/common/nextpnr.h
+++ b/common/nextpnr.h
@@ -200,7 +200,7 @@ struct PipMap
     PlaceStrength strength = STRENGTH_NONE;
 };
 
-struct NetInfo
+struct NetInfo : ArchNetInfo
 {
     IdString name;
     PortRef driver;
@@ -225,7 +225,7 @@ struct PortInfo
     PortType type;
 };
 
-struct CellInfo
+struct CellInfo : ArchCellInfo
 {
     IdString name, type;
     std::unordered_map<IdString, PortInfo> ports;
diff --git a/ecp5/archdefs.h b/ecp5/archdefs.h
index 84a431fd..df1add44 100644
--- a/ecp5/archdefs.h
+++ b/ecp5/archdefs.h
@@ -129,6 +129,9 @@ struct DecalId
     }
 };
 
+struct ArchNetInfo { };
+struct ArchCellInfo { };
+
 NEXTPNR_NAMESPACE_END
 
 namespace std {
diff --git a/generic/archdefs.h b/generic/archdefs.h
index 9969014b..f5999776 100644
--- a/generic/archdefs.h
+++ b/generic/archdefs.h
@@ -52,4 +52,7 @@ typedef IdString PipId;
 typedef IdString GroupId;
 typedef IdString DecalId;
 
+struct ArchNetInfo { };
+struct ArchCellInfo { };
+
 NEXTPNR_NAMESPACE_END
diff --git a/ice40/archdefs.h b/ice40/archdefs.h
index 75df678a..ce7d3f52 100644
--- a/ice40/archdefs.h
+++ b/ice40/archdefs.h
@@ -150,6 +150,9 @@ struct DecalId
     bool operator!=(const DecalId &other) const { return (type != other.type) || (index != other.index); }
 };
 
+struct ArchNetInfo { };
+struct ArchCellInfo { };
+
 NEXTPNR_NAMESPACE_END
 
 namespace std {
@@ -201,5 +204,4 @@ template <> struct hash<NEXTPNR_NAMESPACE_PREFIX DecalId>
         return seed;
     }
 };
-
 } // namespace std