class Blinker(Elaboratable):
def __init__(self, pinset):
self.jtag = JTAG({}, "sync")
+ self.jtag.core_mgr = ResourceManager([], [])
+ # record resource lookup between core IO names and pads
+ self.jtag.padlookup = {}
memory = Memory(width=32, depth=16)
self.sram = SRAM(memory=memory, bus=self.jtag.wb)
+
def elaborate(self, platform):
m = Module()
m.submodules.jtag = self.jtag
default_rst = "rst" # should be picked up / overridden by platform sys.rst
def __init__(self, resources, jtag):
- self.pad_mgr = ResourceManager([], [])
self.jtag = jtag
super().__init__()
# create set of pin resources based on the pinset, this is for the core
self.add_resources(resources)
- # record resource lookup between core IO names and pads
- self.padlookup = {}
# add JTAG without scan
self.add_resources([JTAGResource('jtag', 0)], no_boundary_scan=True)
this override will also - automatically - create a JTAG Boundary Scan
connection *without* any change to the actual Platform.request() API
"""
+ core_mgr = self.jtag.core_mgr
+ padlookup = self.jtag.padlookup
# okaaaay, bit of shenanigens going on: the important data structure
# here is Resourcemanager._ports. requests add to _ports, which is
# what needs redirecting. therefore what has to happen is to
# now make a corresponding (duplicate) request to the pad manager
# BUT, if it doesn't exist, don't sweat it: all it means is, the
# application did not request Boundary Scan for that resource.
- pad_start_ports = len(self.pad_mgr._ports)
+ pad_start_ports = len(core_mgr._ports)
try:
- pvalue = self.pad_mgr.request(name, number, dir=dir, xdr=xdr)
+ pvalue = core_mgr.request(name, number, dir=dir, xdr=xdr)
except ResourceError:
return value
- pad_end_ports = len(self.pad_mgr._ports)
+ pad_end_ports = len(core_mgr._ports)
# ok now we have the lengths: now create a lookup between the pad
# and the core, so that JTAG boundary scan can be inserted in between
core = self._ports[start_ports:end_ports]
- pads = self.pad_mgr._ports[pad_start_ports:pad_end_ports]
+ pads = core_mgr._ports[pad_start_ports:pad_end_ports]
# oops if not the same numbers added. it's a duplicate. shouldn't happen
assert len(core) == len(pads), "argh, resource manager error"
print ("core", core)
if pin is None: continue # skip when pin is None
assert corepin is not None # if pad was None, core should be too
print ("iter", pad, pin.name)
- print ("existing pads", self.padlookup.keys())
- assert pin.name not in self.padlookup # no overwrites allowed!
+ print ("existing pads", padlookup.keys())
+ assert pin.name not in padlookup # no overwrites allowed!
assert pin.name == corepin.name # has to be the same!
- self.padlookup[pin.name] = pad # store pad by pin name
+ padlookup[pin.name] = pad # store pad by pin name
# now add the IO Shift Register. first identify the type
# then request a JTAG IOConn. we can't wire it up (yet) because
return
# make a *second* - identical - set of pin resources for the IO ring
padres = deepcopy(resources)
- self.pad_mgr.add_resources(padres)
+ self.jtag.core_mgr.add_resources(padres)
#def iter_ports(self):
# yield from super().iter_ports()
# phase is to add JTAG Boundary Scan so it maaay be worth adding?
# at least for the print statements
def get_input(self, pin, port, attrs, invert):
+ padlookup = self.jtag.padlookup
self._check_feature("single-ended input", pin, attrs,
valid_xdrs=(0,), valid_attrs=None)
print("No JTAG chain in-between")
m.d.comb += pin.i.eq(self._invert_if(invert, port))
return m
- if pin.name not in self.padlookup:
+ if pin.name not in padlookup:
print("No pin named %s, not connecting to JTAG BS" % pin.name)
m.d.comb += pin.i.eq(self._invert_if(invert, port))
return m
- (padres, padpin, padport, padattrs) = self.padlookup[pin.name]
+ (padres, padpin, padport, padattrs) = padlookup[pin.name]
io = self.jtag.ios[pin.name]
print (" pad", padres, padpin, padport, attrs)
print (" padpin", padpin.layout)
return m
def get_output(self, pin, port, attrs, invert):
+ padlookup = self.jtag.padlookup
self._check_feature("single-ended output", pin, attrs,
valid_xdrs=(0,), valid_attrs=None)
print("No JTAG chain in-between")
m.d.comb += port.eq(self._invert_if(invert, pin.o))
return m
- if pin.name not in self.padlookup:
+ if pin.name not in padlookup:
print("No pin named %s, not connecting to JTAG BS" % pin.name)
m.d.comb += port.eq(self._invert_if(invert, pin.o))
return m
- (padres, padpin, padport, padattrs) = self.padlookup[pin.name]
+ (padres, padpin, padport, padattrs) = padlookup[pin.name]
io = self.jtag.ios[pin.name]
print (" pad", padres, padpin, padport, padattrs)
print (" pin", padpin.layout)
print (" jtag", io.core.layout, io.pad.layout)
m.d.comb += port.eq(self._invert_if(invert, pin.o))
- m.d.comb += padport.io.eq(self._invert_if(invert, padpin.o))
+ m.d.comb += padport.io.eq(padpin.o)
m.d.comb += io.core.o.eq(port.io)
m.d.comb += padpin.o.eq(io.pad.o)
return m
def get_tristate(self, pin, port, attrs, invert):
+ padlookup = self.jtag.padlookup
self._check_feature("single-ended tristate", pin, attrs,
valid_xdrs=(0,), valid_attrs=None)
o_Y=port,
)
return m
- (res, pin, port, attrs) = self.padlookup[pin.name]
+ (res, pin, port, attrs) = padlookup[pin.name]
io = self.jtag.ios[pin.name]
print (" pad", res, pin, port, attrs)
print (" pin", pin.layout)
return m
def get_input_output(self, pin, port, attrs, invert):
+ padlookup = self.jtag.padlookup
self._check_feature("single-ended input/output", pin, attrs,
valid_xdrs=(0,), valid_attrs=None)
)
m.d.comb += pin.i.eq(self._invert_if(invert, port))
return m
- (padres, padpin, padport, padattrs) = self.padlookup[pin.name]
+ (padres, padpin, padport, padattrs) = padlookup[pin.name]
io = self.jtag.ios[pin.name]
print (" pad", padres, padpin, padport, padattrs)
print (" pin", padpin.layout)
projects / pinmux.git / blobdiff