diff --git a/lib/JBUS/ghdl/tb_busmaster_async.gtkw b/lib/JBUS/ghdl/tb_busmaster_async.gtkw
new file mode 100644
index 0000000..c8af8e6
--- /dev/null
+++ b/lib/JBUS/ghdl/tb_busmaster_async.gtkw
@@ -0,0 +1,35 @@
+[*]
+[*] GTKWave Analyzer v3.3.104 (w)1999-2020 BSI
+[*] Wed Mar 24 10:07:35 2021
+[*]
+[dumpfile] "/home/jens/work/vhdl/trunk/lib/JBUS/ghdl/build/tb_busmaster_async/tb_busmaster_async.vcd"
+[dumpfile_mtime] "Wed Mar 24 10:07:01 2021"
+[dumpfile_size] 2713167
+[savefile] "/home/jens/work/vhdl/trunk/lib/JBUS/ghdl/build/tb_busmaster_async/tb_busmaster_async.gtkw"
+[timestart] 0
+[size] 1000 600
+[pos] -1 -1
+*-34.715931 14640000000 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1
+[sst_width] 233
+[signals_width] 150
+[sst_expanded] 1
+[sst_vpaned_height] 144
+@28
+tb_busmaster_async.clk
+tb_busmaster_async.ack_i
+@22
+tb_busmaster_async.addr_o[31:0]
+tb_busmaster_async.din[31:0]
+@28
+tb_busmaster_async.din_rdy
+tb_busmaster_async.din_we
+@22
+tb_busmaster_async.dout[31:0]
+tb_busmaster_async.mdat_i[31:0]
+tb_busmaster_async.mdat_i_64[63:0]
+tb_busmaster_async.mdat_o[31:0]
+tb_busmaster_async.mdat_o_64[63:0]
+@23
+tb_busmaster_async.read_reg[31:0]
+[pattern_trace] 1
+[pattern_trace] 0
diff --git a/lib/JBUS/ghdl/tb_busmaster_async.make b/lib/JBUS/ghdl/tb_busmaster_async.make
new file mode 100644
index 0000000..c009d3b
--- /dev/null
+++ b/lib/JBUS/ghdl/tb_busmaster_async.make
@@ -0,0 +1,20 @@
+include ../../../lib/FIFO/ghdl/fifo_async.inc
+
+ROOT_PATH := ../../..
+LIB_PATH := $(ROOT_PATH)/lib
+MOD_PATH := $(LIB_PATH)/JBUS
+
+SRCS += $(LIB_PATH)/misc/utils_pkg.vhd
+SRCS += $(FIFO_ASYNC_SRCS)
+SRCS += $(MOD_PATH)/src/busmaster_types.vhd
+SRCS += $(MOD_PATH)/src/busmaster_async.vhd
+SRCS += $(MOD_PATH)/src/tb_busmaster_async.vhd
+
+# Compile
+TARGET := tb_busmaster_async
+ENTITY := tb_busmaster_async
+WITH_VCD := y
+RUN_TIME := 80us
+
+include $(ROOT_PATH)/Common/make/ghdl.mk
+
diff --git a/lib/JBUS/ghdl/tb_busmaster_sync.gtkw b/lib/JBUS/ghdl/tb_busmaster_sync.gtkw
new file mode 100644
index 0000000..98e38b5
--- /dev/null
+++ b/lib/JBUS/ghdl/tb_busmaster_sync.gtkw
@@ -0,0 +1,34 @@
+[*]
+[*] GTKWave Analyzer v3.3.104 (w)1999-2020 BSI
+[*] Wed Mar 24 10:05:02 2021
+[*]
+[dumpfile] "/home/jens/work/vhdl/trunk/lib/JBUS/ghdl/build/tb_busmaster_sync/tb_busmaster_sync.vcd"
+[dumpfile_mtime] "Wed Mar 24 10:03:31 2021"
+[dumpfile_size] 1410182
+[savefile] "/home/jens/work/vhdl/trunk/lib/JBUS/ghdl/build/tb_busmaster_sync/tb_busmaster_sync.gtkw"
+[timestart] 0
+[size] 1000 600
+[pos] -1 -1
+*-33.715931 19960000000 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1
+[sst_width] 233
+[signals_width] 298
+[sst_expanded] 1
+[sst_vpaned_height] 144
+@28
+tb_busmaster_sync.srdy_i
+tb_busmaster_sync.ack_i
+@22
+tb_busmaster_sync.addr_o[31:0]
+tb_busmaster_sync.din[31:0]
+tb_busmaster_sync.dout[31:0]
+tb_busmaster_sync.mdat_i[31:0]
+tb_busmaster_sync.mdat_i_64[63:0]
+tb_busmaster_sync.mdat_o[31:0]
+tb_busmaster_sync.mdat_o_64[63:0]
+@28
+tb_busmaster_sync.srdy_i
+tb_busmaster_sync.stb_o
+@29
+tb_busmaster_sync.we_o
+[pattern_trace] 1
+[pattern_trace] 0
diff --git a/lib/JBUS/ghdl/tb_busmaster_sync.make b/lib/JBUS/ghdl/tb_busmaster_sync.make
new file mode 100644
index 0000000..aef3ca5
--- /dev/null
+++ b/lib/JBUS/ghdl/tb_busmaster_sync.make
@@ -0,0 +1,20 @@
+include ../../../lib/FIFO/ghdl/fifo_sync.inc
+
+ROOT_PATH := ../../..
+LIB_PATH := $(ROOT_PATH)/lib
+MOD_PATH := $(LIB_PATH)/JBUS
+
+SRCS += $(LIB_PATH)/misc/utils_pkg.vhd
+SRCS += $(FIFO_SYNC_SRCS)
+SRCS += $(MOD_PATH)/src/busmaster_types.vhd
+SRCS += $(MOD_PATH)/src/busmaster_sync.vhd
+SRCS += $(MOD_PATH)/src/tb_busmaster_sync.vhd
+
+# Compile
+TARGET := tb_busmaster_sync
+ENTITY := tb_busmaster_sync
+WITH_VCD := y
+RUN_TIME := 40us
+
+include $(ROOT_PATH)/Common/make/ghdl.mk
+
diff --git a/lib/JBUS/ghdl/tb_dmac_sync.gtkw b/lib/JBUS/ghdl/tb_dmac_sync.gtkw
new file mode 100644
index 0000000..79fa783
--- /dev/null
+++ b/lib/JBUS/ghdl/tb_dmac_sync.gtkw
@@ -0,0 +1,37 @@
+[*]
+[*] GTKWave Analyzer v3.3.104 (w)1999-2020 BSI
+[*] Wed Mar 24 10:09:33 2021
+[*]
+[dumpfile] "/home/jens/work/vhdl/trunk/lib/JBUS/ghdl/build/tb_dmac_sync/tb_dmac_sync.vcd"
+[dumpfile_mtime] "Wed Mar 24 10:08:23 2021"
+[dumpfile_size] 380114
+[savefile] "/home/jens/work/vhdl/trunk/lib/JBUS/ghdl/build/tb_dmac_sync/tb_dmac_sync.gtkw"
+[timestart] 0
+[size] 1856 1136
+[pos] -52 -52
+*-29.859385 2840000000 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1 -1
+[sst_width] 233
+[signals_width] 341
+[sst_expanded] 1
+[sst_vpaned_height] 331
+@22
+tb_dmac.addr_o[31:0]
+tb_dmac.data_gen_reg[31:0]
+@28
+tb_dmac.data_gen_reg_inc
+tb_dmac.dma_bus_cmd_rdy[1:0]
+tb_dmac.dma_bus_cmd_we[1:0]
+tb_dmac.dma_master_gnt[1:0]
+tb_dmac.dma_master_req[1:0]
+tb_dmac.dma_start[1:0]
+@22
+tb_dmac.mdat_i[31:0]
+tb_dmac.mdat_i_64[63:0]
+tb_dmac.mdat_o[31:0]
+tb_dmac.mdat_o_64[63:0]
+tb_dmac.read_fifo_din[31:0]
+tb_dmac.read_fifo_dout[31:0]
+@23
+tb_dmac.read_reg[31:0]
+[pattern_trace] 1
+[pattern_trace] 0
diff --git a/lib/JBUS/ghdl/tb_dmac_sync.make b/lib/JBUS/ghdl/tb_dmac_sync.make
new file mode 100644
index 0000000..9f922f4
--- /dev/null
+++ b/lib/JBUS/ghdl/tb_dmac_sync.make
@@ -0,0 +1,21 @@
+include ../../../lib/FIFO/ghdl/fifo_sync.inc
+
+ROOT_PATH := ../../..
+LIB_PATH := $(ROOT_PATH)/lib
+MOD_PATH := $(LIB_PATH)/JBUS
+
+SRCS += $(LIB_PATH)/misc/utils_pkg.vhd
+SRCS += $(FIFO_SYNC_SRCS)
+SRCS += $(MOD_PATH)/src/busmaster_types.vhd
+SRCS += $(MOD_PATH)/src/busmaster_sync.vhd
+SRCS += $(MOD_PATH)/src/dmac.vhd
+SRCS += $(MOD_PATH)/src/tb_dmac.vhd
+
+# Compile
+TARGET := tb_dmac_sync
+ENTITY := tb_dmac
+WITH_VCD := y
+RUN_TIME := 6us
+
+include $(ROOT_PATH)/Common/make/ghdl.mk
+