diff options
| author | gatecat <gatecat@ds0.me> | 2021-03-15 17:00:52 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-15 17:00:52 +0000 |
| commit | a8e35062c6a1a21838346dd7536bb2fcc7f820ed (patch) | |
| tree | c5466a8ed8f9108410561eb8d9d9ff5e2810d297 /ice40 | |
| parent | 3cf4a336665e07f8d210aa9d3336f3d5b0e82ea7 (diff) | |
| parent | fe4608386eb163c70a75ed84beb07516af378b36 (diff) | |
| download | nextpnr-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 'ice40')
| -rw-r--r-- | ice40/arch.h | 16 | ||||
| -rw-r--r-- | ice40/archdefs.h | 12 |
2 files changed, 20 insertions, 8 deletions
diff --git a/ice40/arch.h b/ice40/arch.h index 4bac3d7a..29396f49 100644 --- a/ice40/arch.h +++ b/ice40/arch.h @@ -17,16 +17,20 @@ * */ -#ifndef NEXTPNR_H -#error Include "arch.h" via "nextpnr.h" only. -#endif +#ifndef ICE40_ARCH_H +#define ICE40_ARCH_H + +#include <cstdint> + +#include "base_arch.h" +#include "nextpnr_namespaces.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 { int32_t port; int32_t type; @@ -866,3 +870,5 @@ struct Arch : BaseArch<ArchRanges> void ice40DelayFuzzerMain(Context *ctx); NEXTPNR_NAMESPACE_END + +#endif /* ICE40_ARCH_H */ diff --git a/ice40/archdefs.h b/ice40/archdefs.h index 5caa420a..038a3131 100644 --- a/ice40/archdefs.h +++ b/ice40/archdefs.h @@ -17,9 +17,13 @@ * */ -#ifndef NEXTPNR_H -#error Include "archdefs.h" via "nextpnr.h" only. -#endif +#ifndef ICE40_ARCHDEFS_H +#define ICE40_ARCHDEFS_H + +#include <boost/functional/hash.hpp> + +#include "idstring.h" +#include "nextpnr_namespaces.h" NEXTPNR_NAMESPACE_BEGIN @@ -196,3 +200,5 @@ template <> struct hash<NEXTPNR_NAMESPACE_PREFIX DecalId> }; } // namespace std + +#endif /* ICE40_ARCHDEFS_H */ |