rtl:wbgen: rollback to version before dlamprid commit (split channel CSR from FIFO readout)

Rollback in the commit 745e912c rollback to version before dlamprid commit (split channel CSR from FIFO readout) was not complete. This commit rollbacks the wb files. Signed-off-by: Adam Wujek <dev_public@wujek.eu>

rtl:wbgen: rollback to version before dlamprid commit (split channel CSR from FIFO readout)
Rollback in the commit 745e912c rollback to version before dlamprid commit (split channel CSR from FIFO readout) was not complete. This commit rollbacks the wb files. Signed-off-by: Adam Wujek <dev_public@wujek.eu>
3a37adb1 · Adam Wujek · 63646203 · 63646203 · 3a37adb1 · 3a37adb1
Commit 3a37adb1 authored Mar 15, 2022 by Adam Wujek
Hide whitespace changes
Inline Side-by-side

Showing with 131 additions and 136 deletions

channel_regs.wb hdl/rtl/wbgen/channel_regs.wb +0 -132

timestamp_fifo_wb.wb hdl/rtl/wbgen/timestamp_fifo_wb.wb +130 -0

Makefile software/kernel/Makefile +1 -4

No files found.
--- a/hdl/rtl/wbgen/channel_regs.wb
+++ b/hdl/rtl/wbgen/channel_regs.wb
-- -*- Mode: LUA; tab-width: 2 -*-
-
-peripheral {
-	 name = "Channel registers";
-	 prefix="ch_reg";
-
-	 hdl_entity="channel_regs";
-	 
-	 reg {
-			name = "Delta Timestamp Word 1";
-			prefix = "DELTA1";
-			
-			field {
-				 name = "Delta Timestamp Word 1 (TAI cycles, signed)";
-				 type = SLV;
-				 size = 32;
-				 access_bus = READ_ONLY;
-				 access_dev = WRITE_ONLY;
-			};
-	 };
-
-	 reg {
-			name = "Delta Timestamp Word 2";
-			prefix = "DELTA2";
-			
-			field {
-				 name = "Delta Timestamp Word 2 (8ns ticks, unsigned)";
-				 type = SLV;
-				 size = 32;
-				 access_bus = READ_ONLY;
-				 access_dev = WRITE_ONLY;
-
-			};
-	 };
-
-	 reg {
-			name = "Delta Timestamp Word 3";
-			prefix = "DELTA3";
-			
-			field {
-				 name = "Delta Timestamp Word 3 (fractional part, unsigned)";
-				 type = SLV;
-				 size = 32;
-				 access_bus = READ_ONLY;
-				 access_dev = WRITE_ONLY;
-			};
-	 };
-
-	 	 reg {
-			name = "Channel Offset Word 1";
-			prefix = "OFFSET1";
-			
-			field {
-				 name = "Channel Offset Word 1 (TAI cycles, signed)";
-				 type = SLV;
-				 size = 32;
-				 access_bus = READ_WRITE;
-				 access_dev = READ_ONLY;
-			};
-	 };
-
-	 reg {
-			name = "Channel Offset Word 2";
-			prefix = "OFFSET2";
-			
-			field {
-				 name = "Channel Offset Word 2 (8ns ticks, unsigned)";
-				 type = SLV;
-				 size = 32;
-				 access_bus = READ_WRITE;
-				 access_dev = READ_ONLY;
-
-			};
-	 };
-
-	 reg {
-			name = "Channel Offset Word 3";
-			prefix = "OFFSET3";
-			
-			field {
-				 name = "Channel Offset Word 3 (fractional part, unsigned)";
-				 type = SLV;
-				 size = 32;
-				 access_bus = READ_WRITE;
-				 access_dev = READ_ONLY;
-			};
-	 };
-
-	 reg {
-			name = "Control/Status";
-			prefix = "CSR";
-			
-			field {
-				 name = "Delta Timestamp Ready";
-				 prefix = "DELTA_READY";
-				 type = BIT;
-				 access_bus = READ_ONLY;
-				 access_dev = WRITE_ONLY;
-			};
-
-			field {
-				 name = "Read Delta Timestamp";
-				 prefix = "DELTA_READ";
-				 type = MONOSTABLE;
-			};
-
-			field {
-				 name = "Reset Sequence Counter";
-				 prefix = "RST_SEQ";
-				 type = MONOSTABLE;
-			};
-
-			field {
-				 name = "Delta Timestamp Reference Channel";
-				 description = "Channel (0-4) to take as the reference for the delta timestamps";
-				 prefix = "DELTA_REF";
-				 type = SLV;
-				 size = 3;
-				 access_bus = READ_WRITE;
-				 access_dev = READ_ONLY;
-			};
-
-			field {
-				 name = "Raw readout mode";
-				 description = "1: enables readout of raw timestamps";
-				 prefix = "RAW_MODE";
-				 type = BIT;
-				 access_bus = READ_WRITE;
-				 access_dev = READ_ONLY;
-			};
-	 };
-};
--- a/hdl/rtl/wbgen/timestamp_fifo_wb.wb
+++ b/hdl/rtl/wbgen/timestamp_fifo_wb.wb
@@ -45,4 +45,134 @@ peripheral {
 				 size = 32;
 			};
 	 };
