Merge pull request #217 from sergachev/master

spi: change CSR to CSRStorage
This commit is contained in:
enjoy-digital 2019-07-12 14:44:53 +02:00 committed by GitHub
commit 08772fc0c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions

6
litex/soc/cores/spi.py Normal file → Executable file
View File

@ -26,7 +26,7 @@ class SPIMaster(Module, AutoCSR):
pads = Record(self.pads_layout) pads = Record(self.pads_layout)
self.pads = pads self.pads = pads
self._control = CSR(16) self._control = CSRStorage(16)
self._status = CSRStatus(1) self._status = CSRStatus(1)
self._mosi = CSRStorage(data_width) self._mosi = CSRStorage(data_width)
self._miso = CSRStatus(data_width) self._miso = CSRStatus(data_width)
@ -47,8 +47,8 @@ class SPIMaster(Module, AutoCSR):
done = Signal() done = Signal()
# XFER start: initialize SPI XFER on SPI_CONTROL_START write and latch length # XFER start: initialize SPI XFER on SPI_CONTROL_START write and latch length
self.comb += start.eq(self._control.re & self._control.r[SPI_CONTROL_START]) self.comb += start.eq(self._control.re & self._control.storage[SPI_CONTROL_START])
self.sync += If(self._control.re, length.eq(self._control.r[SPI_CONTROL_LENGTH:])) self.sync += If(self._control.re, length.eq(self._control.storage[SPI_CONTROL_LENGTH:]))
# XFER done # XFER done
self.comb += self._status.status[SPI_STATUS_DONE].eq(done) self.comb += self._status.status[SPI_STATUS_DONE].eq(done)