godzil/sd2snes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FPGA/cx4: clean up tab/whitespace mix

Browse Source
This commit is contained in:
ikari 2011-11-01 21:09:31 +01:00
parent 3dd64cb98f
commit 1987968db2
3 changed files with 107 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
verilog/sd2snes_cx4/address.v
View File

@ -38,8 +38,8 @@ module address(
wire [23:0] SRAM_SNES_ADDR; wire [23:0] SRAM_SNES_ADDR;
/* Cx4 mapper: /* Cx4 mapper:
- LoROM (extended to 00-7d, 80-ff) - LoROM (extended to 00-7d, 80-ff)
- MMIO @ 6000-7fff - MMIO @ 6000-7fff
*/ */
assign IS_ROM = SNES_ADDR[15] & ~SNES_CS; assign IS_ROM = SNES_ADDR[15] & ~SNES_CS;

206
verilog/sd2snes_cx4/main.v
View File

@ -349,7 +349,7 @@ reg [7:0] ROM_DOUTr;
assign SNES_DATA = (!SNES_READ) assign SNES_DATA = (!SNES_READ)
? (msu_enable ? MSU_SNES_DATA_OUT ? (msu_enable ? MSU_SNES_DATA_OUT
:cx4_enable ? CX4_SNES_DATA_OUT :cx4_enable ? CX4_SNES_DATA_OUT
:(cx4_active & cx4_vect_enable) ? CX4_SNES_DATA_OUT :(cx4_active & cx4_vect_enable) ? CX4_SNES_DATA_OUT
: SNES_DINr) : SNES_DINr)
: 8'bZ; : 8'bZ;
@ -381,14 +381,14 @@ assign MCU_RDY = RQ_MCU_RDYr;
always @(posedge CLK2) begin always @(posedge CLK2) begin
if(MCU_RRQ) begin if(MCU_RRQ) begin
MCU_RD_PENDr <= 1'b1; MCU_RD_PENDr <= 1'b1;
RQ_MCU_RDYr <= 1'b0; RQ_MCU_RDYr <= 1'b0;
end else if(MCU_WRQ) begin end else if(MCU_WRQ) begin
MCU_WR_PENDr <= 1'b1; MCU_WR_PENDr <= 1'b1;
RQ_MCU_RDYr <= 1'b0; RQ_MCU_RDYr <= 1'b0;
end else if(STATE & (ST_MCU_RD_END | ST_MCU_WR_END)) begin end else if(STATE & (ST_MCU_RD_END | ST_MCU_WR_END)) begin
MCU_RD_PENDr <= 1'b0; MCU_RD_PENDr <= 1'b0;
MCU_WR_PENDr <= 1'b0; MCU_WR_PENDr <= 1'b0;
RQ_MCU_RDYr <= 1'b1; RQ_MCU_RDYr <= 1'b1;
end end
end end
@ -399,10 +399,10 @@ assign CX4_RDY = RQ_CX4_RDYr;
always @(posedge CLK2) begin always @(posedge CLK2) begin
if(CX4_RRQ) begin if(CX4_RRQ) begin
CX4_RD_PENDr <= 1'b1; CX4_RD_PENDr <= 1'b1;
RQ_CX4_RDYr <= 1'b0; RQ_CX4_RDYr <= 1'b0;
end else if(STATE == ST_CX4_RD_WAIT && ST_MEM_DELAYr == 4'h0) begin end else if(STATE == ST_CX4_RD_WAIT && ST_MEM_DELAYr == 4'h0) begin
CX4_RD_PENDr <= 1'b0; CX4_RD_PENDr <= 1'b0;
RQ_CX4_RDYr <= 1'b1; RQ_CX4_RDYr <= 1'b1;
end end
end end
@ -416,126 +416,126 @@ always @(posedge CLK2) begin
end else begin end else begin
case(STATE) case(STATE)
ST_IDLE: begin ST_IDLE: begin
ROM_ADDRr <= MAPPED_SNES_ADDR; ROM_ADDRr <= MAPPED_SNES_ADDR;
if(CX4_RD_PENDr) begin if(CX4_RD_PENDr) begin
STATE <= ST_CX4_RD_WAIT; STATE <= ST_CX4_RD_WAIT;
ROM_ADDRr <= CX4_ADDR; ROM_ADDRr <= CX4_ADDR;
ST_MEM_DELAYr <= ROM_RD_WAIT_CX4; ST_MEM_DELAYr <= ROM_RD_WAIT_CX4;
end else if(~cx4_active && ~ASSERT_SNES_ADDR) begin end else if(~cx4_active && ~ASSERT_SNES_ADDR) begin
if(MCU_RD_PENDr) STATE <= ST_MCU_RD_ADDR; if(MCU_RD_PENDr) STATE <= ST_MCU_RD_ADDR;
else if(MCU_WR_PENDr) STATE <= ST_MCU_WR_ADDR; else if(MCU_WR_PENDr) STATE <= ST_MCU_WR_ADDR;
else STATE <= ST_IDLE; else STATE <= ST_IDLE;
end end
else STATE <= ST_IDLE; else STATE <= ST_IDLE;
end end
ST_SNES_RD_ADDR: begin ST_SNES_RD_ADDR: begin
STATE <= ST_SNES_RD_WAIT; STATE <= ST_SNES_RD_WAIT;
ST_MEM_DELAYr <= ROM_RD_WAIT; ST_MEM_DELAYr <= ROM_RD_WAIT;
end end
ST_SNES_RD_WAIT: begin ST_SNES_RD_WAIT: begin
ST_MEM_DELAYr <= ST_MEM_DELAYr - 4'h1; ST_MEM_DELAYr <= ST_MEM_DELAYr - 4'h1;
if(ST_MEM_DELAYr == 4'h0) STATE <= ST_SNES_RD_END; if(ST_MEM_DELAYr == 4'h0) STATE <= ST_SNES_RD_END;
else STATE <= ST_SNES_RD_WAIT; else STATE <= ST_SNES_RD_WAIT;
if(ROM_ADDR0) SNES_DINr <= ROM_DATA[7:0]; if(ROM_ADDR0) SNES_DINr <= ROM_DATA[7:0];
else SNES_DINr <= ROM_DATA[15:8]; else SNES_DINr <= ROM_DATA[15:8];
end end
ST_SNES_RD_END: begin ST_SNES_RD_END: begin
STATE <= ST_IDLE; STATE <= ST_IDLE;
if(ROM_ADDR0) SNES_DINr <= ROM_DATA[7:0]; if(ROM_ADDR0) SNES_DINr <= ROM_DATA[7:0];
else SNES_DINr <= ROM_DATA[15:8]; else SNES_DINr <= ROM_DATA[15:8];
end end
ST_SNES_WR_ADDR: begin ST_SNES_WR_ADDR: begin
ROM_WEr <= (!IS_WRITABLE); ROM_WEr <= (!IS_WRITABLE);
snes_wr_cycle <= 1'b1; snes_wr_cycle <= 1'b1;
STATE <= ST_SNES_WR_WAIT1; STATE <= ST_SNES_WR_WAIT1;
ST_MEM_DELAYr <= ROM_WR_WAIT1; ST_MEM_DELAYr <= ROM_WR_WAIT1;
end end
ST_SNES_WR_WAIT1: begin ST_SNES_WR_WAIT1: begin
ST_MEM_DELAYr <= ST_MEM_DELAYr - 4'h1; ST_MEM_DELAYr <= ST_MEM_DELAYr - 4'h1;
if(ST_MEM_DELAYr == 4'h0) STATE <= ST_SNES_WR_DATA; if(ST_MEM_DELAYr == 4'h0) STATE <= ST_SNES_WR_DATA;
else STATE <= ST_SNES_WR_WAIT1; else STATE <= ST_SNES_WR_WAIT1;
end end
ST_SNES_WR_DATA: begin ST_SNES_WR_DATA: begin
ROM_DOUTr <= SNES_DATA; ROM_DOUTr <= SNES_DATA;
ST_MEM_DELAYr <= ROM_WR_WAIT2; ST_MEM_DELAYr <= ROM_WR_WAIT2;
STATE <= ST_SNES_WR_WAIT2; STATE <= ST_SNES_WR_WAIT2;
end end
ST_SNES_WR_WAIT2: begin ST_SNES_WR_WAIT2: begin
ST_MEM_DELAYr <= ST_MEM_DELAYr - 4'h1; ST_MEM_DELAYr <= ST_MEM_DELAYr - 4'h1;
if(ST_MEM_DELAYr == 4'h0) STATE <= ST_SNES_WR_END; if(ST_MEM_DELAYr == 4'h0) STATE <= ST_SNES_WR_END;
else STATE <= ST_SNES_WR_WAIT2; else STATE <= ST_SNES_WR_WAIT2;
end end
ST_SNES_WR_END: begin ST_SNES_WR_END: begin
STATE <= ST_IDLE; STATE <= ST_IDLE;
ROM_WEr <= 1'b1; ROM_WEr <= 1'b1;
snes_wr_cycle <= 1'b0; snes_wr_cycle <= 1'b0;
end end
ST_MCU_RD_ADDR: begin ST_MCU_RD_ADDR: begin
ROM_ADDRr <= MCU_ADDR; ROM_ADDRr <= MCU_ADDR;
STATE <= ST_MCU_RD_WAIT; STATE <= ST_MCU_RD_WAIT;
ST_MEM_DELAYr <= ROM_RD_WAIT_MCU; ST_MEM_DELAYr <= ROM_RD_WAIT_MCU;
end end
ST_MCU_RD_WAIT: begin ST_MCU_RD_WAIT: begin
ST_MEM_DELAYr <= ST_MEM_DELAYr - 4'h1; ST_MEM_DELAYr <= ST_MEM_DELAYr - 4'h1;
if(ST_MEM_DELAYr == 4'h0) begin if(ST_MEM_DELAYr == 4'h0) begin
STATE <= ST_MCU_RD_WAIT2; STATE <= ST_MCU_RD_WAIT2;
ST_MEM_DELAYr <= 4'h2; ST_MEM_DELAYr <= 4'h2;
if(ROM_ADDR0) MCU_DINr <= ROM_DATA[7:0]; if(ROM_ADDR0) MCU_DINr <= ROM_DATA[7:0];
else MCU_DINr <= ROM_DATA[15:8]; else MCU_DINr <= ROM_DATA[15:8];
end end
else STATE <= ST_MCU_RD_WAIT; else STATE <= ST_MCU_RD_WAIT;
end end
ST_MCU_RD_WAIT2: begin ST_MCU_RD_WAIT2: begin
ST_MEM_DELAYr <= ST_MEM_DELAYr - 4'h1; ST_MEM_DELAYr <= ST_MEM_DELAYr - 4'h1;
if(ST_MEM_DELAYr == 4'h0) begin if(ST_MEM_DELAYr == 4'h0) begin
STATE <= ST_MCU_RD_END; STATE <= ST_MCU_RD_END;
end else STATE <= ST_MCU_RD_WAIT2; end else STATE <= ST_MCU_RD_WAIT2;
end end
ST_MCU_RD_END: begin ST_MCU_RD_END: begin
STATE <= ST_IDLE; STATE <= ST_IDLE;
end end
ST_MCU_WR_ADDR: begin ST_MCU_WR_ADDR: begin
ROM_ADDRr <= MCU_ADDR; ROM_ADDRr <= MCU_ADDR;
STATE <= ST_MCU_WR_WAIT; STATE <= ST_MCU_WR_WAIT;
ST_MEM_DELAYr <= ROM_WR_WAIT_MCU; ST_MEM_DELAYr <= ROM_WR_WAIT_MCU;
ROM_DOUTr <= MCU_DOUT; ROM_DOUTr <= MCU_DOUT;
ROM_WEr <= 1'b0; ROM_WEr <= 1'b0;
end end
ST_MCU_WR_WAIT: begin ST_MCU_WR_WAIT: begin
ST_MEM_DELAYr <= ST_MEM_DELAYr - 4'h1; ST_MEM_DELAYr <= ST_MEM_DELAYr - 4'h1;
if(ST_MEM_DELAYr == 4'h0) begin if(ST_MEM_DELAYr == 4'h0) begin
ROM_WEr <= 1'b1; ROM_WEr <= 1'b1;
STATE <= ST_MCU_WR_WAIT2; STATE <= ST_MCU_WR_WAIT2;
ST_MEM_DELAYr <= 4'h2; ST_MEM_DELAYr <= 4'h2;
end end
else STATE <= ST_MCU_WR_WAIT; else STATE <= ST_MCU_WR_WAIT;
end end
ST_MCU_WR_WAIT2: begin ST_MCU_WR_WAIT2: begin
ST_MEM_DELAYr <= ST_MEM_DELAYr - 4'h1; ST_MEM_DELAYr <= ST_MEM_DELAYr - 4'h1;
if(ST_MEM_DELAYr == 4'h0) begin if(ST_MEM_DELAYr == 4'h0) begin
STATE <= ST_MCU_WR_END; STATE <= ST_MCU_WR_END;
end else STATE <= ST_MCU_WR_WAIT2; end else STATE <= ST_MCU_WR_WAIT2;
end
ST_MCU_WR_END: begin
STATE <= ST_IDLE;
end
ST_CX4_RD_ADDR: begin
ROM_ADDRr <= CX4_ADDR;
STATE <= ST_CX4_RD_WAIT;
ST_MEM_DELAYr <= ROM_RD_WAIT_CX4;
end
ST_CX4_RD_WAIT: begin
ST_MEM_DELAYr <= ST_MEM_DELAYr - 4'h1;
if(ST_MEM_DELAYr == 4'h0) STATE <= ST_IDLE;
else STATE <= ST_CX4_RD_WAIT;
if(ROM_ADDR0) CX4_DINr <= ROM_DATA[7:0];
else CX4_DINr <= ROM_DATA[15:8];
end end
ST_CX4_RD_END: begin ST_MCU_WR_END: begin
STATE <= ST_IDLE; STATE <= ST_IDLE;
end end
endcase
ST_CX4_RD_ADDR: begin
ROM_ADDRr <= CX4_ADDR;
STATE <= ST_CX4_RD_WAIT;
ST_MEM_DELAYr <= ROM_RD_WAIT_CX4;
end
ST_CX4_RD_WAIT: begin
ST_MEM_DELAYr <= ST_MEM_DELAYr - 4'h1;
if(ST_MEM_DELAYr == 4'h0) STATE <= ST_IDLE;
else STATE <= ST_CX4_RD_WAIT;
if(ROM_ADDR0) CX4_DINr <= ROM_DATA[7:0];
else CX4_DINr <= ROM_DATA[15:8];
end
ST_CX4_RD_END: begin
STATE <= ST_IDLE;
end
endcase
end end
end end

2
verilog/sd2snes_cx4/spi.v
View File

@ -59,7 +59,7 @@ always @(posedge SCK) begin
if(SSEL) bitcnt <= 3'b000; if(SSEL) bitcnt <= 3'b000;
else begin else begin
bitcnt <= bitcnt + 3'b001; bitcnt <= bitcnt + 3'b001;
byte_data_received <= {byte_data_received[6:0], MOSI}; byte_data_received <= {byte_data_received[6:0], MOSI};
end end
if(~SSEL && bitcnt==3'b111) byte_received <= 1'b1; if(~SSEL && bitcnt==3'b111) byte_received <= 1'b1;
else byte_received <= 1'b0; else byte_received <= 1'b0;