+
+
+	 reg {
+			name = "Delta Timestamp Word 1";
+			prefix = "DELTA1";
+			
+			field {
+				 name = "Delta Timestamp Word 1 (TAI cycles, signed)";
+				 type = SLV;
+				 size = 32;
+				 access_bus = READ_ONLY;
+				 access_dev = WRITE_ONLY;
+			};
+	 };
+
+	 reg {
+			name = "Delta Timestamp Word 2";
+			prefix = "DELTA2";
+			
+			field {
+				 name = "Delta Timestamp Word 2 (8ns ticks, unsigned)";
+				 type = SLV;
+				 size = 32;
+				 access_bus = READ_ONLY;
+				 access_dev = WRITE_ONLY;
+
+			};
+	 };
+
+	 reg {
+			name = "Delta Timestamp Word 3";
+			prefix = "DELTA3";
+			
+			field {
+				 name = "Delta Timestamp Word 3 (fractional part, unsigned)";
+				 type = SLV;
+				 size = 32;
+				 access_bus = READ_ONLY;
+				 access_dev = WRITE_ONLY;
+			};
+	 };
+
+	 	 reg {
+			name = "Channel Offset Word 1";
+			prefix = "OFFSET1";
+			
+			field {
+				 name = "Channel Offset Word 1 (TAI cycles, signed)";
+				 type = SLV;
+				 size = 32;
+				 access_bus = READ_WRITE;
+				 access_dev = READ_ONLY;
+			};
+	 };
+
+	 reg {
+			name = "Channel Offset Word 2";
+			prefix = "OFFSET2";
+			
+			field {
+				 name = "Channel Offset Word 2 (8ns ticks, unsigned)";
+				 type = SLV;
+				 size = 32;
+				 access_bus = READ_WRITE;
+				 access_dev = READ_ONLY;
+
+			};
+	 };
+
+	 reg {
+			name = "Channel Offset Word 3";
+			prefix = "OFFSET3";
+			
+			field {
+				 name = "Channel Offset Word 3 (fractional part, unsigned)";
+				 type = SLV;
+				 size = 32;
+				 access_bus = READ_WRITE;
+				 access_dev = READ_ONLY;
+			};
+	 };
+
+	 reg {
+			name = "Control/Status";
+			prefix = "CSR";
+			
+			field {
+				 name = "Delta Timestamp Ready";
+				 prefix = "DELTA_READY";
+				 type = BIT;
+				 access_bus = READ_ONLY;
+				 access_dev = WRITE_ONLY;
+			};
+
+			field {
+				 name = "Read Delta Timestamp";
+				 prefix = "DELTA_READ";
+				 type = MONOSTABLE;
+			};
+
+			field {
+				 name = "Reset Sequence Counter";
+				 prefix = "RST_SEQ";
+				 type = MONOSTABLE;
+			};
+
+			field {
+				 name = "Delta Timestamp Reference Channel";
+				 description = "Channel (0-4) to take as the reference for the delta timestamps";
+				 prefix = "DELTA_REF";
+				 type = SLV;
+				 size = 3;
+				 access_bus = READ_WRITE;
+				 access_dev = READ_ONLY;
+			};
+
+			field {
+				 name = "Raw readout mode";
+				 description = "1: enables readout of raw timestamps";
+				 prefix = "RAW_MODE";
+				 type = BIT;
+				 access_bus = READ_WRITE;
+				 access_dev = READ_ONLY;
+			};
+
+			
+
+
+	 };
+
 };
--- a/software/kernel/Makefile
+++ b/software/kernel/Makefile
@@ -55,7 +55,7 @@ GIT_VERSION = $(shell git describe --always --dirty --long --tags)

 all: modules

-hw_headers: tdc_dma_eic.h tdc_onewire_regs.h tdc_buffer_control_regs.h timestamp_fifo_regs.h channel_regs.h
+hw_headers: tdc_dma_eic.h tdc_onewire_regs.h tdc_buffer_control_regs.h timestamp_fifo_regs.h

 tdc_dma_eic.h: $(TDC_HDL)/rtl/wbgen/dma_eic.wb
 	$(WBGEN2) -s defines -C hw/$@ $<
@@ -69,9 +69,6 @@ tdc_buffer_control_regs.h: $(TDC_HDL)/rtl/wbgen/tdc_buffer_control_regs.wb
 timestamp_fifo_regs.h: $(TDC_HDL)/rtl/wbgen/timestamp_fifo_wb.wb
 	$(WBGEN2) -s defines -C hw/$@ $<

-channel_regs.h: $(TDC_HDL)/rtl/wbgen/channel_regs.wb
-	$(WBGEN2) -s defines -C hw/$@ $<
-
 modules: hw_headers
 	$(MAKE) -C $(LINUX) M=$(CURDIR) ZIO_ABS=$(ZIO_ABS) FMC_ABS=$(FMC_ABS) \
 		ZIO_EXTRA_SYMBOLS-y=$(ZIO_EXTRA_SYMBOLS-y) \