Skip to content

C
conv-common-gw
Commit 1a8ff121 authored by Denia Bouhired-Ferrag's avatar Denia Bouhired-Ferrag
Browse files
Options

Modified wbgen script to remove any references to ttl or blo signal types. Sole… 

Modified wbgen script to remove any references to ttl or blo signal types. Sole reference to front or rear signals
parent df620509
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 52 deletions
modules/conv_regs.wb
View file @ 1a8ff121
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
-- last changes: -- last changes:
-- 03-05-2014 Theodor Stana Added GPL header -- 03-05-2014 Theodor Stana Added GPL header
-- 31-07-2014 Theodor Stana Added MSWR & LSR registers -- 31-07-2014 Theodor Stana Added MSWR & LSR registers
-- Denia Bouhired Added separate pulse counters for TTL and BLO pulses -- Denia Bouhired Added separate pulse counters for front panel and rear panel pulses
-- 11-10-2016 Denia Bouhired Added thermometer registers one 16 bit for temperature read out -- 11-10-2016 Denia Bouhired Added thermometer registers one 16 bit for temperature read out
-- 2 for LSBs and MSBs of 64-bit ID -- 2 for LSBs and MSBs of 64-bit ID
-- 20-12-2016 Denia Bouhired Small modification to file in order to match that of wr-n-therm branch from -- 20-12-2016 Denia Bouhired Small modification to file in order to match that of wr-n-therm branch from
...@@ -234,13 +234,13 @@ peripheral { ...@@ -234,13 +234,13 @@ peripheral {
}; };
}; };
-- Pulse counter registers for TTL pulses, R/W access from SysMon -- Pulse counter registers for front panel pulses, R/W access from SysMon
reg { reg {
name = "CH1TTLPCR"; name = "CH1FPPCR";
description = "Channel 1 Pulse Counter Register for TTL pulses"; description = "Channel 1 Pulse Counter Register for front panel pulses";
prefix = "ch1ttlpcr"; prefix = "ch1fppcr";
field { field {
name = "TTL pulse counter value"; name = "Value of front panel pulse counter";
type = SLV; type = SLV;
size = 32; size = 32;
access_bus = READ_WRITE; access_bus = READ_WRITE;
...@@ -250,11 +250,11 @@ peripheral { ...@@ -250,11 +250,11 @@ peripheral {
}; };
reg { reg {
name = "CH2TTLPCR"; name = "CH2FPPCR";
description = "Channel 2 Pulse Counter Register for TTL pulses"; description = "Channel 2 Pulse Counter Register for front panel pulses";
prefix = "ch2ttlpcr"; prefix = "ch2fppcr";
field { field {
name = "TTL pulse counter value"; name = "Value of front panel pulse counter";
type = SLV; type = SLV;
size = 32; size = 32;
access_bus = READ_WRITE; access_bus = READ_WRITE;
...@@ -264,11 +264,11 @@ peripheral { ...@@ -264,11 +264,11 @@ peripheral {
}; };
reg { reg {
name = "CH3TTLPCR"; name = "CH3FPPCR";
description = "Channel 3 Pulse Counter Register for TTL pulses"; description = "Channel 3 Pulse Counter Register for front panel pulses";
prefix = "ch3ttlpcr"; prefix = "ch3fppcr";
field { field {
name = "TTL pulse counter value"; name = "Value of front panel pulse counter";
type = SLV; type = SLV;
size = 32; size = 32;
access_bus = READ_WRITE; access_bus = READ_WRITE;
...@@ -278,11 +278,11 @@ peripheral { ...@@ -278,11 +278,11 @@ peripheral {
}; };
reg { reg {
name = "CH4TTLPCR"; name = "CH4FPPCR";
description = "Channel 4 Pulse Counter Register for TTL pulses"; description = "Channel 4 Pulse Counter Register for front panel pulses";
prefix = "ch4ttlpcr"; prefix = "ch4fppcr";
field { field {
name = "TTL pulse counter value"; name = "Value of front panel pulse counter";
type = SLV; type = SLV;
size = 32; size = 32;
access_bus = READ_WRITE; access_bus = READ_WRITE;
...@@ -292,11 +292,11 @@ peripheral { ...@@ -292,11 +292,11 @@ peripheral {
}; };
reg { reg {
name = "CH5TTLPCR"; name = "CH5FPPCR";
description = "Channel 5 Pulse Counter Register for TTL pulses"; description = "Channel 5 Pulse Counter Register for front panel pulses";
prefix = "ch5ttlpcr"; prefix = "ch5fppcr";
field { field {
name = "TTL pulse counter value"; name = "Value of front panel pulse counter";
type = SLV; type = SLV;
size = 32; size = 32;
access_bus = READ_WRITE; access_bus = READ_WRITE;
...@@ -306,11 +306,11 @@ peripheral { ...@@ -306,11 +306,11 @@ peripheral {
}; };
reg { reg {
name = "CH6TTLPCR"; name = "CH6FPPCR";
description = "Channel 6 Pulse Counter Register for TTL pulses"; description = "Channel 6 Pulse Counter Register for front panel pulses";
prefix = "ch6ttlpcr"; prefix = "ch6fppcr";
field { field {
name = "TTL pulse counter value"; name = "Value of front panel pulse counter";
type = SLV; type = SLV;
size = 32; size = 32;
access_bus = READ_WRITE; access_bus = READ_WRITE;
...@@ -319,13 +319,13 @@ peripheral { ...@@ -319,13 +319,13 @@ peripheral {
}; };
}; };
-- Pulse counter registers for blocking pulses, R/W access from SysMon -- Pulse counter registers for rear panel pulses, R/W access from SysMon
reg { reg {
name = "CH1BLOPCR"; name = "CH1RPPCR";
description = "Channel 1 Pulse Counter Register for BLO pulses"; description = "Channel 1 Pulse Counter Register for rear panel pulses";
prefix = "ch1blopcr"; prefix = "ch1rppcr";
field { field {
name = "BLO pulse counter value"; name = "Rear panel pulse counter value";
type = SLV; type = SLV;
size = 32; size = 32;
access_bus = READ_WRITE; access_bus = READ_WRITE;
...@@ -335,11 +335,11 @@ peripheral { ...@@ -335,11 +335,11 @@ peripheral {
}; };
reg { reg {
name = "CH2BLOPCR"; name = "CH2RPPCR";
description = "Channel 2 Pulse Counter Register for BLO pulses"; description = "Channel 2 Pulse Counter Register for rear panel pulses";
prefix = "ch2blopcr"; prefix = "ch2rppcr";
field { field {
name = "BLO pulse counter value"; name = "Rear panel pulse counter value";
type = SLV; type = SLV;
size = 32; size = 32;
access_bus = READ_WRITE; access_bus = READ_WRITE;
...@@ -349,11 +349,11 @@ peripheral { ...@@ -349,11 +349,11 @@ peripheral {
}; };
reg { reg {
name = "CH3BLOPCR"; name = "CH3RPPCR";
description = "Channel 3 Pulse Counter Register for BLO pulses"; description = "Channel 3 Pulse Counter Register for rear panel pulses";
prefix = "ch3blopcr"; prefix = "ch3rppcr";
field { field {
name = "BLO pulse counter value"; name = "Rear panel pulse counter value";
type = SLV; type = SLV;
size = 32; size = 32;
access_bus = READ_WRITE; access_bus = READ_WRITE;
...@@ -363,11 +363,11 @@ peripheral { ...@@ -363,11 +363,11 @@ peripheral {
}; };
reg { reg {
name = "CH4BLOPCR"; name = "CH4RPPCR";
description = "Channel 4 Pulse Counter Register for BLO pulses"; description = "Channel 4 Pulse Counter Register for rear panel pulses";
prefix = "ch4blopcr"; prefix = "ch4rppcr";
field { field {
name = "BLO pulse counter value"; name = "Rear panel pulse counter value";
type = SLV; type = SLV;
size = 32; size = 32;
access_bus = READ_WRITE; access_bus = READ_WRITE;
...@@ -377,11 +377,11 @@ peripheral { ...@@ -377,11 +377,11 @@ peripheral {
}; };
reg { reg {
name = "CH5BLOPCR"; name = "CH5RPPCR";
description = "Channel 5 Pulse Counter Register for BLO pulses"; description = "Channel 5 Pulse Counter Register for rear panel pulses";
prefix = "ch5blopcr"; prefix = "ch5rppcr";
field { field {
name = "BLO pulse counter value"; name = "Rear panel pulse counter value";
type = SLV; type = SLV;
size = 32; size = 32;
access_bus = READ_WRITE; access_bus = READ_WRITE;
...@@ -391,11 +391,11 @@ peripheral { ...@@ -391,11 +391,11 @@ peripheral {
}; };
reg { reg {
name = "CH6BLOPCR"; name = "CH6RPPCR";
description = "Channel 6 Pulse Counter Register for BLO pulses"; description = "Channel 6 Pulse Counter Register for rear panel pulses";
prefix = "ch6blopcr"; prefix = "ch6rppcr";
field { field {
name = "BLO pulse counter value"; name = "Rear panel pulse counter value";
type = SLV; type = SLV;
size = 32; size = 32;
access_bus = READ_WRITE; access_bus = READ_WRITE;
...@@ -903,7 +903,7 @@ peripheral { ...@@ -903,7 +903,7 @@ peripheral {
Bit 0 -- channel 1\ Bit 0 -- channel 1\
Bit 1 -- channel 2\ Bit 1 -- channel 2\
etc."; etc.";
prefix = "rear"; prefix = "Rear";
type = SLV; type = SLV;
size = 6; size = 6;
access_dev = WRITE_ONLY; access_dev = WRITE_ONLY;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment