Skip to content

Commit 75c7f39

Browse files
committed
Integrando SPI
1 parent d211428 commit 75c7f39

File tree

6 files changed

+53
-20
lines changed

6 files changed

+53
-20
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,6 @@ env/
1616
site/
1717
build/
1818
webtalk*.log
19-
webtalk*.jou
19+
webtalk*.jou
20+
fpga/digilent_arty/usage_statistics_webtalk.xml
21+
fpga/digilent_arty/usage_statistics_webtalk.html

fpga/colorlight_i9/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ all: ./build/out.bit
2121
synth_ecp5 -json ./build/out.json -abc9 \
2222
"
2323

24+
#read_verilog ../../modules/spi.v; \
25+
#read_verilog ../../modules/SPI-Slave/rtl/spi_slave.v; \
26+
2427
buildFolder:
2528
mkdir -p build
2629

fpga/digilent_arty/run.tcl

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,26 @@
11
read_verilog "main.v"
2-
read_verilog ../../modules/uart.v
3-
read_verilog ../../modules/UART/rtl/uart_rx.v
4-
read_verilog ../../modules/UART/rtl/uart_tx.v
2+
#read_verilog ../../modules/uart.v
3+
#read_verilog ../../modules/UART/rtl/uart_rx.v
4+
#read_verilog ../../modules/UART/rtl/uart_tx.v
5+
read_verilog ../../modules/spi.v;
6+
read_verilog ../../modules/SPI-Slave/rtl/spi_slave.v;
57
read_verilog ../../src/fifo.v
68
read_verilog ../../src/reset.v
79
read_verilog ../../src/clk_divider.v
810
read_verilog ../../src/memory.v
911
read_verilog ../../src/interpreter.v
1012
read_verilog ../../src/controller.v
1113

12-
read_verilog ../../Risco-5/src/core/alu_control.v
13-
read_verilog ../../Risco-5/src/core/alu.v
14-
read_verilog ../../Risco-5/src/core/control_unit.v
15-
read_verilog ../../Risco-5/src/core/core.v
16-
read_verilog ../../Risco-5/src/core/immediate_generator.v
17-
read_verilog ../../Risco-5/src/core/mux.v
18-
read_verilog ../../Risco-5/src/core/pc.v
19-
read_verilog ../../Risco-5/src/core/registers.v
20-
read_verilog ../../Risco-5/src/core/csr_unit.v
21-
read_verilog ../../Risco-5/src/core/mdu.v
14+
read_verilog ../../modules/Risco-5/src/core/alu_control.v
15+
read_verilog ../../modules/Risco-5/src/core/alu.v
16+
read_verilog ../../modules/Risco-5/src/core/control_unit.v
17+
read_verilog ../../modules/Risco-5/src/core/core.v
18+
read_verilog ../../modules/Risco-5/src/core/immediate_generator.v
19+
read_verilog ../../modules/Risco-5/src/core/mux.v
20+
read_verilog ../../modules/Risco-5/src/core/pc.v
21+
read_verilog ../../modules/Risco-5/src/core/registers.v
22+
read_verilog ../../modules/Risco-5/src/core/csr_unit.v
23+
read_verilog ../../modules/Risco-5/src/core/mdu.v
2224

2325

2426
read_xdc "digilent_arty.xdc"

modules/SPI-Slave

modules/spi.v

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -217,16 +217,15 @@ always @(posedge clk ) begin
217217
readed <= 1'b0;
218218
data_in <= tx_fifo_read_data;
219219

220-
if(zero == 1'b1) begin
221-
zero <= 1'b0;
222-
reload <= 1'b1;
220+
if(readed_trash == 1'b1) begin
221+
readed_trash <= 1'b0;
222+
reload <= 1'b1;
223223
end
224224
end
225225
endcase
226226
end
227227
end
228228

229-
// Read from uart and insert in RX queue
230229
always @(posedge clk ) begin
231230
rx_fifo_write <= 1'b0;
232231

src/controller.v

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,11 +208,38 @@ UART #(
208208
.read_response (communication_read_response),
209209
.write_response(communication_write_response),
210210

211-
.address (32'h00000000),
212211
.write_data(communication_write_data),
213212
.read_data (communication_read_data)
214213
);
214+
/*
215+
SPI #(
216+
.PAYLOAD_BITS(PAYLOAD_BITS),
217+
.BUFFER_SIZE (BUFFER_SIZE),
218+
.WORD_SIZE_BY(WORD_SIZE_BY)
219+
) Spi(
220+
.clk (clk),
221+
.reset(reset),
222+
223+
.sck (sck),
224+
.cs (cs),
225+
.mosi(mosi),
226+
.miso(miso),
227+
228+
.rw (rx),
229+
.intr(intr),
230+
231+
.rx_fifo_empty(communication_rx_empty),
232+
.tx_fifo_empty(communication_tx_empty),
215233
234+
.read (communication_read),
235+
.write(communication_write),
236+
.read_response (communication_read_response),
237+
.write_response(communication_write_response),
238+
239+
.write_data(communication_write_data),
240+
.read_data (communication_read_data)
241+
);
242+
*/
216243
Memory #(
217244
.MEMORY_FILE(MEMORY_FILE),
218245
.MEMORY_SIZE(MEMORY_SIZE)

0 commit comments

Comments
 (0)