M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 1
Code Issues Projects Releases Wiki Activity

remove use of _r prefix on CSRs

This commit is contained in:
Florent Kermarrec 2015-04-02 12:22:18 +02:00 committed by Sebastien Bourdeauducq
parent 88a1707ef9
commit 2995f0a705
4 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
artiq/gateware/rtio/core.py
View File

@ -66,7 +66,7 @@ class _RTIOCounter(Module):
# Therefore we must choose: # Therefore we must choose:
# guard_io_cycles > (4*Tio + 4*Tsys)/Tio # guard_io_cycles > (4*Tio + 4*Tsys)/Tio
# #
# We are writing to the FIFO from the buffer when the guard time has been # We are writing to the FIFO from the buffer when the guard time has been
# reached. This can fill the FIFO and deassert the writable flag. A race # reached. This can fill the FIFO and deassert the writable flag. A race
# condition occurs that causes problems if the deassertion happens between # condition occurs that causes problems if the deassertion happens between
# the CPU checking the writable flag (and reading 1) and writing a new event. # the CPU checking the writable flag (and reading 1) and writing a new event.
@ -308,32 +308,32 @@ class RTIO(Module, AutoCSR):
phy.rbus, self.counter, fine_ts_width, ififo_depth) phy.rbus, self.counter, fine_ts_width, ififo_depth)
# CSRs # CSRs
self._r_reset = CSRStorage(reset=1) self._reset = CSRStorage(reset=1)
self._r_chan_sel = CSRStorage(flen(self.bank_o.sel)) self._chan_sel = CSRStorage(flen(self.bank_o.sel))
self._r_oe = CSR() self._oe = CSR()
self._r_o_timestamp = CSRStorage(counter_width + fine_ts_width) self._o_timestamp = CSRStorage(counter_width + fine_ts_width)
self._r_o_value = CSRStorage(2) self._o_value = CSRStorage(2)
self._r_o_we = CSR() self._o_we = CSR()
self._r_o_status = CSRStatus(3) self._o_status = CSRStatus(3)
self._r_o_underflow_reset = CSR() self._o_underflow_reset = CSR()
self._r_o_sequence_error_reset = CSR() self._o_sequence_error_reset = CSR()
self._r_i_timestamp = CSRStatus(counter_width + fine_ts_width) self._i_timestamp = CSRStatus(counter_width + fine_ts_width)
self._r_i_value = CSRStatus() self._i_value = CSRStatus()
self._r_i_re = CSR() self._i_re = CSR()
self._r_i_status = CSRStatus(2) self._i_status = CSRStatus(2)
self._r_i_overflow_reset = CSR() self._i_overflow_reset = CSR()
self._r_i_pileup_count = CSRStatus(16) self._i_pileup_count = CSRStatus(16)
self._r_i_pileup_reset = CSR() self._i_pileup_reset = CSR()
self._r_counter = CSRStatus(counter_width + fine_ts_width) self._counter = CSRStatus(counter_width + fine_ts_width)
self._r_counter_update = CSR() self._counter_update = CSR()
self._r_frequency_i = CSRStatus(32) self._frequency_i = CSRStatus(32)
self._r_frequency_fn = CSRStatus(8) self._frequency_fn = CSRStatus(8)
self._r_frequency_fd = CSRStatus(8) self._frequency_fd = CSRStatus(8)
# Clocking/Reset # Clocking/Reset
@ -343,54 +343,54 @@ class RTIO(Module, AutoCSR):
self.clock_domains.cd_rio = ClockDomain() self.clock_domains.cd_rio = ClockDomain()
self.comb += [ self.comb += [
self.cd_rsys.clk.eq(ClockSignal()), self.cd_rsys.clk.eq(ClockSignal()),
self.cd_rsys.rst.eq(self._r_reset.storage) self.cd_rsys.rst.eq(self._reset.storage)
] ]
self.comb += self.cd_rio.clk.eq(ClockSignal("rtio")) self.comb += self.cd_rio.clk.eq(ClockSignal("rtio"))
self.specials += AsyncResetSynchronizer( self.specials += AsyncResetSynchronizer(
self.cd_rio, self._r_reset.storage) self.cd_rio, self._reset.storage)
# OE # OE
oes = [] oes = []
for n, chif in enumerate(phy.rbus): for n, chif in enumerate(phy.rbus):
if hasattr(chif, "oe"): if hasattr(chif, "oe"):
self.sync += \ self.sync += \
If(self._r_oe.re & (self._r_chan_sel.storage == n), If(self._oe.re & (self._chan_sel.storage == n),
chif.oe.eq(self._r_oe.r) chif.oe.eq(self._oe.r)
) )
oes.append(chif.oe) oes.append(chif.oe)
else: else:
oes.append(1) oes.append(1)
self.comb += self._r_oe.w.eq(Array(oes)[self._r_chan_sel.storage]) self.comb += self._oe.w.eq(Array(oes)[self._chan_sel.storage])
# Output/Gate # Output/Gate
self.comb += [ self.comb += [
self.bank_o.sel.eq(self._r_chan_sel.storage), self.bank_o.sel.eq(self._chan_sel.storage),
self.bank_o.timestamp.eq(self._r_o_timestamp.storage), self.bank_o.timestamp.eq(self._o_timestamp.storage),
self.bank_o.value.eq(self._r_o_value.storage), self.bank_o.value.eq(self._o_value.storage),
self.bank_o.we.eq(self._r_o_we.re), self.bank_o.we.eq(self._o_we.re),
self._r_o_status.status.eq(Cat(~self.bank_o.writable, self._o_status.status.eq(Cat(~self.bank_o.writable,
self.bank_o.underflow, self.bank_o.underflow,
self.bank_o.sequence_error)), self.bank_o.sequence_error)),
self.bank_o.underflow_reset.eq(self._r_o_underflow_reset.re), self.bank_o.underflow_reset.eq(self._o_underflow_reset.re),
self.bank_o.sequence_error_reset.eq(self._r_o_sequence_error_reset.re) self.bank_o.sequence_error_reset.eq(self._o_sequence_error_reset.re)
] ]
# Input # Input
self.comb += [ self.comb += [
self.bank_i.sel.eq(self._r_chan_sel.storage), self.bank_i.sel.eq(self._chan_sel.storage),
self._r_i_timestamp.status.eq(self.bank_i.timestamp), self._i_timestamp.status.eq(self.bank_i.timestamp),
self._r_i_value.status.eq(self.bank_i.value), self._i_value.status.eq(self.bank_i.value),
self.bank_i.re.eq(self._r_i_re.re), self.bank_i.re.eq(self._i_re.re),
self._r_i_status.status.eq(Cat(~self.bank_i.readable, self.bank_i.overflow)), self._i_status.status.eq(Cat(~self.bank_i.readable, self.bank_i.overflow)),
self.bank_i.overflow_reset.eq(self._r_i_overflow_reset.re), self.bank_i.overflow_reset.eq(self._i_overflow_reset.re),
self._r_i_pileup_count.status.eq(self.bank_i.pileup_count), self._i_pileup_count.status.eq(self.bank_i.pileup_count),
self.bank_i.pileup_reset.eq(self._r_i_pileup_reset.re) self.bank_i.pileup_reset.eq(self._i_pileup_reset.re)
] ]
# Counter access # Counter access
self.sync += \ self.sync += \
If(self._r_counter_update.re, If(self._counter_update.re,
self._r_counter.status.eq(Cat(Replicate(0, fine_ts_width), self._counter.status.eq(Cat(Replicate(0, fine_ts_width),
self.counter.o_value_sys)) self.counter.o_value_sys))
) )
@ -399,7 +399,7 @@ class RTIO(Module, AutoCSR):
clk_freq_i = int(clk_freq) clk_freq_i = int(clk_freq)
clk_freq_f = clk_freq - clk_freq_i clk_freq_f = clk_freq - clk_freq_i
self.comb += [ self.comb += [
self._r_frequency_i.status.eq(clk_freq_i), self._frequency_i.status.eq(clk_freq_i),
self._r_frequency_fn.status.eq(clk_freq_f.numerator), self._frequency_fn.status.eq(clk_freq_f.numerator),
self._r_frequency_fd.status.eq(clk_freq_f.denominator) self._frequency_fd.status.eq(clk_freq_f.denominator)
] ]

