From fe4608386eb163c70a75ed84beb07516af378b36 Mon Sep 17 00:00:00 2001 From: Keith Rothman <537074+litghost@users.noreply.github.com> Date: Fri, 12 Mar 2021 13:09:44 -0800 Subject: 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> --- ecp5/arch.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'ecp5/arch.h') 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 #include +#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 }; NEXTPNR_NAMESPACE_END + +#endif /* ECP5_ARCH_H */ -- cgit v1.2.3