7 files changed, 47 insertions, 47 deletions
diff --git a/rtl/gfx/gfx_axib.sv b/rtl/if_common/if_axib.sv
index 7b3cbdc..6db8518 100644
--- a/rtl/gfx/gfx_axib.sv
+++ b/rtl/if_common/if_axib.sv
@@ -1,32 +1,31 @@
 // AXI4 con burst
-interface gfx_axib;
+interface if_axib
+#(int WIDTH = 32);
 
-	import gfx::word;
+	logic              awvalid,
+	                   awready;
+	logic[7:0]         awlen;
+	logic[1:0]         awburst;
+	logic[WIDTH - 1:0] awaddr;
 
-	logic      awvalid,
-	           awready;
-	logic[7:0] awlen;
-	logic[1:0] awburst;
-	word       awaddr;
-
-	logic wlast;
-	logic wvalid;
-	logic wready;
-	word  wdata;
+	logic              wlast;
+	logic              wvalid;
+	logic              wready;
+	logic[WIDTH - 1:0] wdata;
 
 	logic bvalid;
 	logic bready;
 
-	logic      arvalid,
-	           arready;
-	logic[7:0] arlen;
-	logic[1:0] arburst;
-	word       araddr;
+	logic              arvalid,
+	                   arready;
+	logic[7:0]         arlen;
+	logic[1:0]         arburst;
+	logic[WIDTH - 1:0] araddr;
 
-	logic rlast;
-	logic rvalid;
-	logic rready;
-	word  rdata;
+	logic              rlast;
+	logic              rvalid;
+	logic              rready;
+	logic[WIDTH - 1:0] rdata;
 
 	modport m
 	(
diff --git a/rtl/gfx/gfx_axil.sv b/rtl/if_common/if_axil.sv
index c254e26..cf67e3f 100644
--- a/rtl/gfx/gfx_axil.sv
+++ b/rtl/if_common/if_axil.sv
@@ -1,25 +1,25 @@
 // AXI4-Lite, sin wstrb ni axprot
-interface gfx_axil;
-	import gfx::*;
+interface if_axil
+#(int WIDTH = 32);
 
-	logic awvalid;
-	logic awready;
-	word  awaddr;
+	logic              awvalid;
+	logic              awready;
+	logic[WIDTH - 1:0] awaddr;
 
-	logic wvalid;
-	logic wready;
-	word  wdata;
+	logic              wvalid;
+	logic              wready;
+	logic[WIDTH - 1:0] wdata;
 
 	logic bvalid;
 	logic bready;
 
-	logic arvalid;
-	logic arready;
-	word  araddr;
+	logic              arvalid;
+	logic              arready;
+	logic[WIDTH - 1:0] araddr;
 
-	logic rvalid;
-	logic rready;
-	word  rdata;
+	logic              rvalid;
+	logic              rready;
+	logic[WIDTH - 1:0] rdata;
 
 	modport m
 	(
diff --git a/rtl/gfx/gfx_axil2regblock.sv b/rtl/if_common/if_axil2regblock.sv
index 2449b05..d3c20d9 100644
--- a/rtl/gfx/gfx_axil2regblock.sv
+++ b/rtl/if_common/if_axil2regblock.sv
@@ -1,6 +1,6 @@
-module gfx_axil2regblock
+module if_axil2regblock
 (
-	gfx_axil.s           axis,
+	if_axil.s            axis,
 	axi4lite_intf.master axim
 );
 
diff --git a/rtl/gfx/gfx_beats.sv b/rtl/if_common/if_beats.sv
index fcbb091..f9e58e9 100644
--- a/rtl/gfx/gfx_beats.sv
+++ b/rtl/if_common/if_beats.sv
@@ -1,5 +1,5 @@
-interface gfx_beats
-#(int WIDTH = $bits(gfx::word));
+interface if_beats
+#(int WIDTH = 32);
 
 	logic[WIDTH - 1:0] data;
 	logic              ready;
diff --git a/rtl/gfx/gfx_pkts.sv b/rtl/if_common/if_pkts.sv
index 41399ce..b6e5b0b 100644
--- a/rtl/gfx/gfx_pkts.sv
+++ b/rtl/if_common/if_pkts.sv
@@ -1,11 +1,9 @@
-interface gfx_pkts
-#(parameter int WIDTH = $bits(gfx::word));
+interface if_pkts
+#(int WIDTH = 32);
 
-	import gfx::*;
-
-	logic tlast;
-	logic tready;
-	logic tvalid;
+	logic              tlast;
+	logic              tready;
+	logic              tvalid;
 	logic[WIDTH - 1:0] tdata;
 
 	modport tx
diff --git a/rtl/gfx/gfx_shake.sv b/rtl/if_common/if_shake.sv
index baae0c3..8ec5a73 100644
--- a/rtl/gfx/gfx_shake.sv
+++ b/rtl/if_common/if_shake.sv
@@ -1,4 +1,4 @@
-interface gfx_shake;
+interface if_shake;
 
 	logic ready;
 	logic valid;
diff --git a/rtl/if_common/mod.mk b/rtl/if_common/mod.mk
new file mode 100644
index 0000000..e60abc4
--- /dev/null
+++ b/rtl/if_common/mod.mk
@@ -0,0 +1,3 @@
+define core
+  $(this)/rtl_dirs := .
+endef