4
soc/targets/artiq_kc705.py
View File

@ -52,7 +52,7 @@ _tester_io = [
class _RTIOCRG(Module, AutoCSR): class _RTIOCRG(Module, AutoCSR):
def __init__(self, platform, rtio_internal_clk): def __init__(self, platform, rtio_internal_clk):
self._r_clock_sel = CSRStorage() self._clock_sel = CSRStorage()
self.clock_domains.cd_rtio = ClockDomain() self.clock_domains.cd_rtio = ClockDomain()
rtio_external_clk = Signal() rtio_external_clk = Signal()
@ -64,7 +64,7 @@ class _RTIOCRG(Module, AutoCSR):
self.specials += Instance("BUFGMUX", self.specials += Instance("BUFGMUX",
i_I0=rtio_internal_clk, i_I0=rtio_internal_clk,
i_I1=rtio_external_clk, i_I1=rtio_external_clk,
i_S=self._r_clock_sel.storage, i_S=self._clock_sel.storage,
o_O=self.cd_rtio.clk) o_O=self.cd_rtio.clk)

4
soc/targets/artiq_pipistrello.py
View File

@ -52,7 +52,7 @@ _tester_io = [
class _RTIOMiniCRG(Module, AutoCSR): class _RTIOMiniCRG(Module, AutoCSR):
def __init__(self, platform): def __init__(self, platform):
self._r_clock_sel = CSRStorage() self._clock_sel = CSRStorage()
self.clock_domains.cd_rtio = ClockDomain() self.clock_domains.cd_rtio = ClockDomain()
# 80MHz -> 125MHz # 80MHz -> 125MHz
@ -75,7 +75,7 @@ class _RTIOMiniCRG(Module, AutoCSR):
self.specials += Instance("BUFGMUX", self.specials += Instance("BUFGMUX",
i_I0=rtio_internal_clk, i_I0=rtio_internal_clk,
i_I1=rtio_external_clk, i_I1=rtio_external_clk,
i_S=self._r_clock_sel.storage, i_S=self._clock_sel.storage,
o_O=self.cd_rtio.clk) o_O=self.cd_rtio.clk)
platform.add_platform_command(""" platform.add_platform_command("""

4
soc/targets/artiq_ppro.py
View File

@ -56,7 +56,7 @@ class _TestGen(Module):
class _RTIOMiniCRG(Module, AutoCSR): class _RTIOMiniCRG(Module, AutoCSR):
def __init__(self, platform): def __init__(self, platform):
self._r_clock_sel = CSRStorage() self._clock_sel = CSRStorage()
self.clock_domains.cd_rtio = ClockDomain() self.clock_domains.cd_rtio = ClockDomain()
# 80MHz -> 125MHz # 80MHz -> 125MHz
@ -75,7 +75,7 @@ class _RTIOMiniCRG(Module, AutoCSR):
self.specials += Instance("BUFGMUX", self.specials += Instance("BUFGMUX",
i_I0=rtio_internal_clk, i_I0=rtio_internal_clk,
i_I1=rtio_external_clk, i_I1=rtio_external_clk,
i_S=self._r_clock_sel.storage, i_S=self._clock_sel.storage,
o_O=self.cd_rtio.clk) o_O=self.cd_rtio.clk)
platform.add_platform_command(""" platform.add_platform_command("""