Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/misoc
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: d9111f6a044b
Choose a base ref
...
head repository: m-labs/misoc
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1fd189512f00
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on May 7, 2015

  1. Copy the full SHA
    4d902b5 View commit details

Commits on May 8, 2015

  1. Copy the full SHA
    1fd1895 View commit details
Showing with 6 additions and 6 deletions.
  1. +1 −1 misoclib/com/liteusb/frontend/dma.py
  2. +5 −5 misoclib/com/liteusb/phy/ft245.py
2 changes: 1 addition & 1 deletion misoclib/com/liteusb/frontend/dma.py
Original file line number Diff line number Diff line change
@@ -78,7 +78,7 @@ def __init__(self, lasmim, tag):
source.stb.eq(unpack.source.stb),
source.sop.eq(cnt == 0),
source.eop.eq(cnt == (self.dma.length*pack_factor-1)),
source.length.eq(self.dma.length*pack_factor+4),
source.length.eq(self.dma.length*pack_factor),
source.data.eq(unpack.source.data),
source.dst.eq(tag),
unpack.source.ack.eq(source.ack)
10 changes: 5 additions & 5 deletions misoclib/com/liteusb/phy/ft245.py
Original file line number Diff line number Diff line change
@@ -35,14 +35,14 @@ def __init__(self, pads, clk_freq,

# read fifo (FTDI --> SoC)
read_fifo = RenameClockDomains(AsyncFIFO(phy_description(8), fifo_depth),
{"write": "ftdi", "read": "sys"})
{"write": "usb", "read": "sys"})
read_buffer = RenameClockDomains(SyncFIFO(phy_description(8), 4),
{"sys": "ftdi"})
{"sys": "usb"})
self.comb += read_buffer.source.connect(read_fifo.sink)

# write fifo (SoC --> FTDI)
write_fifo = RenameClockDomains(AsyncFIFO(phy_description(8), fifo_depth),
{"write": "sys", "read": "ftdi"})
{"write": "sys", "read": "usb"})

self.submodules += read_fifo, read_buffer, write_fifo

@@ -70,7 +70,7 @@ def __init__(self, pads, clk_freq,
data_w_accepted = Signal(reset=1)

fsm = FSM(reset_state="READ")
self.submodules += RenameClockDomains(fsm, {"sys": "ftdi"})
self.submodules += RenameClockDomains(fsm, {"sys": "usb"})

fsm.act("READ",
read_time_en.eq(1),
@@ -107,7 +107,7 @@ def __init__(self, pads, clk_freq,
pads.rd_n.reset = 1
pads.wr_n.reset = 1

self.sync.ftdi += [
self.sync.usb += [
If(fsm.ongoing("READ"),
data_oe.eq(0),