aboutsummaryrefslogtreecommitdiffstats
path: root/ecp5/arch.h
diff options
context:
space:
mode:
authorgatecat <gatecat@ds0.me>2021-03-15 17:00:52 +0000
committerGitHub <noreply@github.com>2021-03-15 17:00:52 +0000
commita8e35062c6a1a21838346dd7536bb2fcc7f820ed (patch)
treec5466a8ed8f9108410561eb8d9d9ff5e2810d297 /ecp5/arch.h
parent3cf4a336665e07f8d210aa9d3336f3d5b0e82ea7 (diff)
parentfe4608386eb163c70a75ed84beb07516af378b36 (diff)
downloadnextpnr-a8e35062c6a1a21838346dd7536bb2fcc7f820ed.tar.gz
nextpnr-a8e35062c6a1a21838346dd7536bb2fcc7f820ed.tar.bz2
nextpnr-a8e35062c6a1a21838346dd7536bb2fcc7f820ed.zip
Merge pull request #621 from litghost/fix_header_nightmare
Split nextpnr.h to allow for linear inclusion.
Diffstat (limited to 'ecp5/arch.h')
-rw-r--r--ecp5/arch.h13
1 files changed, 8 insertions, 5 deletions
diff --git a/ecp5/arch.h b/ecp5/arch.h
index f1da870a..063a3df6 100644
--- a/ecp5/arch.h
+++ b/ecp5/arch.h
@@ -18,19 +18,20 @@
*
*/
-#ifndef NEXTPNR_H
-#error Include "arch.h" via "nextpnr.h" only.
-#endif
+#ifndef ECP5_ARCH_H
+#define ECP5_ARCH_H
#include <set>
#include <sstream>
+#include "base_arch.h"
+#include "nextpnr_types.h"
+#include "relptr.h"
+
NEXTPNR_NAMESPACE_BEGIN
/**** Everything in this section must be kept in sync with chipdb.py ****/
-#include "relptr.h"
-
NPNR_PACKED_STRUCT(struct BelWirePOD {
LocationPOD rel_wire_loc;
int32_t wire_index;
@@ -928,3 +929,5 @@ struct Arch : BaseArch<ArchRanges>
};
NEXTPNR_NAMESPACE_END
+
+#endif /* ECP5_ARCH_H */