aboutsummaryrefslogtreecommitdiffstats
path: root/fpga_interchange/archdefs.h
diff options
context:
space:
mode:
authorKeith Rothman <537074+litghost@users.noreply.github.com>2021-03-12 13:09:44 -0800
committerKeith Rothman <537074+litghost@users.noreply.github.com>2021-03-15 09:05:23 -0700
commitfe4608386eb163c70a75ed84beb07516af378b36 (patch)
tree05f1371ad44da5a69617f43cf68005cf271be5e1 /fpga_interchange/archdefs.h
parent035b797ec230aa3d686d9013e0e15d79cd2982c3 (diff)
downloadnextpnr-fe4608386eb163c70a75ed84beb07516af378b36.tar.gz
nextpnr-fe4608386eb163c70a75ed84beb07516af378b36.tar.bz2
nextpnr-fe4608386eb163c70a75ed84beb07516af378b36.zip
Split nextpnr.h to allow for linear inclusion.
"nextpnr.h" is no longer the god header. Important improvements: - Functions in log.h can be used without including BaseCtx/Arch/Context. This means that log_X functions can be called without included "nextpnr.h" - NPNR_ASSERT can be used without including "nextpnr.h" by including "nextpnr_assertions.h". This allows NPNR_ASSERT to be used safely in any header file. - Types defined in "archdefs.h" are now available without including BaseCtx/Arch/Context. This means that utility classes that will be used inside of BaseCtx/Arch/Context can be defined safely in a self-contained header. Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
Diffstat (limited to 'fpga_interchange/archdefs.h')
-rw-r--r--fpga_interchange/archdefs.h13
1 files changed, 8 insertions, 5 deletions
diff --git a/fpga_interchange/archdefs.h b/fpga_interchange/archdefs.h
index e355a6c4..c9c0bc4f 100644
--- a/fpga_interchange/archdefs.h
+++ b/fpga_interchange/archdefs.h
@@ -18,16 +18,17 @@
*
*/
-#ifndef NEXTPNR_H
-#error Include "archdefs.h" via "nextpnr.h" only.
-#endif
+#ifndef FPGA_INTERCHANGE_ARCHDEFS_H
+#define FPGA_INTERCHANGE_ARCHDEFS_H
+
+#include <boost/functional/hash.hpp>
+#include <cstdint>
#include "luts.h"
+#include "nextpnr_namespaces.h"
NEXTPNR_NAMESPACE_BEGIN
-#include <cstdint>
-
typedef int delay_t;
// -----------------------------------------------------------------------
@@ -177,3 +178,5 @@ template <> struct hash<NEXTPNR_NAMESPACE_PREFIX BelBucketId>
};
} // namespace std
+
+#endif /* FPGA_INTERCHANGE_ARCHDEFS_H */