mirror of
https://github.com/Polprzewodnikowy/SummerCart64.git
synced 2024-11-30 01:04:13 +01:00
ff69030643
* isv support + usb/dd improvements
* make room for saves
* update offset
* fixed debug address
* idk
* exception
* ironed out all broken stuff
* cleanup
* return epc fix
* better
* more cleanup
* even more cleanup
* mooore cleanup
* fixed printf
* no assert
* improved docker build, pyft232 instead of pyserial
* fixed displaying long message strings
description test
* just straight cleanup
* smallest cleanup
* PAL
* cpu buffer
* n64 bootloader done
* super slow usb storage reading implemented
* reduced buffer size
* usb gets fast
* little cleanup
* double buffered reads
* removed separate event id
* ISV in hardware finally
* small exception changes
* mac testing
* py spacing
* fsd write, rtc, isv and reset fixes
* fixxx
* good stopping point
* usb fixed?
* pretend we have 128 MB sdram
* backup
* chmod
* test
* test done
* more tests
* user rm
* help
* final fix
* updated component values
* nice asset names
* cic 64dd support
* ddipl enable separation
* pre DMA rewrite, created dedicated buffer memory space, simplified code
* dma rewrite, needs testing
* moved xml
* dd basics
* timing
* 64dd working yet again, isv brought back, dma fixes, usb path rewrite, pc code rewrite
* added usb read functionality, general cleanup
* changed mem addressing
* added fpga flash update access
* added mcu update
* chmod
* little cleanup
* update format and stuff
* fixes
* uninitialized fix
* small fixes
* update fixes
* update stuff done
* fpga update tested
* build time fix
* boot fix
* test timing
* readme test
* test 2
* reports
* testseet
* final
* build test
* forgot
* button and naming
* General cleanup
And multiline commit message test
* Exception screen UI touch ups
* display separation and tests beginning
* pc software update
* pc software done
* timing test
* delete launch.json
* sw fixes
* fixed button hole diameter in shell
* small cleanup, rpi testing
* shell fillet fix, pc rtc printing
* added cfg lock mechanism
* moved lock to cfg address space
* extended ROM and ISV fixes
* preliminary sd card support
* little sd card cleanup
* sd menu fixes
* 5 second limit
* reduced shell thickness
* basic led act blinking
* faster sd menu loading
* inst cache invalidate
* sd card writing is working
* SD card CSD and CID registers
* wait for previous command
* led error codes
* fixed cfg_translate_address use
* 64dd from sd card working
* 64dd speedup and button handling
* delayed address latching cycle - might break other builds, needs testing
* bootloader improvements
* small fixes
* return previous cfg when setting new
* cache stuff
* unfloader debug protocol support
* UNFLoader style debug command line support
* requirements.txt
* shell groove fillet
* reset state inside controller
* fixed fast PI read, added PI R/W fifo debug info
* PI access prioritize
* SD clock stop when RX FIFO is more than half full
* flash erase method change
* CFG error handling, TLOZ MM debug ISV support
* CIC5167 support
* general fixes
* USB unplugged cable handling
* turn off led when changing between error/act modes
* rtc 2 bit clock stop support
* line endings
* Revert "line endings"
This reverts commit d0ddfe5ec7
.
* PI address debug
* readme test
* diagram update
* diagram background
* diagram background
* diagram background
* updated readme
165 lines
4.7 KiB
Systemverilog
165 lines
4.7 KiB
Systemverilog
module memory_bram (
|
|
input clk,
|
|
|
|
n64_scb.bram n64_scb,
|
|
|
|
mem_bus.memory mem_bus
|
|
);
|
|
|
|
// Request logic
|
|
|
|
logic [1:0] last_request;
|
|
logic write;
|
|
|
|
always_ff @(posedge clk) begin
|
|
last_request <= {last_request[0], mem_bus.request};
|
|
end
|
|
|
|
always_ff @(posedge clk) begin
|
|
mem_bus.ack <= mem_bus.request && last_request[0] && !last_request[1];
|
|
end
|
|
|
|
always_comb begin
|
|
write = mem_bus.request && !last_request[0] && mem_bus.write;
|
|
end
|
|
|
|
|
|
// Address decoding
|
|
|
|
logic buffer_selected;
|
|
logic eeprom_selected;
|
|
logic dd_selected;
|
|
logic flashram_selected;
|
|
|
|
always_comb begin
|
|
buffer_selected = 1'b0;
|
|
eeprom_selected = 1'b0;
|
|
dd_selected = 1'b0;
|
|
flashram_selected = 1'b0;
|
|
if (mem_bus.address[25:24] == 2'b01 && mem_bus.address[23:14] == 10'd0) begin
|
|
buffer_selected = mem_bus.address[13] == 1'b0;
|
|
eeprom_selected = mem_bus.address[13:11] == 3'b100;
|
|
dd_selected = mem_bus.address[13:8] == 6'b101000;
|
|
flashram_selected = mem_bus.address[13:7] == 7'b1010010;
|
|
end
|
|
end
|
|
|
|
|
|
// Buffer memory
|
|
|
|
logic [15:0] buffer_bram [0:4095];
|
|
logic [15:0] buffer_bram_rdata;
|
|
|
|
always_ff @(posedge clk) begin
|
|
if (write && buffer_selected) begin
|
|
if (mem_bus.wmask[1]) buffer_bram[mem_bus.address[12:1]][15:8] <= mem_bus.wdata[15:8];
|
|
if (mem_bus.wmask[0]) buffer_bram[mem_bus.address[12:1]][7:0] <= mem_bus.wdata[7:0];
|
|
end
|
|
end
|
|
|
|
always_ff @(posedge clk) begin
|
|
buffer_bram_rdata <= buffer_bram[mem_bus.address[12:1]];
|
|
end
|
|
|
|
|
|
// EEPROM memory
|
|
|
|
logic [7:0] eeprom_bram_high [0:1023];
|
|
logic [7:0] eeprom_bram_low [0:1023];
|
|
logic [7:0] eeprom_bram_high_rdata;
|
|
logic [7:0] eeprom_bram_low_rdata;
|
|
logic [7:0] eeprom_bram_high_n64_rdata;
|
|
logic [7:0] eeprom_bram_low_n64_rdata;
|
|
logic [15:0] eeprom_bram_rdata;
|
|
|
|
always_ff @(posedge clk) begin
|
|
if (write && mem_bus.wmask[1] && eeprom_selected) begin
|
|
eeprom_bram_high[mem_bus.address[10:1]] <= mem_bus.wdata[15:8];
|
|
end
|
|
if (n64_scb.eeprom_write && !n64_scb.eeprom_address[0]) begin
|
|
eeprom_bram_high[n64_scb.eeprom_address[10:1]] <= n64_scb.eeprom_wdata;
|
|
end
|
|
end
|
|
|
|
always_ff @(posedge clk) begin
|
|
if (write && mem_bus.wmask[0] && eeprom_selected) begin
|
|
eeprom_bram_low[mem_bus.address[10:1]] <= mem_bus.wdata[7:0];
|
|
end
|
|
if (n64_scb.eeprom_write && n64_scb.eeprom_address[0]) begin
|
|
eeprom_bram_low[n64_scb.eeprom_address[10:1]] <= n64_scb.eeprom_wdata;
|
|
end
|
|
end
|
|
|
|
always_ff @(posedge clk) begin
|
|
eeprom_bram_high_rdata <= eeprom_bram_high[mem_bus.address[10:1]];
|
|
end
|
|
|
|
always_ff @(posedge clk) begin
|
|
eeprom_bram_low_rdata <= eeprom_bram_low[mem_bus.address[10:1]];
|
|
end
|
|
|
|
always_ff @(posedge clk) begin
|
|
eeprom_bram_high_n64_rdata <= eeprom_bram_high[n64_scb.eeprom_address[10:1]];
|
|
end
|
|
|
|
always_ff @(posedge clk) begin
|
|
eeprom_bram_low_n64_rdata <= eeprom_bram_low[n64_scb.eeprom_address[10:1]];
|
|
end
|
|
|
|
always_comb begin
|
|
eeprom_bram_rdata = {eeprom_bram_high_rdata, eeprom_bram_low_rdata};
|
|
n64_scb.eeprom_rdata = n64_scb.eeprom_address[0] ? eeprom_bram_low_n64_rdata : eeprom_bram_high_n64_rdata;
|
|
end
|
|
|
|
|
|
// DD memory
|
|
|
|
logic [15:0] dd_bram [0:127];
|
|
logic [15:0] dd_bram_rdata;
|
|
|
|
always_ff @(posedge clk) begin
|
|
if (write && dd_selected) begin
|
|
dd_bram[mem_bus.address[7:1]] <= mem_bus.wdata;
|
|
end
|
|
if (n64_scb.dd_write) begin
|
|
dd_bram[n64_scb.dd_address] <= n64_scb.dd_wdata;
|
|
end
|
|
end
|
|
|
|
always_ff @(posedge clk) begin
|
|
dd_bram_rdata <= dd_bram[mem_bus.address[7:1]];
|
|
end
|
|
|
|
always_ff @(posedge clk) begin
|
|
n64_scb.dd_rdata <= dd_bram[n64_scb.dd_address];
|
|
end
|
|
|
|
|
|
// FlashRAM memory
|
|
|
|
logic [15:0] flashram_bram [0:63];
|
|
logic [15:0] flashram_bram_rdata;
|
|
|
|
always_ff @(posedge clk) begin
|
|
if (n64_scb.flashram_write) begin
|
|
flashram_bram[n64_scb.flashram_address] <= n64_scb.flashram_wdata;
|
|
end
|
|
end
|
|
|
|
always_ff @(posedge clk) begin
|
|
flashram_bram_rdata <= flashram_bram[mem_bus.address[6:1]];
|
|
end
|
|
|
|
|
|
// Output data mux
|
|
|
|
always_ff @(posedge clk) begin
|
|
mem_bus.rdata <= 16'd0;
|
|
if (buffer_selected) mem_bus.rdata <= buffer_bram_rdata;
|
|
if (eeprom_selected) mem_bus.rdata <= eeprom_bram_rdata;
|
|
if (dd_selected) mem_bus.rdata <= dd_bram_rdata;
|
|
if (flashram_selected) mem_bus.rdata <= flashram_bram_rdata;
|
|
end
|
|
|
|
endmodule
|