Split "arch.h" in "arch.h" and "archdefs.h"

Signed-off-by: Clifford Wolf <clifford@clifford.at>

2 files changed, 53 insertions, 45 deletions

diff --git a/dummy/arch.h b/dummy/arch.h
index f1fbcec8..59e143e6 100644
--- a/dummy/arch.h
+++ b/dummy/arch.h
@@ -21,49 +21,6 @@
 #error Include "arch.h" via "nextpnr.h" only.
 #endif
 
-#ifdef NEXTPNR_ARCH_TOP
-
-NEXTPNR_NAMESPACE_BEGIN
-
-typedef float delay_t;
-
-struct DelayInfo
-{
-    delay_t delay = 0;
-
-    delay_t raiseDelay() const { return delay; }
-
-    delay_t fallDelay() const { return delay; }
-
-    delay_t avgDelay() const { return delay; }
-
-    DelayInfo operator+(const DelayInfo &other) const
-    {
-        DelayInfo ret;
-        ret.delay = this->delay + other.delay;
-        return ret;
-    }
-};
-
-typedef IdString BelType;
-typedef IdString PortPin;
-
-typedef IdString BelId;
-typedef IdString WireId;
-typedef IdString PipId;
-
-struct BelPin
-{
-    BelId bel;
-    PortPin pin;
-};
-
-NEXTPNR_NAMESPACE_END
-
-#endif // NEXTPNR_ARCH_TOP
-
-#ifdef NEXTPNR_ARCH_BOTTOM
-
 NEXTPNR_NAMESPACE_BEGIN
 
 struct ArchArgs
@@ -156,5 +113,3 @@ struct Arch : BaseCtx
 };
 
 NEXTPNR_NAMESPACE_END
-
-#endif // NEXTPNR_ARCH_BOTTOM
diff --git a/dummy/archdefs.h b/dummy/archdefs.h
new file mode 100644
index 00000000..9e8462e0
--- /dev/null
+++ b/dummy/archdefs.h
@@ -0,0 +1,53 @@
+/*
+ *  nextpnr -- Next Generation Place and Route
+ *
+ *  Copyright (C) 2018  Clifford Wolf <clifford@symbioticeda.com>
+ *
+ *  Permission to use, copy, modify, and/or distribute this software for any
+ *  purpose with or without fee is hereby granted, provided that the above
+ *  copyright notice and this permission notice appear in all copies.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ *  WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ *  MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ *  ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ *  WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ *  ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ *  OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ */
+
+#ifndef NEXTPNR_H
+#error Include "archdefs.h" via "nextpnr.h" only.
+#endif
+
+NEXTPNR_NAMESPACE_BEGIN
+
+typedef float delay_t;
+
+struct DelayInfo
+{
+    delay_t delay = 0;
+
+    delay_t raiseDelay() const { return delay; }
+
+    delay_t fallDelay() const { return delay; }
+
+    delay_t avgDelay() const { return delay; }
+
+    DelayInfo operator+(const DelayInfo &other) const
+    {
+        DelayInfo ret;
+        ret.delay = this->delay + other.delay;
+        return ret;
+    }
+};
+
+typedef IdString BelType;
+typedef IdString PortPin;
+
+typedef IdString BelId;
+typedef IdString WireId;
+typedef IdString PipId;
+
+NEXTPNR_NAMESPACE_END