From 956ecd48f71417b514c194a833a49238049e00b0 Mon Sep 17 00:00:00 2001
From: Eddie Hung <eddie@fpgeh.com>
Date: Thu, 2 Apr 2020 09:51:32 -0700
Subject: kernel: big fat patch to use more ID::*, otherwise ID(*)

---
 passes/techmap/muxcover.cc | 66 +++++++++++++++++++++++-----------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

(limited to 'passes/techmap/muxcover.cc')

diff --git a/passes/techmap/muxcover.cc b/passes/techmap/muxcover.cc
index 5541b6122..bd049d86d 100644
--- a/passes/techmap/muxcover.cc
+++ b/passes/techmap/muxcover.cc
@@ -116,7 +116,7 @@ struct MuxcoverWorker
 				if (!cell->input(conn.first))
 					continue;
 				for (auto bit : sigmap(conn.second)) {
-					if (used_once.count(bit) || cell->type != ID($_MUX_) || conn.first == ID(S))
+					if (used_once.count(bit) || cell->type != ID($_MUX_) || conn.first == ID::S)
 						roots.insert(bit);
 					used_once.insert(bit);
 				}
@@ -519,7 +519,7 @@ struct MuxcoverWorker
 			Cell *cell = module->addCell(NEW_ID, ID($_MUX_));
 			cell->setPort(ID::A, mux.inputs[0]);
 			cell->setPort(ID::B, mux.inputs[1]);
-			cell->setPort(ID(S), mux.selects[0]);
+			cell->setPort(ID::S, mux.selects[0]);
 			cell->setPort(ID::Y, bit);
 			return;
 		}
@@ -529,10 +529,10 @@ struct MuxcoverWorker
 			Cell *cell = module->addCell(NEW_ID, ID($_MUX4_));
 			cell->setPort(ID::A, mux.inputs[0]);
 			cell->setPort(ID::B, mux.inputs[1]);
-			cell->setPort(ID(C), mux.inputs[2]);
-			cell->setPort(ID(D), mux.inputs[3]);
-			cell->setPort(ID(S), mux.selects[0]);
-			cell->setPort(ID(T), mux.selects[1]);
+			cell->setPort(ID::C, mux.inputs[2]);
+			cell->setPort(ID::D, mux.inputs[3]);
+			cell->setPort(ID::S, mux.selects[0]);
+			cell->setPort(ID::T, mux.selects[1]);
 			cell->setPort(ID::Y, bit);
 			return;
 		}
@@ -542,15 +542,15 @@ struct MuxcoverWorker
 			Cell *cell = module->addCell(NEW_ID, ID($_MUX8_));
 			cell->setPort(ID::A, mux.inputs[0]);
 			cell->setPort(ID::B, mux.inputs[1]);
-			cell->setPort(ID(C), mux.inputs[2]);
-			cell->setPort(ID(D), mux.inputs[3]);
-			cell->setPort(ID(E), mux.inputs[4]);
-			cell->setPort(ID(F), mux.inputs[5]);
-			cell->setPort(ID(G), mux.inputs[6]);
-			cell->setPort(ID(H), mux.inputs[7]);
-			cell->setPort(ID(S), mux.selects[0]);
-			cell->setPort(ID(T), mux.selects[1]);
-			cell->setPort(ID(U), mux.selects[2]);
+			cell->setPort(ID::C, mux.inputs[2]);
+			cell->setPort(ID::D, mux.inputs[3]);
+			cell->setPort(ID::E, mux.inputs[4]);
+			cell->setPort(ID::F, mux.inputs[5]);
+			cell->setPort(ID::G, mux.inputs[6]);
+			cell->setPort(ID::H, mux.inputs[7]);
+			cell->setPort(ID::S, mux.selects[0]);
+			cell->setPort(ID::T, mux.selects[1]);
+			cell->setPort(ID::U, mux.selects[2]);
 			cell->setPort(ID::Y, bit);
 			return;
 		}
@@ -560,24 +560,24 @@ struct MuxcoverWorker
 			Cell *cell = module->addCell(NEW_ID, ID($_MUX16_));
 			cell->setPort(ID::A, mux.inputs[0]);
 			cell->setPort(ID::B, mux.inputs[1]);
-			cell->setPort(ID(C), mux.inputs[2]);
-			cell->setPort(ID(D), mux.inputs[3]);
-			cell->setPort(ID(E), mux.inputs[4]);
-			cell->setPort(ID(F), mux.inputs[5]);
-			cell->setPort(ID(G), mux.inputs[6]);
-			cell->setPort(ID(H), mux.inputs[7]);
-			cell->setPort(ID(I), mux.inputs[8]);
-			cell->setPort(ID(J), mux.inputs[9]);
-			cell->setPort(ID(K), mux.inputs[10]);
-			cell->setPort(ID(L), mux.inputs[11]);
-			cell->setPort(ID(M), mux.inputs[12]);
-			cell->setPort(ID(N), mux.inputs[13]);
-			cell->setPort(ID(O), mux.inputs[14]);
-			cell->setPort(ID(P), mux.inputs[15]);
-			cell->setPort(ID(S), mux.selects[0]);
-			cell->setPort(ID(T), mux.selects[1]);
-			cell->setPort(ID(U), mux.selects[2]);
-			cell->setPort(ID(V), mux.selects[3]);
+			cell->setPort(ID::C, mux.inputs[2]);
+			cell->setPort(ID::D, mux.inputs[3]);
+			cell->setPort(ID::E, mux.inputs[4]);
+			cell->setPort(ID::F, mux.inputs[5]);
+			cell->setPort(ID::G, mux.inputs[6]);
+			cell->setPort(ID::H, mux.inputs[7]);
+			cell->setPort(ID::I, mux.inputs[8]);
+			cell->setPort(ID::J, mux.inputs[9]);
+			cell->setPort(ID::K, mux.inputs[10]);
+			cell->setPort(ID::L, mux.inputs[11]);
+			cell->setPort(ID::M, mux.inputs[12]);
+			cell->setPort(ID::N, mux.inputs[13]);
+			cell->setPort(ID::O, mux.inputs[14]);
+			cell->setPort(ID::P, mux.inputs[15]);
+			cell->setPort(ID::S, mux.selects[0]);
+			cell->setPort(ID::T, mux.selects[1]);
+			cell->setPort(ID::U, mux.selects[2]);
+			cell->setPort(ID::V, mux.selects[3]);
 			cell->setPort(ID::Y, bit);
 			return;
 		}
-- 
cgit v1.2.3