Hardware
/
litex
mirror of https://github.com/enjoy-digital/litex.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bank/csrgen: use new bus API

This commit is contained in:
Sebastien Bourdeauducq 2012-02-15 16:42:17 +01:00
parent af5230c8ee
commit 91e279ee04
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/simple_gpio.py
View File

@ -18,5 +18,5 @@ bank = csrgen.Bank([oreg, ireg])
f = bank.get_fragment() + inf f = bank.get_fragment() + inf
oreg.field.r.name_override = "gpio_out" oreg.field.r.name_override = "gpio_out"
i = bank.interface i = bank.interface
v = verilog.convert(f, {i.d_o, oreg.field.r, i.a_i, i.we_i, i.d_i, gpio_in}) v = verilog.convert(f, {i.dat_r, oreg.field.r, i.adr, i.we, i.dat_w, gpio_in})
print(v) print(v)

26
migen/bank/csrgen.py
View File

@ -6,14 +6,14 @@ class Bank:
def __init__(self, description, address=0): def __init__(self, description, address=0):
self.description = description self.description = description
self.address = address self.address = address
self.interface = Slave() self.interface = Interface()
def get_fragment(self): def get_fragment(self):
comb = [] comb = []
sync = [] sync = []
sel = Signal() sel = Signal()
comb.append(sel.eq(self.interface.adr_i[9:] == Constant(self.address, BV(5)))) comb.append(sel.eq(self.interface.adr[9:] == Constant(self.address, BV(5))))
desc_exp = expand_description(self.description, 8) desc_exp = expand_description(self.description, 8)
nbits = bits_for(len(desc_exp)-1) nbits = bits_for(len(desc_exp)-1)
@ -22,29 +22,29 @@ class Bank:
bwcases = [] bwcases = []
for i, reg in enumerate(desc_exp): for i, reg in enumerate(desc_exp):
if isinstance(reg, RegisterRaw): if isinstance(reg, RegisterRaw):
comb.append(reg.r.eq(self.interface.dat_i[:reg.size])) comb.append(reg.r.eq(self.interface.dat_w[:reg.size]))
comb.append(reg.re.eq(sel & \ comb.append(reg.re.eq(sel & \
self.interface.we_i & \ self.interface.we & \
(self.interface.adr_i[:nbits] == Constant(i, BV(nbits))))) (self.interface.adr[:nbits] == Constant(i, BV(nbits)))))
elif isinstance(reg, RegisterFields): elif isinstance(reg, RegisterFields):
bwra = [Constant(i, BV(nbits))] bwra = [Constant(i, BV(nbits))]
offset = 0 offset = 0
for field in reg.fields: for field in reg.fields:
if field.access_bus == WRITE_ONLY or field.access_bus == READ_WRITE: if field.access_bus == WRITE_ONLY or field.access_bus == READ_WRITE:
bwra.append(field.storage.eq(self.interface.dat_i[offset:offset+field.size])) bwra.append(field.storage.eq(self.interface.dat_w[offset:offset+field.size]))
offset += field.size offset += field.size
if len(bwra) > 1: if len(bwra) > 1:
bwcases.append(bwra) bwcases.append(bwra)
else: else:
raise TypeError raise TypeError
if bwcases: if bwcases:
sync.append(If(sel & self.interface.we_i, Case(self.interface.adr_i[:nbits], *bwcases))) sync.append(If(sel & self.interface.we, Case(self.interface.adr[:nbits], *bwcases)))
# Bus reads # Bus reads
brcases = [] brcases = []
for i, reg in enumerate(desc_exp): for i, reg in enumerate(desc_exp):
if isinstance(reg, RegisterRaw): if isinstance(reg, RegisterRaw):
brcases.append([Constant(i, BV(nbits)), self.interface.dat_o.eq(reg.w)]) brcases.append([Constant(i, BV(nbits)), self.interface.dat_r.eq(reg.w)])
elif isinstance(reg, RegisterFields): elif isinstance(reg, RegisterFields):
brs = [] brs = []
reg_readable = False reg_readable = False
@ -56,16 +56,16 @@ class Bank:
brs.append(Constant(0, BV(field.size))) brs.append(Constant(0, BV(field.size)))
if reg_readable: if reg_readable:
if len(brs) > 1: if len(brs) > 1:
brcases.append([Constant(i, BV(nbits)), self.interface.dat_o.eq(Cat(*brs))]) brcases.append([Constant(i, BV(nbits)), self.interface.dat_r.eq(Cat(*brs))])
else: else:
brcases.append([Constant(i, BV(nbits)), self.interface.dat_o.eq(brs[0])]) brcases.append([Constant(i, BV(nbits)), self.interface.dat_r.eq(brs[0])])
else: else:
raise TypeError raise TypeError
if brcases: if brcases:
sync.append(self.interface.dat_o.eq(Constant(0, BV(8)))) sync.append(self.interface.dat_r.eq(Constant(0, BV(8))))
sync.append(If(sel, Case(self.interface.adr_i[:nbits], *brcases))) sync.append(If(sel, Case(self.interface.adr[:nbits], *brcases)))
else: else:
comb.append(self.interface.dat_o.eq(Constant(0, BV(8)))) comb.append(self.interface.dat_r.eq(Constant(0, BV(8))))
# Device access # Device access
for reg in self.description: for reg in self.description: