From 11db5a2f1df589ea8c5ba3c0b1cbbfaac77e3580 Mon Sep 17 00:00:00 2001
From: gatecat <gatecat@ds0.me>
Date: Tue, 9 Feb 2021 10:39:14 +0000
Subject: Add BaseArchRanges for default ArchRanges types

Signed-off-by: gatecat <gatecat@ds0.me>
---
 ice40/arch.h | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

(limited to 'ice40/arch.h')

diff --git a/ice40/arch.h b/ice40/arch.h
index 85182a60..5df072f9 100644
--- a/ice40/arch.h
+++ b/ice40/arch.h
@@ -374,35 +374,20 @@ struct ArchArgs
     std::string package;
 };
 
-struct ArchRanges
+struct ArchRanges : BaseArchRanges
 {
     using ArchArgsT = ArchArgs;
     // Bels
     using AllBelsRangeT = BelRange;
     using TileBelsRangeT = BelRange;
-    using BelAttrsRangeT = std::vector<std::pair<IdString, std::string>>;
     using BelPinsRangeT = std::vector<IdString>;
     // Wires
     using AllWiresRangeT = WireRange;
     using DownhillPipRangeT = PipRange;
     using UphillPipRangeT = PipRange;
     using WireBelPinRangeT = BelPinRange;
-    using WireAttrsRangeT = std::vector<std::pair<IdString, std::string>>;
     // Pips
     using AllPipsRangeT = AllPipRange;
-    using PipAttrsRangeT = std::vector<std::pair<IdString, std::string>>;
-    // Groups
-    using AllGroupsRangeT = std::vector<GroupId>;
-    using GroupBelsRangeT = std::vector<BelId>;
-    using GroupWiresRangeT = std::vector<WireId>;
-    using GroupPipsRangeT = std::vector<PipId>;
-    using GroupGroupsRangeT = std::vector<GroupId>;
-    // Decals
-    using DecalGfxRangeT = std::vector<GraphicElement>;
-    // Placement validity
-    using CellTypeRangeT = const std::vector<IdString> &;
-    using BelBucketRangeT = const std::vector<BelBucketId> &;
-    using BucketBelRangeT = const std::vector<BelId> &;
 };
 
 struct Arch : BaseArch<ArchRanges>
-- 
cgit v1.2.3